Commit graph

3131 commits

Author SHA1 Message Date
EliteMasterEric
119148acf0 Define for enabling/disabling log trace 2024-09-18 02:11:31 -04:00
Eric
598a3bea24
Merge branch 'develop' into fps-setting 2024-09-18 02:09:38 -04:00
Eric
b03d320c12
Merge pull request #3139 from AbnormalPoof/patch-1
chore: Update ScriptedFunkinSprite.hx
2024-09-18 01:58:40 -04:00
Kade
de07497ae3
Make addCharacter actually set the characters type 2024-09-17 17:29:12 -07:00
Lethrial
ea9dab4b73 Update Main.hx 2024-09-18 00:25:20 +01:00
Michael
f2b3f47e73 Disable input in CharSelect until stayFunky plays 2024-09-17 15:57:50 -07:00
dombomb64
6e33cac9ec ...Okay it wasn't that simple 2024-09-17 16:47:16 -04:00
Eric
dab417b391
Merge branch 'rewrite/master' into kadedev/chart-editor-fixes 2024-09-17 16:15:02 -04:00
dombomb64
0706192cbe Fix note scaling with one simple trick! 2024-09-17 13:50:59 -04:00
AbnormalPoof
aae7dcdada fix crash when opening urls 2024-09-16 23:35:23 -05:00
Til Tjardes
e6525d0129 stop being on the kickstarter crack me 2024-09-16 20:44:29 -06:00
Eric
6efdbde8da
Merge branch 'develop' into fps-setting 2024-09-16 22:09:54 -04:00
Til Tjardes
b7c3f5ac9f Chart Editor Icons are fixed now! 2024-09-16 20:04:04 -06:00
EliteMasterEric
811caf6b70 Suppress a spammy log trace 2024-09-16 21:54:33 -04:00
EliteMasterEric
2e9223ec72 Merge remote-tracking branch 'origin/develop' into anysad/custom-popups-countdowns 2024-09-16 20:50:13 -04:00
Kade
9624b57e44
This does fix it now 2024-09-16 17:23:49 -07:00
Kade
7d2b946e9c
depreciated screen X/Y to view X/Y 2024-09-16 17:13:14 -07:00
Kade
5a877a14a0
only show last two digits
digit
2024-09-16 17:13:13 -07:00
Kade
535ac0e528
add milliseconds to the playbar in charting state
remove laggy redundant traces

Revert "remove laggy redundant traces"

