1
0
Fork 0
mirror of https://github.com/ninjamuffin99/Funkin.git synced 2024-12-26 15:07:14 +00:00
Commit graph

101 commits

Author SHA1 Message Date
Cameron Taylor 5bcc0f9b25 partial sound loading should be more resiliant 2024-06-05 15:02:29 -04:00
Cameron Taylor c64db9966b Merge branch 'rewrite/master' into rank-fixes 2024-06-02 02:19:36 -04:00
FabsTheFabs 1e65cacb0e fix funkinsound compile error 2024-05-31 10:39:06 +01:00
EliteMasterEric 9e0a993746 Disable song previews for mod songs rather than crashing the game 2024-05-31 02:03:40 -04:00
Cameron Taylor 9aa2411b50 Merge branch 'rewrite/master' into audio-stream 2024-05-28 23:59:36 -04:00
Cameron Taylor 2d300039ae promises + error out partial sounds that attempt to load multiple times 2024-05-28 23:53:50 -04:00
Axuko 004ed32fad Remove alot of unused imoprts 2024-05-27 22:34:28 -07:00
Cameron Taylor a2ee359e46 fix for songs overlapping each other on desktop 2024-05-23 16:31:18 -04:00
Cameron Taylor f2a06ad37b fading in and erect track loading 2024-05-09 01:56:52 -04:00
Cameron Taylor 1b6febf01c initial freeplay songs loading 2024-05-09 01:15:01 -04:00
Hazel 3a7efeeca3 fix(ci): linux private repo issues (#524) 2024-04-29 20:04:01 +01:00
Cameron Taylor 99934c8039 change the initial animation frame for abot 2024-04-26 23:48:17 -04:00
Cameron Taylor 678dbc0ab7 Merge branch 'rewrite/master' into a-bot-bars 2024-04-19 15:11:28 -04:00
Cameron Taylor 57df7db5f1 add small #if web define 2024-04-19 15:10:43 -04:00
EliteMasterEric 80a558ac08 Fix an issue where changing focus would pause some sounds but not others. 2024-04-16 19:57:19 -04:00
Cameron Taylor 658fd392fa Merge branch 'rewrite/master' into a-bot-bars 2024-04-14 02:57:05 -04:00
EliteMasterEric 2b4bf42ac4 Fix multiple music, and crashes in freeplay 2024-04-03 01:41:47 -04:00
Cameron Taylor dcffe0537f Merge branch 'rewrite/master' into bugfix/buncha-2hot-fixes 2024-04-01 22:40:10 -04:00
Cameron Taylor ac5ca3991e Merge branch 'rewrite/master' into feature/new-audio 2024-03-30 03:32:30 -04:00
Cameron Taylor b75c7c2361 funkVis html5 2024-03-28 23:08:50 -04:00
EliteMasterEric 8020624366 Fix a crash I found. 2024-03-28 21:40:16 -04:00
EliteMasterEric e5a10c6a25 Merge branch 'rewrite/master' into a-bot-bars 2024-03-28 20:26:13 -04:00
EliteMasterEric 201e018f25 Merge remote-tracking branch 'origin/rewrite/master' into bugfix/buncha-2hot-fixes 2024-03-28 00:03:09 -04:00
EliteMasterEric b771b46f1c Fix a build issue. 2024-03-28 00:01:18 -04:00
EliteMasterEric f267a72783 Merge remote-tracking branch 'origin/rewrite/master' into feature/new-audio 2024-03-27 23:00:34 -04:00
Cameron Taylor 53d62c3c12 Merge branch 'rewrite/master' into bugfix/pico-fixes 2024-03-27 22:14:44 -04:00
EliteMasterEric 195f366b65 Fix an issue where the Random button would crash Freeplay. 2024-03-27 17:43:15 -04:00
EliteMasterEric 463e946b17 Merge remote-tracking branch 'origin/rewrite/master' into bugfix/buncha-2hot-fixes 2024-03-27 01:40:22 -04:00
EliteMasterEric 6b35898ed9 Fix some issues with Weekend 1. 2024-03-26 23:24:59 -04:00
EliteMasterEric 9ebb253b53 Fix music updating issue. 2024-03-26 19:38:56 -04:00
EliteMasterEric 24b03e4f6b Replace calls to FlxG.sound.playMusic with ones that set the BPM. 2024-03-23 23:38:07 -04:00
EliteMasterEric 6407770ed6 Rework every class to use FunkinSound. 2024-03-23 17:50:48 -04:00
EliteMasterEric efa0e103b0 Merge remote-tracking branch 'origin/rewrite/master' into a-bot-bars 2024-03-21 21:54:22 -04:00
Cameron Taylor 186fdfdead Merge branch 'a-bot-bars' of github.com:FunkinCrew/Funkin-secret into a-bot-bars 2024-03-19 13:05:12 -07:00
Cameron Taylor 4eea9b76e7 idk assets revert this if I busted shit here lol 2024-03-19 13:04:58 -07:00
EliteMasterEric 42eec66753 Rework HTML5 video cutscenes to properly support the pause menu and volume controls. 2024-03-19 15:56:00 -04:00
EliteMasterEric 9eda84019d Merge branch 'rewrite/master' into a-bot-bars 2024-03-19 13:34:06 -04:00
EliteMasterEric d56c33cd17 Fix a dozen tiny issues with 2hot's audio and visuals (and some script crashes!). 2024-03-16 00:55:57 -04:00
EliteMasterEric e4eb543fa7 Fix a bug where title music starts blaringly loud. 2024-03-15 21:53:07 -04:00
Cameron Taylor e0eb00d01a Merge branch 'rewrite/master' into feature/pico-flicker 2024-03-13 21:51:58 -07:00
Cameron Taylor b9ab38e0b9 timertools -> timerutil fix 2024-03-13 18:47:15 -07:00
EliteMasterEric a13dc6e585 Remove deprecated imports. 2024-03-13 12:07:06 -04:00
EliteMasterEric be8f5699b5 2hot stutter actually fixed! 2024-03-11 23:42:32 -04:00
EliteMasterEric 1808f08554 Merge branch 'rewrite/master' into a-bot-bars 2024-03-08 00:21:51 -05:00
Cameron Taylor d6608fe435 a-bot in progress 2024-03-07 14:19:26 -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
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
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