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
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
Cameron Taylor
0f6ee32d8f
add saruky gf ringtone as easter egg
2024-05-01 16:23:02 -04:00
Cameron Taylor
05361af964
easter egg fix in progress
2024-05-01 15:54:44 -04:00
Cameron Taylor
192f1113b4
merch link freeplay fix
2024-05-01 15:22:20 -04:00
EliteMasterEric
9030b165df
Final attract screen
2024-04-30 19:01:39 -04:00
Cameron Taylor
7986dbe2a0
revert mainmenu persistentUpdate chagne
2024-04-30 16:30:22 -04:00
EliteMasterEric
11c0249f42
Fix an issue with Freeplay sorting when leaving an Erect song.
2024-04-30 14:36:57 -04:00
EliteMasterEric
e7a09fcee2
Fix an issue where returning to Freeplay from gameplay would let you interact with the menu underneath
2024-04-30 13:58:39 -04:00
EliteMasterEric
dae7d71b17
Better (but not perfect) results screen text alignment
2024-04-30 13:34:34 -04:00
Cameron Taylor
aff9ee5312
volume preference fix
2024-04-30 07:54:42 -04:00
Cameron Taylor
45941af161
Merge branch 'rewrite/master' into freeplay-objects-tweens
2024-04-30 04:15:22 -04:00
Cameron Taylor
c0ae253c40
Merge branch 'rewrite/master' into preloader-fnf-spacing
2024-04-30 04:15:00 -04:00
Cameron Taylor
61012fab68
dad art tween and shader on ost text
2024-04-30 03:22:30 -04:00
Cameron Taylor
84668432ba
better tween in for bg dad art
2024-04-30 01:38:00 -04:00
Cameron Taylor
b12d86c959
completion number and box fadeout
2024-04-30 01:33:29 -04:00
Cameron Taylor
0c72f0f5a2
fix spacing on the fnf text on the preloader
2024-04-30 01:09:40 -04:00
Cameron Taylor
ce24ad1a8a
add fullscreen rebindable keybind across whole game
2024-04-30 00:40:42 -04:00
Cameron Taylor
7610fb4205
Merge pull request #528 from FunkinCrew/main-menu-cam
...
persistentUpdate true main menu
2024-04-30 00:19:28 -04:00
Cameron Taylor
bd551092dc
persistentUpdate true main menu
2024-04-29 23:31:55 -04:00
Cameron Taylor
e1327f1b2c
remove filter from touch here to play, and make it more responsive to input
2024-04-29 23:00:39 -04:00
Cameron Taylor
12f5904aa5
Merge branch 'rewrite/master' into cutscene-updates
2024-04-29 22:21:06 -04:00
Eric
4856ea4435
Merge branch 'rewrite/master' into hxcodec-hmm
2024-04-29 22:12:41 -04:00
EliteMasterEric
3b1f84b4bd
Fixes to attract state.
2024-04-29 18:31:27 -04:00
EliteMasterEric
ea61c19aa5
Replace cutscenes.
2024-04-29 17:51:36 -04:00
Cameron Taylor
81f8338c99
sets the selected track as first one in group when swapping sorts on freeplay
2024-04-29 03:49:28 -04:00
Cameron Taylor
64b416e956
async the LoadingState asset preloads
2024-04-29 02:31:40 -04:00
FabsTheFabs
b35822f9a4
soundtray fade
2024-04-29 02:22:11 +01:00
EliteMasterEric
01b80ab5c8
Merge remote-tracking branch 'origin/input-offsets' into rewrite/master
2024-04-28 19:07:44 -04:00
Cameron Taylor
85350013d7
Merge pull request #511 from FunkinCrew/freeplay/cam-move
...
fix main menu -> freeplay camera positioning
2024-04-25 05:55:57 -04:00
Cameron Taylor
09ef915877
creds tweakin / polish
2024-04-25 05:45:27 -04:00
EliteMasterEric
85e06ef18f
Make it possible to escape the input offsets menu on controller.
2024-04-24 22:08:20 -04:00
EliteMasterEric
c3ba4081f1
Fix a crash issue caused when pressing a key after leaving the input offsets state.
2024-04-24 21:57:50 -04:00
EliteMasterEric
f474bc32a5
Merge remote-tracking branch 'origin/rewrite/master' into input-offsets
2024-04-24 21:54:45 -04:00
Cameron Taylor
1197f9646e
fix main menu -> freeplay camera positioning
2024-04-24 19:45:17 -04:00
EliteMasterEric
b6247c933a
Disable chart editor on web until it's fixed.
2024-04-24 16:00:50 -04:00
Cameron Taylor
e33f14ea5c
options screen menu bg fix
2024-04-24 12:11:37 -04:00
EliteMasterEric
3734c6ecd3
Make credits no longer pause and no longer autoformat. Add some names.
2024-04-24 01:48:39 -04:00
EliteMasterEric
374c042ad0
Fix a critical issue causing instrumental variations to not load on web.
2024-04-23 18:32:07 -04:00
Cameron Taylor
def8fc6977
Merge pull request #494 from FunkinCrew/freeplay-sorting-fixes
...
fix letter sort regex, and tiny LetterSort.hx cleanin
2024-04-23 04:52:40 -04:00
Cameron Taylor
6c63f84369
Merge branch 'rewrite/master' into bugfix/weekend-1-can-death-freeze
2024-04-23 04:14:41 -04:00
EliteMasterEric
66b45b526f
Fix issue where controller couldn't switch difficulties in Story Menu
2024-04-22 21:24:44 -04:00
EliteMasterEric
d760a0d209
Add Ctrl-Alt-Shift-W as a debug hotkey to unlock all Darnell songs in Freeplay
2024-04-21 17:23:48 -04:00
Cameron Taylor
5063e747a1
Merge pull request #501 from FunkinCrew/bugfix/credits-ng-logo
...
Fix the animated NG logo overlapping the text in the credits
2024-04-21 17:20:55 -04:00