AppleHair
1f1fe62a06
[BUGFIX] Fixed Ranks not appearing in freeplay for custom variations
...
Freeplay tries to access a song's rank using the current difficulty name alone, but custom variation ranks are being saved with a variation prefix. This PR makes freeplay look for the variation prefix when necessary.
2024-06-14 16:53:33 +03:00
AppleHair
c4d6e18885
now using getVariationsByCharId instead
2024-06-12 11:23:45 +03:00
Cameron Taylor
47d5c4d141
Merge pull request #619 from FunkinCrew/freeplay-dad-smoother
...
freeplay bg nicer AA and proper sizing
2024-06-11 16:16:13 -04:00
Cameron Taylor
c05f053fe3
Merge branch 'rewrite/master' into bugfix/instrumental-id
2024-06-11 16:12:39 -04:00
Cameron Taylor
1e3ef61fc9
freeplay bg nicer AA and proper sizing
2024-06-11 15:57:45 -04:00
Cameron Taylor
817c216d06
Merge pull request #617 from FunkinCrew/bugfix/save-highest-rank
...
[FUNK-387] Save high scores and high ranks separately.
2024-06-11 12:04:38 -04:00
Cameron Taylor
381e0104e9
Merge pull request #616 from FunkinCrew/feature/freeplay-keybinds
...
[FUNK-391] Rebindable controls for the Freeplay menu
2024-06-11 11:49:24 -04:00
EliteMasterEric
b30faad7d9
Save high scores and high ranks separately.
2024-06-11 00:40:43 -04:00
Cameron Taylor
00021523bc
lower volume on freeplay easter egg
2024-06-10 17:35:49 -04:00
Ikko Eltociear Ashimine
e8f8a0c181
chore: update MenuList.hx
...
lenth -> length
2024-06-10 16:45:22 -04:00
Cameron Taylor
f31ea8fb73
add sound for changing sorting
2024-06-10 16:13:32 -04:00
gamerbross
8f44d9606d
Remove unnecessary scrollMenu sounds + adjust volume
2024-06-10 13:17:38 -04:00
AppleHair
9fa603363c
[BUGFIX] Made freeplay use the metadata to get the instrumental suffix
...
Song previews in freeplay will now use the instrumental suffix from the current difficulty's corresponding song variation metadata instead of using the variation id as an instrumental suffix and checking only the "erect" variation.
2024-06-10 19:42:27 +03:00
Cameron Taylor
4691e3d249
Merge branch 'bugfix/chart-editor-event-toolbox-crash' into rewrite/master
2024-06-10 12:26:47 -04:00
Cameron Taylor
b7d25bf04f
Merge branch 'escape-quit' into rewrite/master
2024-06-10 12:04:30 -04:00
Cameron Taylor
5dcd3eb946
Merge branch 'heart-capsule-pos' into rewrite/master
2024-06-10 12:04:09 -04:00
Cameron Taylor
55edb9ea14
pressing escape on title screen exits game
2024-06-09 15:38:22 -04:00
Cameron Taylor
d974f12c72
Merge branch 'develop' into rewrite/master
2024-06-09 15:30:14 -04:00
Cameron Taylor
f2d5a80bd1
completes funk-305
2024-06-09 15:06:45 -04:00
EliteMasterEric
09aa8fbf52
Rebindable controls for the Freeplay menu
2024-06-09 02:22:03 -04:00
Eric
4169116129
Merge branch 'develop' into abstract-optionname
2024-06-07 21:44:28 -04:00
gamerbross
1172949a04
Fix Options Menu not enabled in transIn
2024-06-07 21:31:53 -04:00
EliteMasterEric
2e4b94d528
Fix additional merge conflicts
2024-06-07 21:20:04 -04:00
EliteMasterEric
4382b3e16e
Merge branch 'develop' into richtrash21/freeplay-camera-optimization
2024-06-07 21:13:13 -04:00
EliteMasterEric
d39f3dc1e8
Merge branch 'main' into develop
2024-06-07 19:54:30 -04:00
Cameron Taylor
1d6315fe0e
Merge pull request #610 from FunkinCrew/2hot-freeplay
...
regexp for numbers
2024-06-07 14:33:56 -04:00
Cameron Taylor
34c91dae76
dadbattle hard/erect fix
2024-06-07 14:24:57 -04:00
Cameron Taylor
a0adbc72b3
regexp for numbers
2024-06-07 13:04:45 -04:00
Cameron Taylor
6fd030cb30
Merge branch 'patch-1' into rewrite/master
2024-06-07 11:38:57 -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
e45e359de7
Merge branch 'mainmenu-remember-selection' into rewrite/master
2024-06-06 20:15:11 -04:00
Cameron Taylor
73c7bcf609
Merge branch 'rewrite/master' into burgerballs/scroll-speed-event
2024-06-06 19:49:47 -04:00
EliteMasterEric
70f027cc3f
Fix another crash with the chart editor event toolbox
2024-06-06 16:44:47 -04:00
EliteMasterEric
a81b6b2d6e
Fix issue with rendering the grid in 3/4 time signature
2024-06-06 16:44:20 -04:00
FabsTheFabs
642f272bce
freeplay polish + new text
2024-06-06 01:49:33 +01:00
EliteMasterEric
6fb19dc4d3
Update chart editor dropdowns to be searchable
2024-06-05 20:09:26 -04:00
EliteMasterEric
6d133f007d
Fix a bug where the event data toolbox wouldn't rebuild, and it would crash.
2024-06-05 19:25:53 -04:00
Cameron Taylor
bc783a278a
rank clipping fix
2024-06-05 18:21:57 -04:00
Cameron Taylor
4311dd2074
hopefully dadbattle fix lol
2024-06-05 17:58:22 -04:00
Cameron Taylor
6334d16984
Merge branch 'ninjamuffin99/funk-250' into rewrite/master
2024-06-05 17:11:22 -04:00
Cameron Taylor
c1bfc67f52
remove effin trace
2024-06-05 15:43:25 -04:00
Cameron Taylor
5bcc0f9b25
partial sound loading should be more resiliant
2024-06-05 15:02:29 -04:00
Cameron Taylor
88248233b0
Merge pull request #599 from FunkinCrew/bugfix/results-percent-display
...
Fix some display issues with the clear percent in the results screen.
2024-06-05 01:48:43 -04:00
EliteMasterEric
640c1cf236
Dave say 1 minute to make Dad sneak up and 2 minutes to play the cartoons
2024-06-05 00:49:59 -04:00
Cameron Taylor
50990b15e1
heart glow
2024-06-04 23:36:32 -04:00
Cameron Taylor
cb773ed137
Merge branch 'ninjamuffin99/funk-269' into rewrite/master
2024-06-04 22:00:49 -04:00
Cameron Taylor
a643765db4
Merge branch 'ninjamuffin99/funk-270' into rewrite/master
2024-06-04 22:00:30 -04:00
Cameron Taylor
6a62f38c33
quicki fix for incorrect clip tweens
2024-06-04 16:51:27 -04:00
Cameron Taylor
84d4d044d6
check clip width when text changes
2024-06-04 16:47:58 -04:00
Cameron Taylor
29a33c8815
modifies behaviour of how the difficulty stars appear
2024-06-04 16:38:21 -04:00
Cameron Taylor
d4712a8ef7
alphabetical filtering for freeplay non-all sort
2024-06-04 16:24:24 -04:00
Cameron Taylor
75621435ea
lil more polish to fav icon + clipping
2024-06-02 02:53:07 -04:00
Cameron Taylor
c64db9966b
Merge branch 'rewrite/master' into rank-fixes
2024-06-02 02:19:36 -04:00
Cameron Taylor
7c6c51ea71
results dupe fix
2024-06-01 22:36:47 -04:00
EliteMasterEric
7aee1f900a
Fix a Results->Freeplay crash
2024-06-01 20:54:24 -04:00
Cameron Taylor
8248cffbaf
small bool cleanings, and maybe fixes
2024-06-01 20:36:14 -04:00
FabsTheFabs
63bd6f2ace
sparks nd more fixes.. i think
2024-06-02 00:25:52 +01:00
Cameron Taylor
c95ebaa948
Merge branch 'rewrite/master' into nothyper474/cwd-preloader
2024-06-01 16:27:08 -04:00
Cameron Taylor
c2cc73077f
Merge pull request #588 from FunkinCrew/ninjamuffin99/funk-244-preview-songs-on-freeplay-should-last-longer
...
make songs last longer on freeplay
2024-06-01 16:25:49 -04:00
Cameron Taylor
de92a7ba5c
Merge branch 'rewrite/master' into bugfix/may-31st-fixes
2024-06-01 16:23:37 -04:00
EliteMasterEric
12acdcd9d9
Fix a Results->Freeplay crash
2024-05-31 21:55:27 -04:00
EliteMasterEric
9088570b92
Make sure JSON data uses latest version/generatedBy when writing.
2024-05-31 19:21:21 -04:00
EliteMasterEric
8bf26322e9
Update generatedBy to the latest value when saving a chart.
2024-05-31 18:09:30 -04:00
Cameron Taylor
a1e34123f5
Merge pull request #582 from FunkinCrew/title-bg-fix
...
fix the one random slice of pixels where the bg doesnt show... lol (FUNK-239)
2024-05-31 18:08:05 -04:00
Cameron Taylor
72ca1145ba
Merge pull request #584 from FunkinCrew/hard-erect-lag-fix
...
removes trace() that lags freeplay
2024-05-31 18:07:48 -04:00
Cameron Taylor
d89a898e6c
make songs last longer on freeplay
2024-05-31 17:16:26 -04:00
FabsTheFabs
28444fd478
rank tweaks, favourite changes + rank anim fixes
2024-05-31 10:39:53 +01:00
EliteMasterEric
2a8cdfaffa
Fix an extra crash.
2024-05-31 02:30:42 -04:00
Cameron Taylor
7347b66ce4
removes trace() that lags freeplay
2024-05-30 23:07:41 -04:00
Cameron Taylor
7a2f3c81a1
fix the one random slice of pixels where the bg doesnt show... lol
2024-05-30 21:11:17 -04:00
Cameron Taylor
c322e2aeef
Merge branch 'rewrite/master' into feature/results-freeplay-transition
2024-05-30 21:05:32 -04:00
Cameron Taylor
5f70e1be0b
Merge branch 'develop-0.4.0' into rewrite/master
2024-05-30 20:54:27 -04:00
Cameron Taylor
d015e73066
Merge branch 'bugfix/multifix' into develop-0.4.0
2024-05-30 20:53:18 -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
EliteMasterEric
ee70e85dec
Merge branch 'rewrite/master' into feature/freeplay-shit+santa-cutscene
2024-05-29 23:56:51 -04:00
FabsTheFabs
e7079452fb
freeplay visual changes + base rank visuals
2024-05-30 04:34:00 +01:00
Eric
6cc9c3d968
Merge pull request #2409 from Burgerballs/scroll-speed-fix
...
[FEATURE] Scroll Speed Event
2024-05-29 23:22:03 -04:00
Eric
0388f887b5
Merge pull request #2565 from gamerbross/bugfix/charting-sustain-trails
...
[BUGFIX] Charting Editor Sustain Trails (2 bugs)
2024-05-29 22:54:49 -04:00
EliteMasterEric
8d7591a796
Fix an issue where Story Menu props wouldn't render.
2024-05-29 21:43:54 -04:00
Cameron Taylor
75b4baefca
Merge branch 'gamerbross/chart-editor-sustains' into develop-0.4.0
2024-05-29 16:54:19 -04:00
Cameron Taylor
4dca6671c4
Merge branch 'gamerbross/freeplay-crash' into develop-0.4.0
2024-05-29 16:53:26 -04:00
Cameron Taylor
a2fd14c031
Merge branch 'richtrash21/main-menu-camera' into develop-0.4.0
2024-05-29 16:51:24 -04:00
Cameron Taylor
3ba778606b
Merge branch 'sector-a/story-menu-score' into develop-0.4.0
2024-05-29 16:50:05 -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
e449dfa0ef
Merge branch 'bugfix/titlestate-startintro-crash' into develop-0.4.0
2024-05-29 16:48:10 -04:00
Cameron Taylor
4f34079b98
Merge branch 'audio-stream' into develop-0.4.0
2024-05-29 16:45:35 -04:00
Your Name
ee4be81062
Now Preloader resets CWD
2024-05-29 15:16:31 -03:00
Eric
934d6c2518
Merge pull request #2539 from gamerbross/bugfix/titlestate-startintro-crash
...
[BUGFIX] Fix TitleState bugs + crash
2024-05-29 01:50:46 -04:00
Eric
d02ecd17e8
Merge pull request #2576 from richTrash21/develop-mainmenu-fix
...
[BUGFIX] Main Menu Camera Fix
2024-05-29 01:17:34 -04:00
Eric
60d90c6698
Merge pull request #2585 from sector-a/main
...
Make texts update on difficulty change in Story Menu
2024-05-29 00:54:32 -04:00
EliteMasterEric
d97d77566e
Make song score lerp faster
2024-05-29 00:53:32 -04:00
Cameron Taylor
9aa2411b50
Merge branch 'rewrite/master' into audio-stream
2024-05-28 23:59:36 -04:00
Eric
fd9cfc2cb1
Merge pull request #2457 from gamerbross/bugfix/freeplay-no-song-data-crash
...
[BUGFIX] Freeplay Crash when song is invalid
2024-05-28 23:47:46 -04:00
Eric
5e1f61665a
Merge pull request #2553 from lemz1/loadingbar-fix
...
[BUGFIX] Fix Web Loading Bar (Again)
2024-05-28 23:37:16 -04:00
EliteMasterEric
58415d49c9
Merge remote-tracking branch 'secret/bugfix/html5-save-data' into loadingbar-fix
2024-05-28 22:52:19 -04:00
Cameron Taylor
8b73d4ef22
Merge branch 'rewrite/master' into bugfix/titlestate-startintro-crash
2024-05-28 02:20:45 -04:00
Cameron Taylor
e04a181d2c
Merge branch 'rewrite/master' into loadingbar-fix
2024-05-28 02:13:37 -04:00
EliteMasterEric
3b5e85d050
Merge remote-tracking branch 'secret/rewrite/master' into bugfix/html5-save-data
2024-05-28 01:35:43 -04:00
EliteMasterEric
3f9d8ccda9
Merge branch 'rewrite/master' into bugfix/html5-save-data
2024-05-28 01:34:16 -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
Cameron Taylor
b8ed779660
Merge branch 'rewrite/master' into feature/save-favorites
2024-05-23 17:14:07 -04:00
Cameron Taylor
c02d75b94a
Merge branch 'public-release/develop' into rewrite/master
2024-05-23 16:38:34 -04:00
richTrash21
4ca30a571d
safety
2024-05-23 21:52:28 +04:00
richTrash21
1c352e4e11
simplify freeplay camera
2024-05-23 21:50:11 +04:00
EliteMasterEric
0514e05328
Merge branch 'bugfix/html5-save-data' into develop-0.4.0
2024-05-22 15:15:56 -04:00
EliteMasterEric
55d66b858b
Merge branch 'feature/save-favorites' into develop-0.4.0
2024-05-22 15:15:47 -04: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
sector-a
d84e832c6c
Make texts update on difficulty change in Story Menu
2024-05-22 12:57:57 +03:00
Keoiki
4e47bfe68b
Fix Note Styles in PlayState & Chart Editor
2024-05-21 23:52:40 +03:00
EliteMasterEric
fed6d1146c
Do some cleanup (replace several utility functions with a utility library we already depend on!)
2024-05-21 04:02:32 -04:00
EliteMasterEric
6cb5816378
Add freeplay favorites to the save data so they persist between sessions.
2024-05-21 02:49:07 -04:00
richTrash21
1050176b27
main menu camera fix
2024-05-20 23:52:48 +04:00
gamerbross
9a18e3fde6
Fix Charting Dragging Sustain Trails
2024-05-20 01:38:52 +02:00
gamerbross
dcfc51cdcd
Fix Charting Sustain Trails Inverted
2024-05-20 01:37:35 +02:00
EliteMasterEric
228ac66cc2
Credit the song's charter in the pause menu.
2024-05-19 01:48:51 -04:00
lemz
e0867643d0
fix the setgraphicsize stuff
2024-05-19 01:39:30 +02:00
gamerbross
bc1c15e91c
Add Remember Selection to MainMenuState
2024-05-19 00:29:46 +02:00
EliteMasterEric
b6b93bb0c6
Added clear percent, rank name, and background text.
2024-05-17 20:26:34 -04:00
gamerbross
85b9de1de9
Allow Volume Keys while watching Toy Commercial (AttractState)
2024-05-17 23:53:43 +02:00
gamerbross
b10872e8e8
Fix TitleState late start + enter spam crash
2024-05-17 23:51:07 +02:00
rich
7a19bd4b50
Merge branch 'FunkinCrew:main' into debelop-freeplay-patch
2024-05-15 16:31:57 +04:00
Cameron Taylor
2434f64381
web fix for scroll
2024-05-14 21:21:47 -04:00
Cameron Taylor
1619751eab
Merge branch 'public-release/develop' into freeplayscrollwheel-bugfix
2024-05-14 21:13:48 -04:00
Cameron Taylor
0428482d04
Merge branch 'bugfix/freeplay-exiting-active' into public-release/develop
2024-05-13 21:30:02 -04:00
Cameron Taylor
e26d4ac440
Merge pull request #554 from FunkinCrew/bugfix/public-fixes
...
Eric's public bug fixes
2024-05-13 21:20:47 -04:00
Cameron Taylor
259df760bc
re-add lerp to load screen
2024-05-13 21:06:41 -04:00
rich
59e409f8e6
ensure that only freeplay camera gets destroyed
2024-05-14 04:30:36 +04:00
rich
3810662f9f
freeplay optimization
2024-05-14 04:20:23 +04:00
lemz
54f337fe9c
Merge remote-tracking branch 'origin/develop' into loadingbar-fix
2024-05-14 00:17:25 +02:00
lemz
4e935b47c6
Update LoadingState.hx
2024-05-14 00:04:45 +02:00
gamerbross
090e4fc6e8
Fixed doing actions when exiting Freeplay menu
2024-05-12 02:42:02 +02:00
JugieNoob
b22f09d4da
Fixed Scrolling on HTML5 Platforms
2024-05-12 02:21:59 +02:00
JugieNoob
4f8a0dbebf
Fixed Freeplay Scrolling Issue
2024-05-12 01:35:04 +02:00
gamerbross
c0485fd1a2
Fix Freeplay Crash when song is invalid
2024-05-11 20:11:51 +02:00
nebulazorua
fa4fa8116c
abstract enum pagename
...
should make adding modded optionspages better and easier
makes it so you dont have to leech off an unused PageName or write your own code for making modded options, helping with compatibility between mods.
2024-05-11 16:51:27 +08:00
EliteMasterEric
6c2d18c72c
Resurrected difficulty stars, fixed flame animation, fixed Random showing an album.
2024-05-11 01:05:51 -04:00
EliteMasterEric
a243b167b2
Fix up more credits
2024-05-09 22:37:01 -04:00
EliteMasterEric
c2650c0810
Merge remote-tracking branch 'public/bugfix/freeplay-lerp' into bugfix/public-fixes
2024-05-09 16:40:18 -04:00
Burgerballs
edfde606a1
magical machine of death
2024-05-09 17:51:03 +01:00
Cameron Taylor
f2a06ad37b
fading in and erect track loading
2024-05-09 01:56:52 -04:00
Cameron Taylor
1b6febf01c
initial freeplay songs loading
2024-05-09 01:15:01 -04:00
Eric
e3ee68abf2
Merge pull request #2370 from MadBear422/main
...
Character selection fix for chart editor
2024-05-08 23:08:48 -04:00
codist
df5bdc7b7d
Fixed stutter once a transition to the main menu completes.
2024-05-08 22:42:33 -04:00
MadBear422
4d1c2c1b88
Character selection fix for chart editor.
2024-05-08 15:30:40 -07:00
nebulazorua
2eaea3cdc5
Apply judgements through a seperate function to applyScore
...
Also adds more to the HitNoteScriptEvent, such as the noteDiff and also isComboBreak.
noteDiff is important as it lets you create stuff like notes with reduced hitboxes (i.e mines/"hurt notes") or millisecond hit displays. isComboBreak lets you set whether the judge combo broke, so you could in theory create custom judgements in scripts now with these changes (killer reimplementation in scripts? more likely than you'd think!)
2024-05-08 20:26:17 +08:00
codist
b49fac742f
Fixed stutter once a transition to the main menu completes.
2024-05-08 04:21:30 -04:00
