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
972f649d82
Merge pull request #2604 from gamerbross/bugfix/legacy-chart-importer-instrumental
...
[BUGFIX] Chart Importer Wrong Instrumental
2024-05-29 01:10:40 -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
Eric
eeaae74b46
Merge pull request #2603 from gamerbross/bugfix/unscripted-stage-trace
...
[BUGFIX] Unscripted Stage Log Trace (missing toString for Stage)
2024-05-29 00:27:36 -04:00
Cameron Taylor
9aa2411b50
Merge branch 'rewrite/master' into audio-stream
2024-05-28 23:59:36 -04:00
Cameron Taylor
2d300039ae
promises + error out partial sounds that attempt to load multiple times
2024-05-28 23:53:50 -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
Eric
db7b97d513
Merge pull request #562 from FunkinCrew/loadingbar-fix
...
[PUBLIC PR] Loading Bar Fix
2024-05-28 23:37:10 -04:00
EliteMasterEric
58415d49c9
Merge remote-tracking branch 'secret/bugfix/html5-save-data' into loadingbar-fix
2024-05-28 22:52:19 -04:00
Eric
34ca8dcd24
Merge pull request #2488 from MaybeMaru/downscroll
...
Fix hold notes on downscroll
2024-05-28 22:02:46 -04:00
EliteMasterEric
f0cd6c50c8
Merge remote-tracking branch 'secret/rewrite/master' into downscroll
2024-05-28 21:57:29 -04:00
gamerbross
cf61b9ef90
Add toString to Stage + Revert "Fix Unscripted Stage Log Trace"
2024-05-28 14:51:16 +02:00
Cameron Taylor
f89e33d551
Merge branch 'rewrite/master' into Ethan-makes-music/main
2024-05-28 02:41:16 -04:00
Cameron Taylor
9ccee66b47
Merge branch 'rewrite/master' into downscroll
2024-05-28 02:24:40 -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
9a47666fc7
Fix a merge issue.
2024-05-28 01:37:30 -04:00
EliteMasterEric
3b5e85d050
Merge remote-tracking branch 'secret/rewrite/master' into bugfix/html5-save-data
2024-05-28 01:35:43 -04:00
Axuko
004ed32fad
Remove alot of unused imoprts
2024-05-27 22:34:28 -07: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
PurSnake
cb2f4b0f06
[BUGFIX] Correct characters scaling
...
bruh
2024-05-25 21:00:10 +03:00
gamerbross
4acfbfb76d
Fix Legacy Chart Importer wrong instrumental
2024-05-25 01:21:37 +02:00
gamerbross
07959d3e88
Fix Unscripted Stage Log Trace
2024-05-25 01:08:17 +02:00
EliteMasterEric
dd3e241f0c
Fix some merge conflicts
2024-05-24 16:44:12 -04:00
Cameron Taylor
85bfd00bad
desktop vis testing
2024-05-24 16:38:35 -04:00
EliteMasterEric
e44266f5c0
Merge remote-tracking branch 'secret/feature/results-clear-rank' into develop-0.4.0
2024-05-24 13:29:35 -04:00
Burgerballs
eb2b143a1c
Merge branch 'develop' into scroll-speed-fix
2024-05-24 17:23:45 +01:00
Eric
b167e485a1
Merge pull request #2593 from gamerbross/feature/legacy-healthicon-winning
...
[FEATURE] Add Winning support to Legacy Health Icons
2024-05-24 01:51:10 -04:00
EliteMasterEric
44880fa569
Implement placeholder GREAT animation
2024-05-24 00:06:26 -04: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
Cameron Taylor
a2ee359e46
fix for songs overlapping each other on desktop
2024-05-23 16:31:18 -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
gamerbross
5e130eeffc
Add Winning support to Legacy Health Icons
2024-05-23 18:18:37 +02: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
EliteMasterEric
f17f639304
Finish implementing smaller numbers.
2024-05-22 01:07:20 -04:00
Keoiki
4e47bfe68b
Fix Note Styles in PlayState & Chart Editor
2024-05-21 23:52:40 +03:00
EliteMasterEric
6d3b58cecd
Fix some additional compiling issues.
2024-05-21 04:02:53 -04: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
EliteMasterEric
f3868c2ee8
An attempt at an HTML5 save data fix
2024-05-21 02:23:21 -04:00
richTrash21
1050176b27
main menu camera fix
2024-05-20 23:52:48 +04:00
etvx86
9968c8eabc
Fix some trace typos
2024-05-20 10:42:17 -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
13595fca70
Changelog entry for chart metadata
2024-05-19 01:49:06 -04:00
EliteMasterEric
228ac66cc2
Credit the song's charter in the pause menu.
2024-05-19 01:48:51 -04:00
EliteMasterEric
faf7a0643c
Tinkered with ghost tapping some, leaving it off for now tho.
2024-05-19 01:47:36 -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
Eric
6744c1d261
Merge pull request #2518 from gamerbross/bugfix/gameover-charting-crash
...
[BUGFIX] ChartingState GameOver Crashes
2024-05-18 14:17:29 -04:00
Eric
8432f0668a
Merge pull request #2540 from gamerbross/bugfix/attract-toycommercial-allow-volume
...
[BUGFIX] Allow Volume Keys while watching Toy Commercial (AttractState)
2024-05-18 14:13:28 -04:00
SanicBTW
6b42da0902
Keep the consistency in Conductor
2024-05-18 09:04:27 +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
gamerbross
f1a0692c51
Fix ChartingState GameOver Crashes
2024-05-15 22:50:34 +02:00
Burgerballs
21333ee8dc
burgerbugs require burgerfixes
2024-05-15 17:26:03 +01:00
Burgerballs
eaf998adf7
curse burgerballs
2024-05-15 17:24:04 +01:00
Burgerballs
96de434d75
multiplicative added!! + sum tween fixes
2024-05-15 17:17:09 +01:00
nebulazorua
e462b04b59
does notesplash
2024-05-15 20:46:08 +08:00
rich
a8279cdd76
Merge branch 'FunkinCrew:main' into develop-char-opt
2024-05-15 16:32:22 +04:00
rich
7a19bd4b50
Merge branch 'FunkinCrew:main' into debelop-freeplay-patch
2024-05-15 16:31:57 +04:00
Cameron Taylor
bd7b1fb544
Merge branch 'public-release/main' into develop-0.3.3
2024-05-14 22:15:29 -04:00
Cameron Taylor
84a4a23d3c
Merge branch 'polish/game-over-transition' into public-release/develop
2024-05-14 21:32:05 -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
MaybeMaru
c5caa0331e
Update Strumline.hx
2024-05-13 22:17:47 +02:00
Hyper_
24933f5bb9
Replace concatenation with string interpolation
2024-05-13 17:16:49 -03:00
richTrash21
7df41ebc56
minor optimization
2024-05-13 21:35:26 +04:00
NotHyper-474
0322a83882
Fix "Invalid argument '&'" error
2024-05-12 23:16:12 -03:00
MaybeMaru
c270f61cac
Update Strumline.hx
2024-05-13 02:21:43 +02:00
MaybeMaru
b22dd4d7d4
Update Strumline.hx
2024-05-13 02:18:57 +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
Ikko Eltociear Ashimine
6a52efe8a4
Update ScriptEventType.hx
...
relevent -> relevant
2024-05-11 18:10:15 +09: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
83c3ff478c
Added Clear % tally to results.
2024-05-10 22:09:09 -04:00
Burgerballs
5fd2ea0bcf
optimization of the cleary boy (:
2024-05-10 21:37:46 +01:00
Burgerballs
a5700b37e1
awesome shit (see desc)
...
No longer Additive, it just sets the scroll speed
Now you can set it to either strumline
2024-05-10 21:23:35 +01:00
EliteMasterEric
5d5cf74020
Reimplement rank-based results animations.
2024-05-09 22:37:21 -04:00
EliteMasterEric
a243b167b2
Fix up more credits
2024-05-09 22:37:01 -04:00
EliteMasterEric
99bd3a370f
Merge remote-tracking branch 'public/bugfix/duplicate-controls-binds' into bugfix/public-fixes
2024-05-09 16:41:42 -04:00
EliteMasterEric
c2650c0810
Merge remote-tracking branch 'public/bugfix/freeplay-lerp' into bugfix/public-fixes
2024-05-09 16:40:18 -04:00
EliteMasterEric
3207fd82f3
Merge remote-tracking branch 'public/bugfix/easter-egg-crash' into bugfix/public-fixes
2024-05-09 16:40:11 -04:00
EliteMasterEric
0b82a206ef
Merge remote-tracking branch 'public/bugfix/crash-handler-flxstate-check' into bugfix/public-fixes
2024-05-09 16:39:53 -04:00
Burgerballs
e5ee6efdf4
redundancy is bad!!!!
2024-05-09 20:01:26 +01: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
codist
bfaa4626f8
Polish for the transition from GameOverSubState back into PlayState.
2024-05-09 01:10:53 -04:00
EliteMasterEric
4d5c0444c8
Fix an issue where control binds would be duplicated and quickly multiply.
2024-05-09 00:46:21 -04:00
Cameron Taylor
77446f28d7
Merge pull request #549 from FunkinCrew/sanitized/bugfix/easter-egg
...
Fix an error related to an easter egg, plus some script warnings.
2024-05-08 23:30:50 -04:00
Cameron Taylor
9730ef4280
Merge pull request #550 from FunkinCrew/sanitized/bugfix/shader-crash-freeplay
...
Fix a shader crash on Freeplay on some AMD cards.
2024-05-08 23:21:52 -04:00
Eric
34a6e16385
Merge pull request #2323 from nebulazorua/main
...
Chart debug key takes you back to chart editor if you're charting
2024-05-08 23:14:59 -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
Sword352
f6334fb30b
Use animOffsets
directly.
2024-05-08 22:18:41 +02:00
nebulazorua
4b500f78e1
Revert change because i forgot to do it in a new branch oriignally lol
2024-05-08 20:30:47 +08: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
nebulazorua
f5143c2d78
this is better
2024-05-08 19:56:13 +08:00
nebulazorua
6fdc090ecc
i have accidentally done this and wiped out my chart many times
2024-05-08 19:53:47 +08:00
codist
b49fac742f
Fixed stutter once a transition to the main menu completes.
2024-05-08 04:21:30 -04:00
EliteMasterEric
4e5531744a
Curse you burgerballs
2024-05-08 03:23:00 -04:00
Sword352
dd86934712
did the requested changes
2024-05-08 09:22:49 +02:00
Eric
6742e5c833
Merge pull request #2308 from Burgerballs/patch-1
...
Fix some spaghetti on PlayAnimationSongEvent
2024-05-08 02:32:26 -04:00
EliteMasterEric
2e74678caf
Fix an issue where the Freeplay menu never displays 100% clear.
2024-05-08 01:54:48 -04:00
Sword352
7ce3eabd17
Better character animation offsets handling.
2024-05-08 07:35:46 +02:00
codist
000e256b0e
Fixed an issue where hold note would be invisible for a single frame.
2024-05-08 01:20:39 -04:00
Burgerballs
2743a853bc
Fix some spaghetti on PlayAnimationSongEvent
2024-05-08 06:03:12 +01:00
EliteMasterEric
cfeca56634
Fix an error related to an easter egg, plus some warnings.
2024-05-08 00:36:22 -04:00
EliteMasterEric
be07760103
Fix a crash when querying FlxG.state
2024-05-08 00:08:44 -04:00
TheGalo X
5160fd02d4
fix window tween
2024-05-07 23:17:49 -03:00
EliteMasterEric
7ff37ae0c2
Fix a conflict between a shader variable name and a function on some graphics cards.
2024-05-07 14:22:22 -04:00
EliteMasterEric
a652bfe9f0
Fix an error related to an easter egg, plus some warnings.
2024-05-07 14:01:00 -04: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
EliteMasterEric
5e63832a87
Revert "Moved scroll speed to an instance variable"
...
This reverts commit 6e5171b766
.
2024-05-02 23:06:01 -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
f3ec29ea46
Polymod now properly accesses ZIP mods.
2024-05-02 12:46:51 -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
23a27dd36e
Implement onSongLoaded script event (with access to notes and events)
2024-05-02 04:11:27 -04:00
EliteMasterEric
65854b2ca8
Fix an issue with animated health icons from mods.
2024-05-02 04:09:38 -04:00
EliteMasterEric
88c7ed7949
Fix substate lifecycle script events not dispatching.
2024-05-02 04:08:51 -04:00
EliteMasterEric
4d7f3a3643
Granted access to scripts to some otherwise blacklisted functions.
2024-05-02 04:08:32 -04:00
EliteMasterEric
75af1b3947
Add mod list to crash logs
2024-05-02 04:07:56 -04:00
EliteMasterEric
cf01157b39
Mid-song cutscenes should just do nothing after they are finished,
2024-05-02 03:39:18 -04:00
EliteMasterEric
b06a35ea2f
Add , and . hotkeys to chart editor.
2024-05-02 03:38:27 -04:00
EliteMasterEric
656e5e7cf1
Blacklist more sensitive modules.
2024-05-02 02:49:55 -04:00
EliteMasterEric
244db84d61
Block people from doing SKETCHY SHIT in mods
2024-05-02 01:52:14 -04:00
EliteMasterEric
5ce9e98b15
Add an error handler to DebugBoundingState.
2024-05-02 00:32:40 -04:00
EliteMasterEric
6e5171b766
Moved scroll speed to an instance variable in PlayState (for da modders :P)
2024-05-01 22:39:13 -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
aaeb77a1f5
preventDefaultKeys for PreciseInputManager, and just use the FlxG.keys version
2024-05-01 17:23:22 -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
bbccdfe3fb
Fix issue when git status returns empty string.
2024-05-01 13:40:46 -04:00
EliteMasterEric
73baabfa82
Detect if your local Git has been modified and display it.
2024-05-01 13:29:54 -04:00
EliteMasterEric
afdd28dbe2
Automatically mark -release builds as not prototype.
2024-05-01 12:56:13 -04:00
EliteMasterEric
02cc41fc98
Catch a potential crash when retrieving the render method
2024-05-01 11:41:15 -04:00
EliteMasterEric
72c83e7eb0
Don't show an error dialog twice.
2024-05-01 11:40:51 -04:00
EliteMasterEric
776747c2d9
Git Commit macro now available in all builds.
2024-05-01 11:40:23 -04:00
EliteMasterEric
9ffbc8479c
Fix for another reported crash
2024-04-30 23:59:25 -04:00
EliteMasterEric
079b1f327a
Fix two crashes thanks to a crash report
2024-04-30 23:24:43 -04:00
EliteMasterEric
109a3f50fb
Always fetch git hash while building and always display git hash in the logs.
2024-04-30 22:42:58 -04:00
Cameron Taylor
8a8872680a
save
2024-04-30 20:52:02 -04:00
EliteMasterEric
06ce5eb44b
Potential save fix
2024-04-30 20:15:23 -04:00
Cameron Taylor
f5cbfbf631
more save fixes
2024-04-30 20:03:24 -04:00
Cameron Taylor
8ac59d80ec
save file fixins in progress
2024-04-30 19:54:55 -04:00
Cameron Taylor
36ab5d441c
save file nullcheck
2024-04-30 19:30:11 -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
80a881a5ce
autoPause save fix
2024-04-30 08:13:39 -04:00
Cameron Taylor
aff9ee5312
volume preference fix
2024-04-30 07:54:42 -04:00
Cameron Taylor
23dd9937ec
black camera bg
2024-04-30 07:21:45 -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
dbae4aff8f
Fix crash when initializing screenshots when there is no save data
2024-04-29 19:28:47 -04:00
EliteMasterEric
3b1f84b4bd
Fixes to attract state.
2024-04-29 18:31:27 -04:00
EliteMasterEric
3786b0a23a
Fix build issue on release builds.
2024-04-29 18:31:20 -04:00
EliteMasterEric
ea61c19aa5
Replace cutscenes.
2024-04-29 17:51:36 -04:00
Eric
c8dcda89a1
Merge branch 'rewrite/master' into freeplay-no-randoms
2024-04-29 15:55:52 -04:00
Eric
9599536ffc
Merge branch 'rewrite/master' into hxcodec-hmm
2024-04-29 15:55:45 -04:00
Hazel
3a7efeeca3
fix(ci): linux private repo issues ( #524 )
2024-04-29 20:04:01 +01: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
c609e3591b
fixed classic camera reset
2024-04-29 02:22:33 +01:00
FabsTheFabs
b35822f9a4
soundtray fade
2024-04-29 02:22:11 +01:00
FabsTheFabs
3083305f51
fix pixel combo numbers being huge
2024-04-29 02:21:44 +01:00
EliteMasterEric
01b80ab5c8
Merge remote-tracking branch 'origin/input-offsets' into rewrite/master
2024-04-28 19:07:44 -04:00
Cameron Taylor
0f84050957
Merge pull request #515 from FunkinCrew/debug-stuff
...
homemade flixel tracker button
2024-04-28 02:45:28 -04:00
Cameron Taylor
46dcd4c8ea
homemade flixel tracker button
2024-04-27 01:17:15 -04:00
Cameron Taylor
99934c8039
change the initial animation frame for abot
2024-04-26 23:48:17 -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
Cameron Taylor
7d2713a731
this doesn't need to be here
2024-04-25 01:55:51 -04:00
Cameron Taylor
12b5d6d086
some result screen polish
2024-04-25 01:53:13 -04:00
EliteMasterEric
dd90d430ee
Replace the zoom with a fade (for now)
2024-04-24 23:50:19 -04:00
EliteMasterEric
7c6bf7ef45
Fix the alignment of the song name in the results screen
2024-04-24 23:50:11 -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
e0721b901e
Fix a bug where negative visual offsets would break the countdown.
2024-04-24 21:57:23 -04:00
EliteMasterEric
17a15a3947
Reposition notes based on the configured input offset (so you still hit them when centered)
2024-04-24 21:57:17 -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
5aba4008ac
Merge branch 'feature/2hot-cutscenes-eric' into bugfix/weekend-1-can-death-freeze
2024-04-23 04:20:28 -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
1e5153f133
Fix an issue where zooming in the camera would persist to results screen
2024-04-22 23:04:57 -04:00
EliteMasterEric
6edd9e8c6a
Make cars stop moving while the game is paused.
2024-04-22 22:30:29 -04:00
EliteMasterEric
66b45b526f
Fix issue where controller couldn't switch difficulties in Story Menu
2024-04-22 21:24:44 -04:00
Cameron Taylor
23051a5c60
Merge branch 'rewrite/master' into feature/2hot-cutscenes-eric
2024-04-21 17:26:55 -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
EliteMasterEric
4671a9172c
Fix the NG logo overlapping the text
2024-04-20 23:48:27 -04:00
EliteMasterEric
7f18eb62d7
Moved can explosion animation to weekend1 library so it's preloaded.
2024-04-20 23:04:08 -04:00
EliteMasterEric
84c3fd452b
Update Weekend 1 cutscenes to use the instanced Conductor
2024-04-20 02:11:04 -04:00
EliteMasterEric
a9dd85c865
Merge remote-tracking branch 'origin/feature/conductor-signal-rework' into feature/2hot-cutscenes
2024-04-19 18:49:18 -04:00
Cameron Taylor
678dbc0ab7
Merge branch 'rewrite/master' into a-bot-bars
2024-04-19 15:11:28 -04:00
Cameron Taylor
57df7db5f1
add small #if web define
2024-04-19 15:10:43 -04:00
Cameron Taylor
9500722a72
Merge branch 'rewrite/master' into polish/popup-combo-fixes-rebased
2024-04-19 15:00:37 -04:00
Cameron Taylor
49a81189c4
use funkinaction in controls.hx
2024-04-19 15:00:12 -04:00
FabsTheFabs
351cb8cbaa
popupstuff changes + make combopopup able to be edited outside of playstate
2024-04-19 14:14:33 -04:00
Cameron Taylor
5d8c28ca2b
Merge branch 'rewrite/master' into bugfix/blazin-death-confirm
2024-04-19 14:05:52 -04:00
Cameron Taylor
035db7f00a
Merge branch 'rewrite/master' into bugfix/draw-crash
2024-04-19 14:03:58 -04:00
Cameron Taylor
22e411d43f
Merge branch 'rewrite/master' into feature/chart-editor-gamepad-support
2024-04-19 13:57:42 -04:00
Cameron Taylor
93ae7692c8
Merge branch 'rewrite/master' into bugfix/weekend-1-bug-fixes
2024-04-19 13:55:01 -04:00
Cameron Taylor
1adef48995
some cleanins with letter sorts
2024-04-18 11:32:11 -04:00
Cameron Taylor
c3e777154e
fix letter sort regex, and tiny LetterSort.hx cleanin
2024-04-18 11:32:11 -04:00
Cameron Taylor
bb7b863272
Fix an issue where changing focus would pause some sounds but not others ( #491 )
...
Repro: Start a song then switch to another window. Instrumental and opponent pause but player doesn't.
2024-04-17 20:08:26 -04:00
Cameron Taylor
fd2356aed4
Fix a crash in the Results state. also nudge GF over to the spot shes in in the FLA ( #490 )
2024-04-17 20:07:47 -04:00
EliteMasterEric
b982484856
Properly fix the menu background to use the correct line colors.
2024-04-16 20:19:20 -04:00
Cameron Taylor
1405e21e3d
Merge branch 'rewrite/master' into a-bot-bars
2024-04-16 20:02:08 -04:00
EliteMasterEric
80a558ac08
Fix an issue where changing focus would pause some sounds but not others.
2024-04-16 19:57:19 -04:00
EliteMasterEric
d346c9387c
Fix a crash in the Results state. also nudge GF over to the spot she's in in the FLA
2024-04-16 19:42:52 -04:00
EliteMasterEric
bc0a27c985
Fix references to missing graphics in Freeplay
2024-04-16 18:43:11 -04:00
Cameron Taylor
2d5153cdbf
Merge branch 'rewrite/master' into bugfix/remove-kickstarter-backers
2024-04-16 13:33:02 -04:00
Cameron Taylor
fab6412bc6
Merge pull request #486 from FunkinCrew/bugfix/main-menu-color
...
Fix the saturation on the main menu background.
2024-04-16 13:25:46 -04:00
Cameron Taylor
e6dc795d2a
Merge branch 'rewrite/master' into bugfix/lingering-hold-cover
2024-04-16 13:25:00 -04:00
Eric
b553dbd517
Remove janky animation on Freeplay menu. ( #488 )
2024-04-16 13:24:41 -04:00
EliteMasterEric
43ec72fb9d
Ensure playNoteHoldCover doesn't call if note is judged as 'miss'
2024-04-15 20:36:38 -04:00
EliteMasterEric
4d1f60434a
Fix the saturation on the main menu background.
2024-04-15 19:21:55 -04:00
Cameron Taylor
bc0af9ae9f
temp enabling fps
2024-04-14 03:01:07 -04:00
Cameron Taylor
658fd392fa
Merge branch 'rewrite/master' into a-bot-bars
2024-04-14 02:57:05 -04:00
EliteMasterEric
5e7b417d6f
Remove Kickstarter link from credits.
2024-04-12 14:44:01 -04:00
EliteMasterEric
6f5c3a043f
Fix crash caused when game tries to render disposed sprites during a Sticker transition.
2024-04-10 14:45:07 -04:00
Cameron Taylor
5f48ca82bd
Merge branch 'rewrite/master' into bugfix/additional-fixins
2024-04-09 23:50:05 -04:00
Cameron Taylor
54496c400b
Merge pull request #479 from FunkinCrew/bugfix/no-save-data
...
Fix bad initial save data when no save data present
2024-04-09 23:34:28 -04:00
Cameron Taylor
0f9ecda2a1
Merge branch 'rewrite/master' into html5/asset-optimization
2024-04-09 20:25:37 -04:00
Cameron Taylor
f00c6085e4
Merge pull request #477 from FunkinCrew/bugfix/song-compile-define
...
Fix loading issue tied to -DSONG compile define.
2024-04-09 20:15:24 -04:00
EliteMasterEric
dbcbb73338
Main menu fix and Week 3 train fix
2024-04-09 15:10:58 -04:00
Mike Welsh
97884021c0
Fix bad initial save data when no save data present
...
If no save data was present, the game would check for legacy save
data in the ninjamuffin99 path to migrate over. This code was
incorrectly checking `FlxSave.data == null` to determine if
legacy data was present.
This caused an empty legacy save being migrated over, resulting
in a `volume` of 0 for any new player of the game.
2024-04-08 22:08:24 -07:00
EliteMasterEric
6d374c7af9
Fix loading issue tied to -DSONG compile define.
2024-04-08 18:39:51 -04:00
EliteMasterEric
b464f51ba2
Fix an issue where a missing stage would cause a crash (rather than an error popup)
2024-04-06 22:38:32 -04:00
EliteMasterEric
ea1d123c49
Fixes to Pico Blazin' animations.
2024-04-06 21:42:31 -04:00
EliteMasterEric
5beb20ec7c
Fix bug where restarting the song would sometimes crash.
2024-04-06 21:42:18 -04:00
EliteMasterEric
14869b9373
Also disable highscores in botplay
2024-04-06 02:08:10 -04:00
EliteMasterEric
99ee2b07ca
Make results screen use full campaign score in Story Mode
2024-04-06 02:06:06 -04:00
EliteMasterEric
29f105a44d
Practice mode = no highscore!
2024-04-06 01:59:46 -04:00
Cameron Taylor
3b87ecf6f5
Merge branch 'html5/asset-optimization' of github.com:FunkinCrew/Funkin-secret into html5/asset-optimization
2024-04-05 19:59:25 -04:00
Cameron Taylor
da4f1fb424
remove difficulty stars
2024-04-05 19:47:33 -04:00
EliteMasterEric
a6d44b1f15
Removed many unused assets to optimize bandwidth usage.
2024-04-05 19:43:52 -04:00
Cameron Taylor
90f53a78c1
Merge pull request #470 from FunkinCrew/bugfix/results-gf-cam-zoom
...
Readd GF camera zoom into results state.
2024-04-05 16:43:47 -04:00
Cameron Taylor
fe52fdfbad
assets submod
2024-04-05 16:40:37 -04:00
EliteMasterEric
95434018f7
Readd GF camera zoom into results state.
2024-04-05 02:56:47 -04:00
Eric
fd88ebef63
Merge pull request #467 from FunkinCrew/retro-fade
...
small fade polish for week 8 convos
2024-04-05 02:47:10 -04:00
EliteMasterEric
9c8ab72494
Merge remote-tracking branch 'origin/rewrite/master' into bugfix/quick-camera-fixes
2024-04-05 02:45:23 -04:00
EliteMasterEric
08e8530ad4
Fix SetCameraBopSongEvent to be additive
2024-04-05 02:44:44 -04:00
EliteMasterEric
a764112bd4
Removed many unused assets to optimize bandwidth usage.
2024-04-05 01:24:03 -04:00
EliteMasterEric
72a3742890
Fixes and improvements to LatencyState
2024-04-04 19:46:08 -04:00
EliteMasterEric
9a874d5293
Fix for weird HSV colors
2024-04-04 19:45:57 -04:00
EliteMasterEric
07092269b8
Merge branch 'rewrite/master' into input-offsets
2024-04-04 18:45:16 -04:00
EliteMasterEric
e35eb63d53
Merge branch 'rewrite/master' into hl-compiles
2024-04-04 18:16:07 -04:00
EliteMasterEric
823baa3326
Add new album roll animation (again)
2024-04-04 16:30:04 -04:00
Cameron Taylor
acb58a6b49
remove sitelock
2024-04-04 05:41:44 -04:00
Cameron Taylor
64cab4d137
removed duplicate merge
2024-04-04 05:37:48 -04:00
Cameron Taylor
8f3406cb0e
Merge branch 'rewrite/master' into feature/results-screen-score
2024-04-04 05:34:29 -04:00
Cameron Taylor
544dcdf809
Merge branch 'rewrite/master' into bugfix/chart-editor-weekend-1
2024-04-04 05:32:26 -04:00
Cameron Taylor
ec47ee4285
Merge pull request #461 from FunkinCrew/bugfix/debuggercheckbox-crash
...
Prevent a crash trying to open a non-existant debugger checkbox.
2024-04-04 05:30:41 -04:00
Cameron Taylor
3cb1f65e1d
Merge pull request #465 from FunkinCrew/bugfix/miss-judgement
...
Hide miss popups when hitting ~160ms
2024-04-04 05:30:23 -04:00
Cameron Taylor
57a5973c2c
small fade polish for week 8 convos
2024-04-04 05:22:44 -04:00
Cameron Taylor
39d92eb09d
fast loading on preloader
2024-04-04 04:55:27 -04:00
Cameron Taylor
eed8299cfd
Merge branch 'rewrite/master' into bugfix/hide-freeplay-menu-rating
2024-04-04 04:47:45 -04:00
Cameron Taylor
99cdb62175
updated color
2024-04-04 04:46:38 -04:00
EliteMasterEric
33685b2bcd
Fix an issue where player could not switch difficulties from Pause menu until they beat Weekend 1.
2024-04-04 04:08:07 -04:00
Cameron Taylor
c23f97917c
Merge branch 'rewrite/master' into preloader-polish
2024-04-04 03:43:23 -04:00
EliteMasterEric
3ac466aa5e
Add missing MapTools function from #459
2024-04-04 03:35:36 -04:00
EliteMasterEric
8826d0741b
Hide miss popups when hitting ~160ms
2024-04-04 03:31:44 -04:00
EliteMasterEric
57d6ed118d
Hide Rating on the right side of the items in Freeplay
2024-04-04 03:31:03 -04:00
EliteMasterEric
f129cb7997
Fix a bug where if Weekend 1 wasn't cleared, you can't chart those songs
2024-04-03 21:57:29 -04:00
EliteMasterEric
d8903f138f
Additional save fix
2024-04-03 20:50:51 -04:00
EliteMasterEric
58427363d1
Prevent a crash trying to open a non-existant debugger checkbox.
2024-04-03 20:33:51 -04:00
EliteMasterEric
b39712d33f
Prevent crashes when the game attempts to load bad save data.
2024-04-03 20:31:34 -04:00
EliteMasterEric
4f2f28cb31
Fix issue with deepMerge() caused by handling maps incorrectly, causing an unhandleable crash.
2024-04-03 15:05:54 -04:00
EliteMasterEric
d911c46d2f
Better scoring numbers and improved anims.
2024-04-03 06:24:20 -04:00
EliteMasterEric
1759f5c388
Note cover now only plays splash on player
2024-04-03 04:52:28 -04:00
EliteMasterEric
e9d8546737
More results screen changes
2024-04-03 04:52:12 -04:00
Cameron Taylor
ad39ce3c21
local conductor got removed somewhere?
2024-04-03 04:43:12 -04:00
Cameron Taylor
99e19f8460
Merge branch 'rewrite/master' into hl-compiles
2024-04-03 03:40:22 -04:00
Cameron Taylor
b7c6b1aaf6
Merge pull request #458 from FunkinCrew/bugfix/a-couple-more-fixes
...
Bugfix/a couple more fixes
2024-04-03 03:38:37 -04:00
Cameron Taylor
668f47f761
Merge pull request #457 from FunkinCrew/html5/touch-to-start
...
Fix some build issues with HTML5.
2024-04-03 03:37:41 -04:00
EliteMasterEric
f7141e7096
Fixed an issue with save data not loading defaults properly.
2024-04-03 01:41:52 -04:00
EliteMasterEric
2b4bf42ac4
Fix multiple music, and crashes in freeplay
2024-04-03 01:41:47 -04:00
EliteMasterEric
f7ff381bc7
Fix some build issues with HTML5.
2024-04-02 23:33:10 -04:00
EliteMasterEric
90cf53b959
Someone forgot to merge assets from the credits branch.
2024-04-02 17:27:29 -04:00
Cameron Taylor
dcffe0537f
Merge branch 'rewrite/master' into bugfix/buncha-2hot-fixes
2024-04-01 22:40:10 -04:00
Cameron Taylor
03cbba4a4e
Merge branch 'rewrite/master' into feature/freeplay-ost-text
2024-04-01 22:21:29 -04:00
Cameron Taylor
d6723a8212
Merge branch 'rewrite/master' into bugfix/freeplay-menu-transition
2024-04-01 22:14:29 -04:00
Cameron Taylor
8a60115df6
Merge pull request #454 from FunkinCrew/feature/erect-filter-freeplay
...
Freeplay menu now filters to supported songs when you change difficulty
2024-04-01 22:08:25 -04:00
Cameron Taylor
165e20c318
Merge pull request #453 from FunkinCrew/bugfix/judgements-below-notes
...
Bugfix/judgements below notes
2024-04-01 22:08:00 -04:00
Cameron Taylor
db89e199c4
Merge pull request #455 from FunkinCrew/bugfix/results-screen-cleanup
...
Bunch of results screen fixes
2024-04-01 22:07:43 -04:00
Cameron Taylor
7fb4b47e2a
Merge branch 'rewrite/master' into feature/credits
2024-04-01 22:06:58 -04:00
EliteMasterEric
67e096e443
Bunch of results screen fixes
2024-04-01 21:59:53 -04:00
Cameron Taylor
bf9f87e9e7
Merge pull request #441 from FunkinCrew/bugfix/spookeez-hold-note
...
Bugfix/spookeez hold note
2024-04-01 21:00:14 -04:00
EliteMasterEric
927b2a7cfc
Put judgements below the notes, and remove COMBO word.
2024-04-01 20:21:27 -04:00
EliteMasterEric
1df4a354cb
Freeplay menu now filters to supported songs when you change difficulty
2024-04-01 18:34:26 -04:00
Cameron Taylor
ac5ca3991e
Merge branch 'rewrite/master' into feature/new-audio
2024-03-30 03:32:30 -04:00
Cameron Taylor
52c5f81e26
Merge branch 'rewrite/master' into bugfix/week-6-blueball-camera
2024-03-30 03:24:46 -04:00
Cameron Taylor
32ed26ffa6
stereo preloader in progress
2024-03-29 17:54:20 -04:00
EliteMasterEric
28462681b2
Fix bug where 100ms sustains wouldn't update their rendering.
2024-03-29 00:52:20 -04:00
EliteMasterEric
7c04630bb7
Fix a bug where duplicate notes would get placed at the beginning
2024-03-29 00:49:02 -04:00