Jenny Crowe
132eda6715
Merge branch 'rewrite/master' of https://github.com/FunkinCrew/Funkin-secret into feature/focusCameraTweening
2024-03-04 20:57:54 -07:00
Cameron Taylor
acc75c5c5c
use totalNotes instead of currentChart.notes.length
2024-03-04 21:25:56 -05:00
Cameron Taylor
fa72fa44b1
tallies for story mode
2024-03-04 21:18:40 -05:00
Cameron Taylor
d2b124efca
some highscore tallies debugging stuf in progress
2024-03-04 20:47:23 -05:00
Jenny Crowe
d9a69dac10
Merge branch 'rewrite/master' of https://github.com/FunkinCrew/Funkin-secret into feature/focusCameraTweening
2024-03-04 18:20:00 -07:00
Cameron Taylor
ae7d8b9046
Merge branch 'rewrite/master' into feature/blazin-animation-work
2024-03-04 18:11:11 -05:00
EliteMasterEric
73cf6b9fd2
Rewrite save data to fix scripted story levels. Add a "pre-transition death delay"
2024-03-04 16:37:42 -05:00
Mike Welsh
fcce345454
Avoid null reference error with music
2024-03-04 02:26:54 -08:00
EliteMasterEric
0294ea0b79
Implemented FlxAnimate characters into Blazin'.
2024-03-01 08:13:06 -05:00
EliteMasterEric
684eb919b5
Make the playback rate option explicit so it doesn't break in the future.
2024-02-29 18:49:20 -05:00
Jenny Crowe
db80bba100
Merge branch 'rewrite/master' of https://github.com/FunkinCrew/Funkin-secret into feature/focusCameraTweening
2024-02-29 15:11:20 -07:00
Cameron Taylor
e36629a41f
Merge branch 'rewrite/master' into feature/new-pause-menu
2024-02-29 13:53:55 -05:00
EliteMasterEric
1d70ff95f9
Several chart editor fixes (more precise playback speed, live input mode loads properly from save)
2024-02-28 21:19:21 -05:00
EliteMasterEric
2252040241
Fix custom pause music in Week 6, improve documentation
2024-02-28 14:51:39 -05:00
EliteMasterEric
8683900922
Fixes to cutscene pausing.
2024-02-28 03:53:36 -05:00
EliteMasterEric
5d030b8a31
Merge remote-tracking branch 'origin/rewrite/master' into feature/new-pause-menu
2024-02-28 03:04:56 -05:00
EliteMasterEric
cecddbc2ee
Fixed issues with audio in Week 6 after skipping the cutscene.
2024-02-28 03:01:20 -05:00
Jenny Crowe
858d8edf7a
Cam tweening working! UI buggy af. To fix.
2024-02-27 23:29:40 -07:00
EliteMasterEric
13d6ba378e
Work in progress on fixing Week 6
2024-02-28 00:19:08 -05:00
EliteMasterEric
90360de0d0
Working Blazin cutscene and fixed time travel
2024-02-26 19:03:04 -05:00
EliteMasterEric
e349b0bb49
New pre-caching techniques should reduce stuttering on Weekend 1.
2024-02-23 00:16:11 -05:00
EliteMasterEric
539b688055
Exploration in expanding FunkinSprite for optimization
2024-02-22 18:55:24 -05:00
EliteMasterEric
12335fef9d
Merge remote-tracking branch 'origin/rewrite/master' into feature/2hot-death-animation
2024-02-17 15:18:23 -05:00
Cameron Taylor
0a83f2f1e8
Merge branch 'rewrite/master' into feature/chart-editor-note-kind
2024-02-17 05:26:58 -05:00
Mike Welsh
a523b82439
Fix songs failing to load on HTML5 target
...
Do a small refactor of `LoadingState` to fix loading songs on the
when `NO_PRELOAD_ALL` is defined.
This allows the HTML5 target to progress into song gameplay again.
2024-02-16 21:00:44 -08:00
EliteMasterEric
de8fe2e271
Merge branch 'feature/chart-editor-note-kind' into feature/2hot-death-animation
2024-02-16 22:46:06 -05:00
EliteMasterEric
98e6d4091e
Revamp note kind handling in the chart editor.
2024-02-16 22:01:47 -05:00
Mike Welsh
e90c37ad75
Fix issue with incorrect music after pausing during countdown
...
Whenever you pause gameplay, the `PlayState` pauses the music.
But if you start a song from the main menu, pause during the 3,2,1
countdown, and then unpause, the main menu music will incorrectly
start playing again due to `FlxG.sound.music` still referencing it
before the gameplay song starts playing.
Only restart the music if it was actually playing to begin with by
storing the play state in `PlayState.openSubState` when we pause.
This hopefully avoids any other cases where the pause state gets
pushed while the music is stopped.
2024-02-16 04:54:27 -08:00
EliteMasterEric
5ec0939263
Bunch of changes to NoteScriptEvent and death logic
2024-02-15 17:25:28 -05:00
EliteMasterEric
c4522fe177
Merge branch 'rewrite/master' into rewrite/weekend-1-gameplay-shaderdev
2024-02-13 02:17:06 -05:00
EliteMasterEric
f7da12acbc
Apparently the transition bug was TransitionableSubState's fault so kill it with fire.
2024-02-13 02:09:25 -05:00
EliteMasterEric
f0b5ef4491
Rest in peace, SwagCamera.
2024-02-13 01:38:11 -05:00
Cameron Taylor
41e94f951e
Merge branch 'rewrite/master' of https://github.com/funkincrew/funkin-secret into feature/freeplay-pico-character
2024-02-13 00:48:26 -05:00
Cameron Taylor
8c54a62ed6
Merge branch 'rewrite/master' into feature/freeplay-pico-character
2024-02-13 00:41:03 -05:00
Cameron Taylor
6e0f577d54
debugger fixes
2024-02-13 00:29:46 -05:00
EliteMasterEric
0494ddb506
Fix crash in chart editor minimal Playtest
2024-02-12 23:19:25 -05:00
EliteMasterEric
ef28d34520
Sort PlayState imports
2024-02-12 16:50:29 -05:00
EliteMasterEric
d0b3842d44
Merge branch 'feature/freeplay-pico-character' into rewrite/weekend-1-gameplay-shaderdev
2024-02-10 02:38:23 -05:00
EliteMasterEric
eea8dde455
Merge branch 'rewrite/master' into rewrite/weekend-1-gameplay-shaderdev
2024-02-10 02:30:50 -05:00
EliteMasterEric
fa556dc1f2
Rewrite conversation JSON parsing code.
2024-02-07 09:21:44 -05:00
EliteMasterEric
82b63c02e1
Reworks to make Pico mode actually work.
2024-02-05 21:35:58 -05:00
EliteMasterEric
e5fb1de4ba
Fix a boatload of deprecation warnings and upgrade a few libraries.
2024-02-05 19:46:11 -05:00
EliteMasterEric
167976c8ba
Work in progress
2024-02-05 13:35:30 -05:00
EliteMasterEric
a0c4499b03
Fix a bug where replaying a level makes a pink screen
2024-01-17 23:12:59 -05:00
Cameron Taylor
96d02261c5
Merge branch 'rewrite/master' into feature/stage-solids
2024-01-17 21:40:26 -05:00
EliteMasterEric
80c7bcdfdf
Rewrite Stage data handling to use the Registry pattern, and add support for solid colors.
2024-01-16 17:08:25 -05:00
EliteMasterEric
3d2e50906f
I was in fact a dumbass.
2024-01-15 22:13:01 -05:00
EliteMasterEric
e391c02015
Polish note display visuals, and scrap Killer judgement.
2024-01-15 22:10:42 -05:00
EliteMasterEric
313fd55e98
WIP
2024-01-15 14:20:44 -05:00
EliteMasterEric
043fb553f6
Fix an issue causing an overflow error when using gamepad (WINDOWS ONLY)
2024-01-10 00:20:00 -05:00
