EliteMasterEric
1b1834e98b
Implement a botplay checkbox in the chart editor
2024-03-05 22:27:07 -05:00
Eric
3aa4c23340
Merge branch 'rewrite/master' into bugfix/chart-editor-vocal-crash
2024-03-04 23:00:38 -05:00
Cameron Taylor
acc75c5c5c
use totalNotes instead of currentChart.notes.length
2024-03-04 21:25:56 -05:00
EliteMasterEric
d0f81add95
Fix a bug where Chart Editor Playtest destroys the vocals and crashes
2024-03-04 21:19:24 -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
Cameron Taylor
7f4c36c8f4
some checkstyle stuff
2024-03-04 19:03:43 -05: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
Hazel
0a19c7a8cb
fix(ci), feat(ci), refactor: i don't need sleep, i need answers ( #357 )
...
* hx the codec
* fix(ci,html5): use haxe.Timer instead of Sys.time
* refactor(compat): use haxe.Timer instead of Sys.time(), introduce TimerUtil to reduce code dupe
* fix: redundant types
* refactor(style): use TimerTools in place of haxe.Timer
* refactor: consistent timer code
* feat: build timings
* refactor(ci): cleanup ci configs
* sigh
* sigh, 2
* fix: haxelib deleterepo does not silently fail
* retrigger ci
* verbose output
* debug info after haxelib gti
* force haxelib git override
* more debug info
* force bash
* at least haxelib is consistent now
* fix the runners first, then do that
* update ci-haxe
* it is time?
* deleterepo may fail
* finishing touches
2024-03-02 23:49:27 -05:00
EliteMasterEric
f7a3d43e54
Fixes to animation looping and holds
2024-03-02 22:46:13 -05:00
fabs
f8481a0efe
fixed pico game over loop from playing a duplicate track ( #356 )
...
* fixed pico game over loop from playing a duplicate track that persists in menus
* assets submod
---------
Co-authored-by: Cameron Taylor <cameron.taylor.ninja@gmail.com>
2024-03-02 13:56:44 -05: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
Cameron Taylor
e36629a41f
Merge branch 'rewrite/master' into feature/new-pause-menu
2024-02-29 13:53:55 -05:00
Cameron Taylor
88f57cf520
pause menu tween polish
2024-02-29 13:53:09 -05:00
EliteMasterEric
0139d5c4f6
Fix a crash on atlas characters.
2024-02-29 01:19:32 -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
EliteMasterEric
13d6ba378e
Work in progress on fixing Week 6
2024-02-28 00:19:08 -05:00
EliteMasterEric
12a48b9b86
Work in progress on revamped, more extensible pause menu.
2024-02-26 23:18:56 -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
ddfb0c6a61
Working on more asset caching improvements.
2024-02-22 23:37:52 -05:00
EliteMasterEric
01ed1730f4
Fix some issues with cutscenes.
2024-02-22 20:56:41 -05:00
EliteMasterEric
539b688055
Exploration in expanding FunkinSprite for optimization
2024-02-22 18:55:24 -05:00
EliteMasterEric
44623071cd
Redo event stuff for abot and game over audio logic
2024-02-18 03:02:36 -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
bd4103fd11
Merge remote-tracking branch 'origin/rewrite/master' into feature/hashlink-hot-reload
2024-02-13 03:06:20 -05:00
EliteMasterEric
fa4b896d9a
Merge branch 'rewrite/master' into feature/hashlink-hot-reload
2024-02-13 02:23:14 -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
0ff258ce75
Use stickers to transition from the Results state
2024-02-12 23:34:51 -05:00
EliteMasterEric
1b5b7f0ae2
Fix a bug where stickers were broken on story mode
2024-02-12 23:34:40 -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