Commit graph

3668 commits

Author SHA1 Message Date
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
Cameron Taylor
be348d0f13 moved vis code 2024-03-01 00:15:51 -05:00
Cameron Taylor
35d0feceb8 assets submod 2024-03-01 00:15:30 -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
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
Eric
b1f092d87f Merge pull request #349 from FunkinCrew/gameover-fixies
script fixes for gameover related trolls
2024-02-28 00:21:08 -05:00
EliteMasterEric
4da3729058 Update assets submodule 2024-02-28 00:20:06 -05:00
EliteMasterEric
13d6ba378e Work in progress on fixing Week 6 2024-02-28 00:19:08 -05:00
Cameron Taylor
b9594ad812 asset submod 2024-02-28 00:07:52 -05:00
Cameron Taylor
5db3e006d6 asset submod 2024-02-27 23:48:29 -05:00
Cameron Taylor
3764a5db3f Merge branch 'rewrite/master' of https://github.com/FunkinCrew/funkin-secret into a-bot-bars 2024-02-27 22:41:08 -05:00
Cameron Taylor
00d75e7a3a Merge pull request #346 from FunkinCrew/gitmodules-link-update
renames urls in gitmodules to current updated names of the repos
2024-02-27 22:30:34 -05:00
Cameron Taylor
6da1dd57ad Update build-shit.yml 2024-02-27 22:27:50 -05:00
Cameron Taylor
5dafd54097 update submodules, and add change from other PR 2024-02-27 22:09:09 -05:00