Commit graph

1901 commits

Author SHA1 Message Date
Cameron Taylor
1ebfeb3a89 Merge branch 'rewrite/master' of https://github.com/FunkinCrew/funkin-secret into feature/script-event-note-incoming 2024-03-05 23:57:53 -05:00
EliteMasterEric
1b1834e98b Implement a botplay checkbox in the chart editor 2024-03-05 22:27:07 -05:00
EliteMasterEric
059e1c0e13 Implement onNoteIncoming script event. 2024-03-05 21:48:04 -05:00
Cameron Taylor
cdae96d179 Merge branch 'rewrite/master' into bugfix/2hot-explosion-polymod 2024-03-05 14:37:47 -05:00
Cameron Taylor
921ffb6526 Merge pull request #364 from FunkinCrew/bugfix/story-mode-color
Fix issues with story mode colors breaking
2024-03-05 14:35:45 -05:00
Eric
e76a94b682 Merge branch 'rewrite/master' into bugfix/2hot-explosion-polymod 2024-03-05 14:11:54 -05:00
EliteMasterEric
9212ea9c90 Script fixes for 2hot explosions breaking Polymod 2024-03-05 02:29:44 -05:00
EliteMasterEric
ae5f48c29c Fix issues with story mode colors breaking 2024-03-05 00:22:29 -05:00
Eric
3aa4c23340 Merge branch 'rewrite/master' into bugfix/chart-editor-vocal-crash 2024-03-04 23:00:38 -05:00
Eric
3c88113d93 Merge branch 'rewrite/master' into bugfix/audio-focus 2024-03-04 22:46:14 -05:00
EliteMasterEric
08fb8be419 Redo combine tally implementation 2024-03-04 22:22:19 -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
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
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
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
Cameron Taylor
ddeac1db15 deubbershish... 2024-02-27 22:02:04 -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
66c91d8b3e Sort the chart editor note kind dropdown. 2024-02-23 03:23:00 -05:00
EliteMasterEric
4168962fec Revert "Fix FunkinSound not resuming after focus"
This reverts commit d6b3e2a9cf.
2024-02-23 03:19:34 -05:00
EliteMasterEric
fb9fd57210 Improve json parsing error handling. 2024-02-23 03:16:51 -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
11bb69002b Merge remote-tracking branch 'origin/rewrite/master' into feature/2hot-death-animation 2024-02-22 21:01:07 -05:00
EliteMasterEric
01ed1730f4 Fix some issues with cutscenes. 2024-02-22 20:56:41 -05:00
Eric
905d47c005 Merge branch 'rewrite/master' into anim-editor-stuffs 2024-02-22 19:07:31 -05:00
EliteMasterEric
572ecc8aa8 Merge remote-tracking branch 'origin/rewrite/master' into anim-editor-stuffs 2024-02-22 19:05:20 -05:00
Cameron Taylor
e9dc03f8f1 Merge branch 'rewrite/master' into feature/screenshot-sound 2024-02-22 19:04:07 -05:00
EliteMasterEric
539b688055 Exploration in expanding FunkinSprite for optimization 2024-02-22 18:55:24 -05:00