This reverts commit 204113840473dd5069f5d508d50e15e21104b45a.
2024-09-16 17:13:13 -07:00
Eric
f38a95bbf7
Merge branch 'develop' into fps-setting 2024-09-16 18:59:55 -04:00
Eric
8cad10263e
Merge branch 'develop' into bugfix/animation-editor 2024-09-16 18:37:35 -04:00
Eric
6bde7c34a0
Merge branch 'develop' into tweak/funkinsound-playonce-return-value 2024-09-16 18:36:45 -04:00
Eric
6ee1bddacb
Merge branch 'develop' into fix-sync 2024-09-16 18:27:27 -04:00
Eric
bab4ac4902
Merge branch 'develop' into bugfix/default-face-icon 2024-09-16 18:21:20 -04:00
lemz
224d930ae6 Update PreferencesMenu.hx 2024-09-17 00:17:56 +02:00
lemz
18edadb712 Merge branch 'fps-setting' of https://github.com/lemz1/Funkin into fps-setting 2024-09-17 00:16:33 +02:00
lemz
80fc0cd526 Update Preferences.hx 2024-09-17 00:16:27 +02:00
lemz
e7674ec31c
Merge branch 'develop' into fps-setting 2024-09-17 00:13:49 +02:00
Abnormal
0b531c5b21
add getPath 2024-09-16 22:13:16 +00:00
Til Tjardes
4be4570c94 Merge branch 'main' of https://github.com/FunkinCrew/Funkin into playsound-typo 2024-09-16 16:08:58 -06:00
lemz
d0ec26c44a
Merge branch 'develop' into completion-fix 2024-09-17 00:08:19 +02:00
lemz
8252b2a6b3
Merge branch 'develop' into substate-dispatch-event-fix 2024-09-17 00:07:25 +02:00
EliteMasterEric
16aff6e7c3 Fix bugs with highscore display in Freeplay 2024-09-14 21:37:02 -04:00
EliteMasterEric
9f3af1ab94 Add a separate Gold Perfect animation for modders 2024-09-14 20:56:21 -04:00
EliteMasterEric
fd6ca6e267 Remove some spammy log traces. 2024-09-14 20:26:33 -04:00
EliteMasterEric
d5c7e4ffdb Fix bug where Pico would become locked on every game restart. 2024-09-14 20:26:19 -04:00
Til Tjardes
0a8719088d techniktil coming back with another typo lets go 2024-09-14 15:06:03 -06:00
EliteMasterEric
df87d677e1 Typo lol 2024-09-14 17:00:41 -04:00
EliteMasterEric
517984d120 Fix a bug where Shit judgement would always display with anti-aliasing. 2024-09-13 18:46:49 -04:00
EliteMasterEric
d59594ee45 Fix animations not looping on Char Select 2024-09-12 22:02:05 -04:00
Cameron Taylor
af31be5436 makeship linky 2024-09-12 20:14:48 -04:00
Cameron Taylor
47f3c6f00a vid sizing 2024-09-12 19:56:04 -04:00
Cameron Taylor
d826f2a7bc Merge branch 'rewrite/master' into char-unlock-tinkers 2024-09-12 19:55:35 -04:00
Cameron Taylor
3103768d91
Merge pull request #747 from FunkinCrew/charselect-fade-fix
Fix transition out of character select
2024-09-12 19:14:34 -04:00
Cameron Taylor
10dfc96cf4 Merge branch 'freeplay-charselect-hint' into rewrite/master 2024-09-12 19:11:42 -04:00
CheemsAndFriends
1e9c6f0c4c Add Char Select stuff 2024-09-13 00:31:52 +02:00
FabsTheFabs
bc86f1f459 character select hint text 2024-09-12 22:44:40 +01:00
FabsTheFabs
5f60be6d75 allow controls to get dialouge name from control + ignore brackets 2024-09-12 22:44:22 +01:00
FabsTheFabs
703e899288 apply shader filter 2024-09-12 22:43:12 +01:00
CheemsAndFriends
34d1c568ea locked fixin 2024-09-12 23:22:20 +02:00
CheemsAndFriends
6dca858fd7 Introbizz 2024-09-12 23:13:30 +02:00
CheemsAndFriends
2a9814e030 port SAVE from develop 2024-09-12 22:58:31 +02:00
CheemsAndFriends
395de4ee95 Char select subs stuff 2024-09-12 22:53:01 +02:00
Cameron Taylor
89f4703977 Merge branch 'framerate-pref' into rewrite/master 2024-09-12 16:47:13 -04:00
EliteMasterEric
a9667c54f3 Fix FlxAtlasSprite completion handling and music looping 2024-09-12 15:48:41 -04:00
EliteMasterEric
3970189fe9 Ensure save data gets flushed when you see a character 2024-09-12 15:43:40 -04:00
Cameron Taylor
721cecd271 add preference option for framerate capping 2024-09-12 15:38:44 -04:00
EliteMasterEric
e5673549cf Fix issues with the difficulty selector showing non-existant difficulties in Freeplay 2024-09-12 15:38:20 -04:00
EliteMasterEric
386dc22d7b Debug hotkey properly resets char select cutscene 2024-09-12 15:34:16 -04:00
Cameron Taylor
bfb19cc67e lastTime error fix 2024-09-12 14:46:29 -04:00
Cameron Taylor
3de7047d22 Merge branch 'master-bugs' into rewrite/master 2024-09-12 14:34:21 -04:00
CheemsAndFriends
3553d008cf tinkering shit 2024-09-12 01:37:32 +02:00
CheemsAndFriends
70ab000be4 Readd CharSelectSubState from char unlock 2024-09-11 21:16:02 +02:00
CheemsAndFriends
cfcfc773da readd Save from char unlock 2024-09-11 20:53:05 +02:00
CheemsAndFriends
9f5c154b1d readd IntroSubState from char unlock 2024-09-11 20:49:55 +02:00
CheemsAndFriends
bea23c37a8 readd FlxAtlasSprite from char unlock branch 2024-09-11 20:47:45 +02:00
CheemsAndFriends
c81f041695 Tinkering with atlassprite 2024-09-11 20:05:39 +02:00
CheemsAndFriends
17a48bfc2b D'oh! 2024-09-11 19:26:38 +02:00
CheemsAndFriends
68d87a0837 Add one more conditional in atlas + add ignoreExclusions in Bopper/BaseCharacter 2024-09-11 19:24:21 +02:00
CheemsAndFriends
5c1766a00f Fix char select substate crash 2024-09-11 18:29:47 +02:00
CheemsAndFriends
0dc286e1d3 Fix Eggnog santa not playing plus Ugh fix 2024-09-11 18:29:31 +02:00
CheemsAndFriends
2aa9e58f67 Fix titlestate reentering crash 2024-09-11 18:29:00 +02:00
EliteMasterEric
0956b692d7 Add a debug hotkey to set characters as not seen. 2024-09-11 06:18:16 -04:00
EliteMasterEric
c63feaafbd BF force plays the unlock animation even when he would fist pump 2024-09-11 06:00:06 -04:00
EliteMasterEric
d1622040b6 Fix a bug where vocals would restart after a song ends 2024-09-11 04:22:33 -04:00
Cameron Taylor
22b1a5d9c0 Merge branch 'rewrite/master' into feature/char-unlock-merging 2024-09-10 23:52:52 -04:00
Cameron Taylor
9891dc7309 Merge branch 'rewrite/master' into bugfix/web-fixes 2024-09-10 23:43:26 -04:00
EliteMasterEric
9a242c5d00 Fix an issue where New labels wouldn't show on character mixes 2024-09-10 19:32:10 -04:00
EliteMasterEric
a530d91a76 Fix a bug where StickerSubState was being loaded as a state and not a substate, breaking some transitions 2024-09-10 19:16:48 -04:00
CheemsAndFriends
f74365f230 Add Changes 2024-09-11 00:55:14 +02:00
EliteMasterEric
c678cabbf2 Fix issue where difficulty names wouldn't show up properly sometimes. 2024-09-10 17:30:33 -04:00
EliteMasterEric
5021b49915 Enable the New Character backing card 2024-09-10 17:27:04 -04:00
Cameron Taylor
9c8142b769 Merge branch 'html5-fps' into rewrite/master 2024-09-10 15:40:30 -04:00
Cameron Taylor
96657e9e41 Merge branch 'rewrite/master' into week2-erect-bg-fixes 2024-09-10 07:38:38 -04:00
FabsTheFabs
03d9416ab1 texture swap shader 2024-09-10 07:26:15 +01:00
FabsTheFabs
34e93fa95a color util (with just one function lol) 2024-09-10 07:25:11 +01:00
EliteMasterEric
f6bd203786 Fix an issue where base inst wouldn't be chosen properly on remixes 2024-09-10 01:33:15 -04:00
Cameron Taylor
06389cb5cd Merge branch 'rewrite/master' into bugfix/doppel-random 2024-09-09 23:50:00 -04:00
EliteMasterEric
4c1b4859e7 Fix a bug where the random event in Week 3 would always trigger 2024-09-09 22:35:02 -04:00
EliteMasterEric
877d64c32b Fixed a bug where the instrumental selector would be ignored sometimes 2024-09-09 21:21:50 -04:00
CheemsAndFriends
af8fe0c0d2 Remove onAnimationLoopComplete 2024-09-10 01:11:41 +02:00
Cameron Taylor
e2c287e112 logarithmic volume control 2024-09-09 13:01:19 -04:00
Cameron Taylor
591d4a29f4 gameover positioning fixes 2024-09-09 12:34:55 -04:00
CheemsAndFriends
35af057f88 Fix scaleY not parsing 2024-09-09 17:41:25 +02:00
CheemsAndFriends
6961e6cc63 Add a buncho Gizmos 2024-09-09 08:23:46 +02:00
Abnormal
16905c8210
Update ScriptedFunkinSprite.hx 2024-09-08 21:48:48 +00:00
lemz
77346696f8 Update MusicBeatSubState.hx 2024-09-07 19:49:08 +02:00
Cameron Taylor
fbcf553bd9 Merge branch 'rewrite/master' into week5-alt-bg 2024-09-06 20:23:21 -04:00
CheemsAndFriends
f3722e5da2 Add hmm flxanimate, new conditional for Cheems' PC sake and more wip char select animation 2024-09-07 02:07:00 +02:00
FabsTheFabs
e0a4818e5a registry updates 2024-09-07 00:52:38 +01:00
Cameron Taylor
a623ec77f7 Merge branch 'feature/char-unlock-notif' into rewrite/master 2024-09-06 19:44:58 -04:00
Cameron Taylor
89e1cb8258 small null fix for if we're not playing music 2024-09-06 19:44:33 -04:00
CheemsAndFriends
a901677853 Merge branch 'feature/char-unlock' of https://github.com/FunkinCrew/Funkin-secret into feature/char-unlock 2024-09-06 06:33:01 +02:00
CheemsAndFriends
a61f40571d add wip bizz 2024-09-06 06:28:08 +02:00
CheemsAndFriends
1021f5c2ee wip sequence 2024-09-05 22:44:05 -04:00
CheemsAndFriends
4cad56705a Add lock bizz 2024-09-05 22:40:27 -04:00
CheemsAndFriends
677357ba37 wip sequence 2024-09-06 02:55:47 +02:00
EliteMasterEric
34d13c61de Cleanup character unlock impl and queue it for after Story Mode is completed. 2024-09-05 17:54:03 -04:00
Cameron Taylor
33aaabe190 lil console command helper for camera zoom 2024-09-05 01:22:45 -04:00
Cameron Taylor
0e37cb9540 Merge branch 'rewrite/master' into bugfix/blazin-flxanimate-fixes 2024-09-05 00:31:47 -04:00
Cameron Taylor
5c44e61ce1 assets submod 2024-09-05 00:20:55 -04:00
cyn
df266e66d3
dont do that 2024-09-04 19:24:14 -07:00
CheemsAndFriends
def2b64a41 Add lock bizz 2024-09-04 20:08:38 +02:00
EliteMasterEric
24096bd319 Fixed positioning in Blazin'. 2024-09-04 10:58:18 -04:00
EliteMasterEric
3a2ca6b525 Code changes to fix Blazin' 2024-09-04 09:58:04 -04:00
Cameron Taylor
788f0ee026 Merge branch 'bugfix/labor-daybor' into rewrite/master 2024-09-03 23:56:45 -04:00
Cameron Taylor
bd144d6adb Merge branch 'rewrite/master' into bugfix/friday-fixes 2024-09-03 23:42:51 -04:00
EliteMasterEric
36505f75c1 The actual code for custom freeplay music LOL 2024-09-03 21:14:57 -04:00
FabsTheFabs
b58bd07fd2 rain shader recolor support 2024-09-03 19:16:58 +01:00
FabsTheFabs
d049478c65 registry updates 2024-09-03 19:16:46 +01:00
Cameron Taylor
930f5ff5a6 Merge branch 'feature/instrumental-select-hud' into rewrite/master 2024-09-03 11:25:34 -04:00
Cameron Taylor
498cd4a830 Merge branch 'cards-and-char-select' into rewrite/master 2024-09-01 17:56:12 -04:00
EliteMasterEric
7511de1e7a A bunch of Freeplay visual fixes 2024-09-01 03:28:56 -04:00
FabsTheFabs
71da847158 forgot to change these back 2024-08-30 01:12:26 +01:00
FabsTheFabs
27970e4c2d freeplay style changelog oops 2024-08-30 01:04:51 +01:00
FabsTheFabs
60c10aae99 char select to freeplay transition, backing card implementation, beatHit for backing cards 2024-08-30 01:04:30 +01:00
FabsTheFabs
0c809c828e color tint for angle mask shader 2024-08-30 01:03:11 +01:00
FabsTheFabs
de03da7e6f backing card classes 2024-08-30 01:02:32 +01:00
FabsTheFabs
e7448cb8f7 style support 2024-08-30 00:58:19 +01:00
FabsTheFabs
a4f3c2cb84 freeplay style code 2024-08-30 00:55:24 +01:00
Cameron Taylor
78fb6e1188
Merge pull request #712 from FunkinCrew/menu-music-fix
FUNK-525 stop main menu music from playing when entering freeplay from pausemenu
2024-08-29 18:28:00 -04:00
Cameron Taylor
737a679196 merge conflict fixins 2024-08-29 15:26:35 -04:00
Cameron Taylor
825327e1c8 Merge branch 'rewrite/master' into feature/charSelect 2024-08-29 15:13:58 -04:00
Cameron Taylor
0392eddba6 gf/nene char select mini optimization 2024-08-29 14:32:10 -04:00
Cameron Taylor
b27aa4c94d Merge branch 'rewrite/master' into feature/pico-playable-christmas 2024-08-29 13:40:56 -04:00
Cameron Taylor
0a316c815f stop main menu music from playing when entering freeplay from pausemenu 2024-08-29 13:22:56 -04:00
Cameron Taylor
1fbca9ab6a Merge branch 'bugfix/various-develop-fixes' into rewrite/master 2024-08-28 16:32:50 -04:00
EliteMasterEric
6cff1efc72 Fix several compile errors, and update assets submodule. 2024-08-28 06:45:18 -04:00
EliteMasterEric
e7fca119f8 Logic + animations for new unlocks 2024-08-28 06:11:01 -04:00
EliteMasterEric
1fb5c31c22 Don't apply global offset twice (NOTE: this may break Nene again!) 2024-08-28 06:09:34 -04:00
EliteMasterEric
7e39687994 Data driven char select grid positions 2024-08-28 06:09:14 -04:00
EliteMasterEric
16a6dba9df Pico Fist Pump animation (with loss animation) 2024-08-28 06:08:30 -04:00
EliteMasterEric
2e7eabc494 Remember character ID between visits to Freeplay, plus some fixes to prevent spamming keys 2024-08-28 06:05:28 -04:00
EliteMasterEric
570e672296 Fix magenta flicker on the main menu. 2024-08-28 06:03:26 -04:00
EliteMasterEric
152820f2e1 Fix some warnings with props in StoryMenu 2024-08-28 06:03:12 -04:00
EliteMasterEric
89402f8bb8 Fix a bug where Bot Play could miss (via lag or the player mashing) and lose the song. 2024-08-28 05:47:34 -04:00
EliteMasterEric
ccabded2cc Fix warning related to bad asset caching for judgements. 2024-08-28 05:43:41 -04:00
EliteMasterEric
af93da6cd4 Fixes to Chart Editor toolboxes 2024-08-28 05:43:23 -04:00
EliteMasterEric
b0f04779dc Fix to Spooky icon in Freeplay menu 2024-08-28 05:43:01 -04:00
EliteMasterEric
382af3b485 Reimplement ghost tapping (disabled via compile define) 2024-08-28 05:42:14 -04:00
EliteMasterEric
469ff6690f Fix a crash when skipping in the song before it started. 2024-08-28 05:40:50 -04:00
CheemsAndFriends
353aa42f5b Fixes for the atlasSprite bizz 2024-08-28 02:48:56 +02:00
Cameron Taylor
9b712ce2aa bump flixel 2024-08-27 16:13:52 -04:00
Cameron Taylor
861b869b2d fonts fix for mac 2024-08-27 15:23:27 -04:00
Cameron Taylor
ce62c240fa Merge branch 'rewrite/master' into bugfix/nene-pico-offsets 2024-08-27 14:40:56 -04:00
Cameron Taylor
a7334d8ff9
Merge pull request #705 from FunkinCrew/bugfix/week-4-boppers
Fix a bug where stage props would receive events twice
2024-08-27 14:26:19 -04:00
EliteMasterEric
d02f632c0e Fix a bug where stage props would receive events twice 2024-08-27 04:54:02 -04:00
EliteMasterEric
df42ac7531 Fixed issues with Nene offsets in Pico mode 2024-08-27 04:20:49 -04:00
EliteMasterEric
200b3c963b Updated compile defines to use feature flag system 2024-08-26 18:01:36 -04:00
cyn
00c7767f8a
Update FunkinSound.hx 2024-08-23 20:17:10 -07:00
FabsTheFabs
55dd1857c9 freeplay transition + wip card classes 2024-08-23 13:36:35 +01:00
FabsTheFabs
e37330f288 character select transition 2024-08-23 13:36:00 +01:00
FabsTheFabs
0d3fa41b29 blue fade shader 2024-08-23 13:35:50 +01:00
CheemsAndFriends
7f0f0efe46 initial Commit 2024-08-22 23:36:43 +02:00
Cameron Taylor
5756eff7cf dont need null check, we just need to declare string type 2024-08-21 16:39:34 -04:00
Cameron Taylor
e1d8e758bb completion server fixin? 2024-08-21 16:31:10 -04:00
Cameron Taylor
cee5d53deb
Merge pull request #686 from FunkinCrew/applehair/freeplay-stack-overflow
[PUBLIC PR] Fix a stack overflow for songs with no "Normal" difficulty
2024-08-20 15:09:36 -04:00
Cameron Taylor
df588f86af Merge branch 'rewrite/master' into applehair/storymode-valid-variation 2024-08-20 15:06:07 -04:00
Cameron Taylor
78d299db4e Merge branch 'gamerbross/animation-editor' into rewrite/master 2024-08-20 15:03:42 -04:00
Cameron Taylor
76edf2e4e9 remove unused imports 2024-08-20 14:44:53 -04:00
Cameron Taylor
6e3fba4d3d Merge branch 'rewrite/master' into gamerbross/animation-editor 2024-08-20 14:29:43 -04:00
Cameron Taylor
1b309e33ef
Merge branch 'rewrite/master' into 70ltan/char-path-fix 2024-08-20 14:21:36 -04:00
CheemsAndFriends
a6f8cf0141 Setting a simple mask test 2024-08-20 01:20:13 +02:00
CheemsAndFriends
82eea221d8 Can't seem to understand AtlasSprite 2024-08-19 14:41:20 +02:00
CheemsAndFriends
8a2d8a9941 Committing all the additional stuff (Lowering FPS
For my PC lol)
2024-08-19 13:41:29 +02:00
CheemsAndFriends
4dad17d241 Prepare the FlxAnimate bizz 2024-08-19 13:40:58 +02:00
FabsTheFabs
9d85d423c6 add stage to registry and chart editor 2024-08-19 04:29:22 +01:00
Cameron Taylor
0e46f91a60 Merge branch 'rewrite/master' into feature/album-art-swap 2024-08-16 20:21:51 -04:00
Eric
f4e42375d1
Merge branch 'rewrite/master' into applehair/freeplay-stack-overflow 2024-08-12 14:37:18 -04:00
Eric
6e1ff4a6b1
Merge branch 'rewrite/master' into 70ltan/char-path-fix 2024-08-12 14:37:16 -04:00
Eric
f5826e3a35
Merge branch 'rewrite/master' into applehair/storymode-valid-variation 2024-08-12 14:37:15 -04:00
Cameron Taylor
21fe5f12be Merge branch 'ninjamuffin99/funk-644' into rewrite/master 2024-08-09 23:02:02 -04:00
Cameron Taylor
e105f933ac Merge branch 'rewrite/master' into anysad/custom-countdowns 2024-08-09 23:00:03 -04:00
Cameron Taylor
cce6434570 Merge branch 'rewrite/master' into feature/erect-stages 2024-08-07 19:43:37 -04:00
Cameron Taylor
62d0b33689 Fix for switching to old icon on isPixel levels 2024-08-06 13:44:02 -04:00
Hyper_
d43042fd36 Fix out of bounds note selection 2024-08-05 20:02:23 -03:00
Cameron Taylor
960c151985
Merge pull request #682 from FunkinCrew/haxelib-updates
Update OpenFL to latest
2024-08-05 10:48:12 -04:00
FabsTheFabs
270748d108 fuck these decimals messing up my compiling 2024-07-31 14:36:24 +01:00
FabsTheFabs
3b7e656793 add stage names to registry + chart editor 2024-07-31 14:36:06 +01:00
Cameron Taylor
f4a2ac4dde Merge branch 'rewrite/master' into bugfix/character-offset-fixes 2024-07-29 21:25:33 -04:00
AppleHair
cb02ea7da5 Updated to extend #2712 2024-07-29 19:03:54 -04:00
AppleHair
c8322c479c Added a comment 2024-07-29 19:03:52 -04:00
AppleHair
4f46a8e4d0 [BUGFIX] Prevented infinite recursion on freeplay when a song doesn't have the normal difficulty
Any attempt to create a song without the `normal` difficulty will result in a silent crash when opening freeplay. After some debugging, I discovered that the issue is caused by infinite recursion, which gets triggered at the start of `FreeplaySongData`'s `updateValues`.
2024-07-29 19:03:37 -04:00
7oltan
e2297af1cd FIX CHARACTER PATHS ISSUE 2024-07-29 18:54:26 -04:00
AppleHair
eb78b754f8 A fix requested by Eric 2024-07-29 18:34:59 -04:00
AppleHair
bef2e98222 [BUGFIX] Ensure the variation used for the next song is valid.
When playing in story mode, `PlayState` assumes all the songs use the same variation, which is usually true, but not guaranteed. This PR makes `PlayState` use the `getFirstValidVariation` method to find the valid variation instead of using the `currentVariation` variable, which might not be valid.
2024-07-29 18:34:59 -04:00
EliteMasterEric
68b7610225 Update OpenFL to latest (requires a few fixes) 2024-07-29 17:26:49 -04:00
Cameron Taylor
f1af005cf3 Merge branch 'rewrite/master' into burgerballs/song-resync-tweaks 2024-07-29 14:04:41 -04:00
Cameron Taylor
ee584d780c Merge branch 'rewrite/master' into flooferland/new-settings-types 2024-07-29 13:44:01 -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