Commit graph

925 commits

Author SHA1 Message Date
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
lemz
26b357df72 Merge branch 'fps-setting' of https://github.com/lemz1/Funkin into fps-setting 2024-05-30 00:22:18 +02:00
lemz
4a531888b5 Update PreferencesMenu.hx 2024-05-30 00:22:10 +02: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
lemz
262bcc4d8b
Merge branch 'develop' into fps-setting 2024-05-29 18:45:09 +02: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
lemz
088ff3744a
Merge branch 'develop' into fps-setting 2024-05-29 07:26:35 +02: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
lemz
01b1ce679c
Merge branch 'develop' into fps-setting 2024-05-29 06:42:46 +02: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
lemz
267fd0eadc alpha stuff and correct text positioning 2024-05-25 16:30:08 +02:00
lemz
814d72cb3f sounds 2024-05-25 03:06:27 +02:00
lemz
b75f6e5853 Update PreferencesMenu.hx 2024-05-25 02:19:11 +02:00
lemz
dd6d12de23 rename vars 2024-05-25 01:20:10 +02:00
lemz
f86a163692 Merge branch 'develop' into fps-setting 2024-05-25 01:16:34 +02:00
lemz
e0fe7cb1eb add fps option 2024-05-25 01:11:34 +02: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
EliteMasterEric
2e74678caf Fix an issue where the Freeplay menu never displays 100% clear. 2024-05-08 01:54:48 -04:00
TheGalo X
5160fd02d4
fix window tween 2024-05-07 23:17:49 -03:00
Cameron Taylor
1aa53ee97b Merge branch 'story-mode-diff-position' into develop-0.3.2 2024-05-03 01:14:31 -04:00
Cameron Taylor
7efc633f45 Merge branch 'actual-merch-fix' into develop-0.3.2 2024-05-03 01:12:23 -04:00
Cameron Taylor
ae9a132ccd remove typing bit 2024-05-03 01:12:18 -04:00
Cameron Taylor
6620b2e83c actual merch fix stuff 2024-05-02 23:02:47 -04:00
Cameron Taylor
a3969ad5c0 hardcode storymenu difficulties to avoid overlaps 2024-05-02 21:37:07 -04:00
EliteMasterEric
a2aa1bd84a Remove unused "typing" element. 2024-05-02 21:23:55 -04:00
EliteMasterEric
76b7baa44a Remove options from the debug menu 2024-05-02 20:06:08 -04:00
EliteMasterEric
a8a2dc83d3 Add a .visible attribute to story weeks. 2024-05-02 12:46:24 -04:00
EliteMasterEric
dc50a4ba5e Clean up log spam in the preloader. 2024-05-02 12:45:31 -04:00
EliteMasterEric
88c7ed7949 Fix substate lifecycle script events not dispatching. 2024-05-02 04:08:51 -04:00
EliteMasterEric
b06a35ea2f Add , and . hotkeys to chart editor. 2024-05-02 03:38:27 -04:00
EliteMasterEric
5ce9e98b15 Add an error handler to DebugBoundingState. 2024-05-02 00:32:40 -04:00
EliteMasterEric
1e5f90774c What if modded songs showed up in game with no extra work? 😳 2024-05-01 21:51:33 -04:00