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
7f4c36c8f4
some checkstyle stuff
2024-03-04 19:03:43 -05:00
Cameron Taylor
1f1ccf6256
Merge pull request #361 from FunkinCrew/feature/philly-cars
...
Cars on Weekend 1 Stage
2024-03-04 18:19:16 -05:00
Cameron Taylor
078dc8e9ee
assets submod
2024-03-04 18:15:01 -05:00
Cameron Taylor
f661e36fbb
Merge pull request #360 from FunkinCrew/feature/blazin-animation-work
...
Week of Feb 26: Blazin' Animation Work
2024-03-04 18:11:36 -05:00
Cameron Taylor
ae7d8b9046
Merge branch 'rewrite/master' into feature/blazin-animation-work
2024-03-04 18:11:11 -05:00
Cameron Taylor
37d2d4eb4d
assets submod
2024-03-04 18:10:30 -05:00
FabsTheFabs
8ddf1ceb23
Update assets
2024-03-04 22:33:51 +00:00
EliteMasterEric
72044c572b
Update assets
2024-03-04 17:25:16 -05:00
EliteMasterEric
02cb4b5002
Update assets
2024-03-04 16:42:20 -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
Cameron Taylor
39fcf45747
Merge pull request #358 from FunkinCrew/feature/rain
...
Re-enable rain on phillyStreets
2024-03-04 16:17:36 -05:00
Cameron Taylor
4c8b0885cd
Merge branch 'rewrite/master' of https://github.com/FunkinCrew/funkin-secret into feature/rain
2024-03-04 16:15:33 -05:00
Cameron Taylor
bb7ed6d85c
Merge pull request #359 from FunkinCrew/bugfix/fadeTween
...
Avoid null reference error with music
2024-03-04 16:09:32 -05:00
Mike Welsh
5d00f57bfb
Properly handle pausing sounds with negative startTime
2024-03-04 03:43:17 -08:00
Mike Welsh
5557dbf28f
Avoid unpausing music when debugger is toggled
...
Workaround a Flixel issue where sounds can unpause after toggling
the Flixel debugger with F2, caused by the debugger throwing a
spurious onFocus event without an onFocusLost event.
2024-03-04 03:22:51 -08:00
Mike Welsh
fcce345454
Avoid null reference error with music
2024-03-04 02:26:54 -08:00
Mike Welsh
bdb0fe6b51
Bump assets submodule
2024-03-04 02:14:18 -08:00
Jenny Crowe
abb4400e41
Merge branch 'rewrite/master' of https://github.com/FunkinCrew/Funkin-secret into feature/focusCameraTweening
2024-03-03 02:51:01 -07:00
EliteMasterEric
c36ea962dc
Update assets submodule
2024-03-03 01:40:58 -05: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
761a3d53df
Taunt improvements.
2024-03-02 23:23:52 -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
Cameron Taylor
acde381bf2
Merge pull request #354 from FunkinCrew/bugfix/gf-winter-horrorland
...
Bugfix/gf winter horrorland
2024-03-02 13:55:04 -05:00
Cameron Taylor
8d04d37880
Merge pull request #353 from FunkinCrew/bugfix/mall-background-fix
...
fixed Background inconsistency in mall stage
2024-03-02 13:54:15 -05:00
EliteMasterEric
0294ea0b79
Implemented FlxAnimate characters into Blazin'.
2024-03-01 08:13:06 -05:00
FabsTheFabs
e7c8c941ca
added girlfriend back to winter horrorland
2024-03-01 05:41:54 +00:00
FabsTheFabs
c50e7abb74
fixed Background inconsistency in mall stage
2024-03-01 05:33:24 +00: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
d9dbb5791c
Merge pull request #348 from FunkinCrew/feature/new-pause-menu
...
Revamped Pause Menu and Cutscene Pausing
2024-02-29 13:54:13 -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
Cameron Taylor
aab050d757
trolled use FunkinCrew for hxcodec in hmm.json
2024-02-29 13:44:53 -05:00
EliteMasterEric
bad84b1a50
Merge branch 'feature/new-pause-menu' of https://github.com/FunkinCrew/Funkin-secret into feature/new-pause-menu
2024-02-29 02:50:10 -05:00
EliteMasterEric
0193c1ddea
Update hxCodec to add autoFocus
2024-02-29 02:50:04 -05:00
Cameron Taylor
2e012d54a4
assets submod
2024-02-29 02:26:29 -05:00
Cameron Taylor
45e256ebbb
Merge pull request #350 from FunkinCrew/feature/blazin-animation-work
...
Several chart editor fixes
2024-02-29 02:24:59 -05:00
EliteMasterEric
1102c483fd
Update assets submodule.
2024-02-29 01:19:51 -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
Jenny Crowe
7cf4ef5b22
Merge branch 'rewrite/master' of https://github.com/FunkinCrew/Funkin-secret into feature/focusCameraTweening
2024-02-28 19:05:04 -07: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
