This repository was archived by the owner on Jul 17, 2024. It is now read-only.
-
Notifications
You must be signed in to change notification settings - Fork 5
O2Jam combo animation, Fix thread synchronization, Added new modifier, Fixed original o2jam health rules, Fix song background for other supported file and if no image inside o2jam file, Fix Color3 not handled while using Vulkan Render, Make note normal disappear while it pressed #31
Open
AlberttFrgk
wants to merge
177
commits into
Estrol:master
Choose a base branch
from
AlberttFrgk:master
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from 1 commit
Commits
Show all changes
177 commits
Select commit
Hold shift + click to select a range
e0f3266
refactor(gameplayscene): revamp drawcombo logic
AlberttFrgk c343bed
fix(game): fix thread synchronization, removed sdl_delay
AlberttFrgk 12c53a4
fix(game): forgot to implement stop() notify
AlberttFrgk 4deb60e
Updated Game.cpp
AlberttFrgk 209aca8
fix(game): condition variable has false wake-ups
AlberttFrgk a25d8dd
Update Game.cpp
AlberttFrgk 5c06e19
feat: fix chart logger, improve combo animation
AlberttFrgk f4bdff6
Merge branch 'master' of https://github.com/AlberttFrgk/O2Game
AlberttFrgk 40ba895
Update Chart.cpp
AlberttFrgk 0724c8f
feat: slighly performance improvement
AlberttFrgk 5a945c0
feat: improved framelimiter and combo animation
AlberttFrgk 064065e
Update Game.h
AlberttFrgk e7dea28
Update Game.cpp
AlberttFrgk ae7c979
feat(gameplayscene): Draw Image for Mods
AlberttFrgk 6ada348
refactor(gameplay): swap playfield and playfooter
AlberttFrgk dd60565
refactor(gameplay): better filename
AlberttFrgk d2047fa
feat(gameplay): add modifier logger
AlberttFrgk ae837d9
feat: add new modifier
AlberttFrgk c378acb
refactor(gameplayscene): move few code
AlberttFrgk 2c68f09
fix(songselectscene): rearrange should not selected if random,mirror,…
AlberttFrgk 81a5283
refactor(gameplayscene): fix duplicate code
AlberttFrgk 61bde3f
feat: small changes, remove unnecessary code
AlberttFrgk 4a97557
refactor(gameplayscene): lerp removed, optimize combo animation
AlberttFrgk da6e032
refactor(gameplayscene): remove useless code
AlberttFrgk 0105872
refactor(gameplayscene): clean few codes
AlberttFrgk 99b9a92
2a1406b
feat: sprite now can play once or stop on last frame
AlberttFrgk ee16279
refactor(gameplayscene): fix for visual modifier
AlberttFrgk 44ef416
refactor(gameplayscene): remove unused code
AlberttFrgk 4d74bc4
feat: fix thread and performance overtime
AlberttFrgk 35c07b4
refactor(drawablenote): temporary fix render on note
AlberttFrgk 8e21d1a
refactor(gameplayscene): TargetBar AlphaBlend
AlberttFrgk 8e32379
typo
AlberttFrgk c24e185
feat: better implementation song bg
AlberttFrgk a3554e2
refactor(gameplayscene): move some code and clean things
AlberttFrgk abeb3ea
feat: o2jam health rules based on difficulty 🔥
AlberttFrgk fc3b9a0
fix(Texture2D): Color3 not handled while using Vulkan Render
AlberttFrgk 2de93cd
Update DrawableNote.cpp
AlberttFrgk 871ea9a
fix(loadingscene): fix song background for supported file and if no i…
AlberttFrgk 3d37071
Merge branch 'master' of https://github.com/AlberttFrgk/O2Game
AlberttFrgk a6d5469
feat(note): make note normal disappear while it pressed
AlberttFrgk 39e64c0
Revert "feat(note): make note normal disappear while it pressed"
albertfrengki 899013e
refactor(scenemanager): fix slow loading scene causing stuck for a while
albertfrengki 68bfca8
refactor(ojm): fix no sound in few ojm (kenz)
AlberttFrgk c784e18
refactor(rhythmengine): adjusted delay
albertfrengki 10bd83d
refactor some codes
albertfrengki 97a87a6
Rebase
albertfrengki 28ad7ae
fix: note has render glitching and inconsistent frame index
albertfrengki 96f0a3e
3f75ebf
fix
albertfrengki 0f10ed2
feat: move background option to settings
albertfrengki b10e6a1
fix(songselectscene): fix switch case modifier
albertfrengki 684b273
feat: open file feature inside game
albertfrengki 46c5b05
0b2c6e2
feat: open file now can load selected mod
albertfrengki cfa9984
refactor(songselectscene): added difficulty to saved selected mod aft…
albertfrengki 9df2a24
5747db7
feat: added new settings and fix
albertfrengki 044e9ee
refactor(gameplayscene): The true O2Jam Combo animation
albertfrengki 664e095
fix: antivirus false detection
albertfrengki 8848758
refactor: fix Lv. 0 on Title and stuff
albertfrengki 349a76e
refactor: improve framelimit and scenemanager
albertfrengki 139af50
fix(texture2d): fixed half white line
albertfrengki 339a9c5
1b6c364
c034d80
Revert ""
albertfrengki 5605858
refactor: better approach for white line issues, added game version i…
albertfrengki 3b135fd
57941c6
2e6f25a
f86a4cf
refactor(ojm): add handler for unencoded audio data
AlberttFrgk f689acc
refactor: better solution for half white line issue (2)
AlberttFrgk 5acf404
refactor: better solution for half white line issue
AlberttFrgk 3c77949
bb787ac
refactor(ojm): fix no sound in few OJM
AlberttFrgk 93fa479
added comment
AlberttFrgk cab75a7
7e566b7
refactor(ojm): game now can read the other mask ojm files
AlberttFrgk 88c4cb1
refactor: fix everything
AlberttFrgk a5f61da
refactor: fix everything (2)
AlberttFrgk bf00f6b
23cddeb
refactor(sprite2d): fix for drawstop
AlberttFrgk 50e2e70
refactor: hide directx11 due weird framedrop (instead use vulkan lmao)
AlberttFrgk 45720a3
refactor(game): changed some code
AlberttFrgk 87b20fa
refactor(setting): now game grab refresh rate and make values by mult…
AlberttFrgk 3f6f057
8df764c
refactor(note): forget to add trail on tail Long Note, fix crash in r…
AlberttFrgk 5a04bbb
refactor(scoremanager): make code easiest to read
AlberttFrgk 19babe4
bcb6c63
refactor(chart): fix game not read event and audio sample properly on…
AlberttFrgk 01bf097
298e2e2
refactor: fix missing font and panic mod causing overlapped
AlberttFrgk cf9183e
refactor: idk what i'm doing
AlberttFrgk b490187
test
AlberttFrgk 35479d4
this ok
AlberttFrgk f1d0383
545b822
refactor(note): adjust code a little bit
AlberttFrgk b5c115a
refactor: optimize
AlberttFrgk add34b1
refactor: new Resources, new note type option, optimized code on Font…
AlberttFrgk c40bc1d
refactor(LuaScripting): fix config doesn't load Notes.ini and Notes.l…
AlberttFrgk 6c24e1e
fix later
AlberttFrgk 1d59ff3
apalah
AlberttFrgk 785cfb5
refactor(gameplayscene): refactor combo animation
AlberttFrgk 162316c
3d5b64e
refactor: ez2on look like hold note (note percy option)
AlberttFrgk 87b5879
refactor(note):readjusted lnbody height and pos so it will in the mid…
AlberttFrgk 151f319
remove percy option
AlberttFrgk e6b399d
refactor: add new measure line type, remove useless options
AlberttFrgk 3c2bce7
refactor(note):add option Long Note Body On Top for few skins and ref…
AlberttFrgk 2c62539
06891f2
ecf3474
11ff090
refactor(chart): fix stupid vector subscript out of range and adjustL…
AlberttFrgk aa5b13e
refector(noteimagecachemanaher): remove useless code
AlberttFrgk edcac05
dd3b7ae
refactor(note): code now easier to read
AlberttFrgk 3f7121f
8c6030a
refactor(gameplayscene): O2JAM COMBO ANIMATION (FINAL)
AlberttFrgk 8c2e057
944f85c
stupid github desktop
AlberttFrgk c61e1f7
Merge branch 'o2jamsimulator' of https://github.com/AlberttFrgk/O2Gam…
AlberttFrgk ad95640
refactor(gameplayscene): added code
AlberttFrgk 2105090
refactor(gameplayscene): o2jam combo animation should be like this
AlberttFrgk 292f2eb
dde950e
remove problematic feature
AlberttFrgk d95baac
improve game experience
AlberttFrgk 8a20b88
remove option other than 7K
AlberttFrgk 0e2f06f
c5d1692
merge everything (#1)
AlberttFrgk cb39315
Revert ""
AlberttFrgk 273c4a3
Revert "" (#2)
AlberttFrgk b56d361
feat: fix key mode lane for skinning later
AlberttFrgk bbdafb3
feat: loaded file now has preview and info than reopen game
AlberttFrgk 2dbb8bb
fix: crash sometimes on first game open
AlberttFrgk 6ff77ea
fix: dx11 unstable rendering
AlberttFrgk b5416fa
fix: modifier not properly working as intended
AlberttFrgk 86d05cd
fix: some background failed to load
AlberttFrgk 7c18ae8
feat: improved animation
AlberttFrgk b0cd361
feat: improve animation and framelimit
AlberttFrgk 86a4393
fix: game sometimes crash
AlberttFrgk b5fcf64
x
AlberttFrgk eb730c8
fix; remove dx11 unsafe for daily use case
AlberttFrgk 95ef45e
fix: submodule
AlberttFrgk 6a2dce5
refactor: cleanup a bit
AlberttFrgk d1d92e6
feat: fix crash and improve skin arena
AlberttFrgk e9fcf0d
refactor: clean duplicate code for animation
AlberttFrgk d9380e0
feat: use Chart::CalculateBeat to calculate animation instead
AlberttFrgk abdae18
refactor: very accurate GetBPMAnimationIndex calculation
AlberttFrgk 1bb65a9
fix: play 1 cycle animation if song ended
AlberttFrgk aefbc25
fix: if load o2jam file, no info loaded
AlberttFrgk 5eead62
fix: typo
AlberttFrgk 400a7cb
feat: ignore sv if it normalized
AlberttFrgk 44d94b9
feat: panic mod (in testing)
AlberttFrgk 13a2918
refactor: added more launch option
AlberttFrgk 487fd30
feat: improve game end check and game
AlberttFrgk 855bad9
fix: GetBPMAnimationIndex ignore sv if bpm more than 1
AlberttFrgk 5083be8
feat: proper panic mod and bpm based animation
AlberttFrgk 82d8faa
fix: correctly show actual bpm on loaded file
AlberttFrgk f71cd7b
refactor: no need wait 5 sec, already fix
AlberttFrgk b8090b2
feat: make end game more quicker and improve bpm based animation
AlberttFrgk a158b31
new: load video from osu!mania beatmaps, improve later
AlberttFrgk 575d29d
fix: audio sudden stop while loaded file
AlberttFrgk e8db8aa
feat: improve video performance and settings
AlberttFrgk 3f0f7da
refactor: rework skin system
AlberttFrgk 31b304a
feat: added more key in skin.ini (will fix later)
AlberttFrgk 48de972
fix: typo
AlberttFrgk e0b0788
refactor: add fps adjust on judgement
AlberttFrgk fc170ea
new: improve skin system
AlberttFrgk 772f05c
fix: game crash while try to load song without image
AlberttFrgk ec0c96b
feat: fix skin system
AlberttFrgk cc66d1c
refactor: added fps ingame
AlberttFrgk ffc2c46
feat: since rect and button same position, merge exit button
AlberttFrgk 1d979d1
fix cmake for default folder
AlberttFrgk 40bf2cd
fix: improve upscaled textures
AlberttFrgk fc47e92
refactor: rewrite GetBPMAnimationIndex for osu!mania
AlberttFrgk 1143eb5
feat: fix bunch of things i can't write it all
AlberttFrgk 1b29a49
feat: limit animation so it doesn't overshoot
AlberttFrgk File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.