Commit graph

1920 commits

Author SHA1 Message Date
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
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
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
anysad
d07564cdc2 hopefully final polish? 2024-07-28 02:44:16 -04:00
anysad
82a6ca5916 welcome fallback note styles! 2024-07-28 02:43:02 -04:00
anysad
d3209e57b7 goodbye scripts, hello notestyles! 2024-07-28 02:34:12 -04:00
anysad
d5a53855d3 how the hell did I miss these? 2024-07-28 02:31:25 -04:00
anysad
dc9dbe84fa cache textures at their new locations! 2024-07-28 02:31:25 -04:00
anysad
bf1d4031af remove trace 2024-07-28 02:31:20 -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
EliteMasterEric
729745899e Blacklist haxe.Unserializer in scripts. 2024-07-18 23:27:24 -04:00
EliteMasterEric
558ec53532 Switch songs with no difficulties from an error to a warning. 2024-07-18 23:27:12 -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
Cameron Taylor
8d9071d4fd
Merge pull request #669 from FunkinCrew/gamerbross/pause-sticker-zoom
[PUBLIC PR] Fix a bug where pausing during a camera zoom would break the HUD funk-612
2024-07-18 15:00:09 -04:00
FabsTheFabs
a0ab216617 merged rain shader stuff from 'feature/week2-erect-bg-rain' 2024-07-18 06:04:19 +01:00