Commit graph

402 commits

Author SHA1 Message Date
Cameron Taylor
e105f933ac Merge branch 'rewrite/master' into anysad/custom-countdowns 2024-08-09 23:00:03 -04:00
Cameron Taylor
f1af005cf3 Merge branch 'rewrite/master' into burgerballs/song-resync-tweaks 2024-07-29 14:04:41 -04:00
EliteMasterEric
41bd0246ac Custom coutndown, judgements, and combo count now use the note style file instead of hardcoded paths. 2024-07-28 17:10:32 -04:00
anysad
0e7fad090b custom popups and countdowns yay!!! 2024-07-28 02:31:01 -04:00
EliteMasterEric
f3624f7e76 Fixes for scripted song events, define vocal tracks per variation, display suffixed difficulties properly. 2024-07-28 01:42:09 -04:00
Burgerballs
1831daac38 Update PlayState.hx 2024-07-25 03:34:59 -04:00
Burgerballs
6e301bf648 Update PlayState.hx 2024-07-25 03:34:58 -04:00
Cameron Taylor
4164329ca9 Merge branch 'rewrite/master' into lemz1/note-kind-scripts 2024-07-22 22:20:58 -04:00
Cameron Taylor
bfa0bafc6f
Merge pull request #675 from FunkinCrew/bugfix/hud-hiding
Several tiny bug fixes
2024-07-19 19:10:28 -04:00
EliteMasterEric
7547875535 Allow hiding HUD on launcher builds. 2024-07-18 23:27:41 -04:00
Cameron Taylor
f90c2bda99
Merge branch 'rewrite/master' into anysad/tutorial-hey-events 2024-07-18 15:08:10 -04:00
Cameron Taylor
b0a842c2c7
Merge pull request #664 from FunkinCrew/gamerbross/chart-reload-f5
[PUBLIC PR] Pressing F5 in play state now reloads the chart data from your assets folder
2024-07-18 15:07:52 -04:00
EliteMasterEric
d4cbe74939 Smaller fixes tied to note kinds 2024-07-12 21:40:46 -04:00
lemz
b6eda8e498 remove note kind logic from playstate 2024-07-12 02:13:12 -04:00
lemz
c83e505f5b onUpdate, etc. works now too 2024-07-12 02:13:11 -04:00
lemz
134b467876 rename stuff 2024-07-12 02:13:10 -04:00
lemz
a7482410b9 add note kind scripts 2024-07-12 02:13:10 -04:00
gamerbross
e6c9767800 Revert camCutscene rename 2024-07-11 22:48:21 -04:00
gamerbross
17f5a06256 Add camOther to fix zooms on pause and stickers 2024-07-11 22:48:20 -04:00
EliteMasterEric
4a7545a0db Remove empty function. 2024-07-11 21:45:06 -04:00
anysad
18b795d4f7 Add HEY! song events to Tutorial 2024-07-11 21:39:20 -04:00
Cameron Taylor
5a26ece9d6
Merge branch 'rewrite/master' into gamerbross/chart-reload-f5 2024-07-11 19:59:15 -04:00
Cameron Taylor
19fd8b5e4e Merge branch 'gamerbross/chart-editor-key' into rewrite/master 2024-07-11 19:45:10 -04:00
gamerbross
7b9e4a0542 Fix F5 chart not reloading 2024-07-11 03:41:51 -04:00
EliteMasterEric
d8572cd323 Thank you loggo 2024-07-10 14:23:50 -04:00
Cameron Taylor
6e5c6a8f6d assets submod 2024-07-08 21:51:44 -04:00
Cameron Taylor
c9c94a5fda note fadein fix 2024-07-04 15:55:19 -04:00
EliteMasterEric
e32fcee77c Migrate results animations to JSON data so we can implement them per-character 2024-07-03 22:50:39 -04:00
AbnormalPoof
9d9d7a853c video cutscene autopause magic 2024-06-28 22:36:01 -04:00
gamerbross
a7bdf23832 Fix chart reset when charting and pressing chart key 2024-06-26 20:52:32 -04:00
Cameron Taylor
c05f053fe3 Merge branch 'rewrite/master' into bugfix/instrumental-id 2024-06-11 16:12:39 -04:00
EliteMasterEric
b30faad7d9 Save high scores and high ranks separately. 2024-06-11 00:40:43 -04:00
Eric
9a8ba4183e
Merge branch 'develop' into patch-1 2024-06-07 21:08:09 -04:00
gamerbross
cd485213db Pause Camera Follow when pausing 2024-06-08 02:26:17 +02:00
gamerbross
ee6c4478a9 Use FlxG.camera instead of camGame 2024-06-08 02:02:54 +02:00
Hundrec
393355b512
Fix botplay sustain release bug
Copied opponent's holdTimer code to the player's side
2024-06-07 19:59:02 -04:00
EliteMasterEric
d39f3dc1e8 Merge branch 'main' into develop 2024-06-07 19:54:30 -04:00
EliteMasterEric
ca345e6c4f Play song IDs based on the chart file's "instrumental" field, not the variation ID. 2024-06-06 21:38:00 -04:00
Cameron Taylor
7ef14b24c7 Merge branch 'prshit' into rewrite/master 2024-06-06 20:13:36 -04:00
Cameron Taylor
73c7bcf609
Merge branch 'rewrite/master' into burgerballs/scroll-speed-event 2024-06-06 19:49:47 -04:00
Cameron Taylor
51a44d4810 persistent draw false for results screen (fixes FUNK-256) 2024-06-01 23:36:57 -04:00
Cameron Taylor
c322e2aeef Merge branch 'rewrite/master' into feature/results-freeplay-transition 2024-05-30 21:05:32 -04:00
Eric
2380058820
Merge pull request #2328 from nebulazorua/new-judge-applying
New judge application logic
2024-05-30 16:10:17 -04:00
EliteMasterEric
b7a828e7d8 Make Freeplay use correct ranks, play the slam animation after Results, new Results music 2024-05-30 05:25:51 -04:00
Cameron Taylor
5adeada357 Merge branch 'gamerbross/scripted-stage-tostring' into develop-0.4.0 2024-05-29 16:49:12 -04:00
Cameron Taylor
827ad61602 Merge branch 'rewrite/master' into feature/results-clear-rank 2024-05-28 00:56:18 -04:00
Burgerballs
eb2b143a1c
Merge branch 'develop' into scroll-speed-fix 2024-05-24 17:23:45 +01:00
Burgerballs
b40bb98bb4
Merge branch 'develop' into scroll-speed-fix 2024-05-23 22:44:25 +01:00
EliteMasterEric
30fd86befb Merge branch 'feature/charter-in-pause-menu' into develop-0.4.0 2024-05-22 12:01:27 -04:00
EliteMasterEric
42ab0b74e3 Merge branch 'feature/results-clear-rank' into develop 2024-05-22 11:40:00 -04:00