cowarin/Funkin
1
0
Fork 0
mirror of https://github.com/ninjamuffin99/Funkin.git synced 2024-11-09 00:04:42 +00:00
Code Issues Releases Wiki Activity
2517 commits 3 branches 3 tags 3 GiB
Commit graph

1861 commits

Author SHA1 Message Date
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
Cameron Taylor 201c81cfef changed keybind to ctrl+shift+L 2024-02-22 18:51:18 -05:00
EliteMasterEric 5b486e5634 Merge remote-tracking branch 'origin/bugfix/audio-focus' into feature/2hot-death-animation 2024-02-22 12:59:34 -05:00
EliteMasterEric 818e80ed74 Add a screenshot sound provided by Isaac. 2024-02-22 03:15:06 -05:00
EliteMasterEric 0b49a88cdd Move the crash keybind into a global plugin. 2024-02-22 01:47:35 -05:00
EliteMasterEric 744e2f95bd Add additional memory utilities and logging. 2024-02-22 00:06:02 -05:00
EliteMasterEric 907d9150c0 Add additional memory utilities and logging. 2024-02-21 17:10:18 -05:00
EliteMasterEric 36c0c61946 Merge remote-tracking branch 'origin/rewrite/master' into feature/2hot-death-animation 2024-02-20 18:44:51 -05:00
EliteMasterEric d888fb860d Remove support for >100% audio since it didn't actually boost the gain. 2024-02-20 13:37:53 -05:00
Cameron Taylor 2cfeb2c94d anim editor dropdown fix 2024-02-20 00:29:11 -05:00
Cameron Taylor 85b3441a03 tiny levelitems positioning 2024-02-19 21:40:52 -05:00
Jenny Crowe 7d7cf32f44 Chart editor grid now updates when changing the song BPM. HItsound volumes converted to two separate sliders. 2024-02-19 18:18:32 -07:00
EliteMasterEric 44623071cd Redo event stuff for abot and game over audio logic 2024-02-18 03:02:36 -05:00
Eric 1c8fd7251c Merge pull request #322 from FunkinCrew/storymode-nene-fix 
hide storymode menu characters if they dont exist for the level
 2024-02-17 19:26:05 -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
Cameron Taylor 01250852c5 simplified preloader 2024-02-17 04:45:12 -05:00
Cameron Taylor 2baac0e983 dont infinitely add new props, replace the old ones 2024-02-17 04:21:03 -05:00
Cameron Taylor 41cb3d93b2 nicer color tweens 2024-02-17 04:01:06 -05:00
Cameron Taylor fc3b83367f Merge branch 'rewrite/master' of https://github.com/FunkinCrew/funkin-secret into storymode-nene-fix 2024-02-17 03:49:54 -05:00
Cameron Taylor 316fa72b19 Merge branch 'rewrite/master' of https://github.com/FunkinCrew/funkin-secret into bugfix/loading-state 2024-02-17 03:44:16 -05:00
EliteMasterEric 16df3f0e9d Move E to a final constant as Mike suggested. 2024-02-17 03:41:08 -05:00
EliteMasterEric 8a9a7f3b97 Additional chart editor fixes. 2024-02-17 02:13:11 -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 1bc96afd6d Move E to a final constant as Mike suggested. 2024-02-16 22:13:51 -05:00
EliteMasterEric 98e6d4091e Revamp note kind handling in the chart editor. 2024-02-16 22:01:47 -05:00
Mike Welsh ef96bd4358 Fix variable name in MathUtils.smoothLerp 2024-02-16 17:22:55 -08:00
Cameron Taylor 516c5e8596 Merge pull request #329 from FunkinCrew/feature/screenshots 
Implemented a screenshot button.
 2024-02-16 19:31:53 -05:00
Cameron Taylor 0b58a4f664 camera flash fix 2024-02-16 18:58:27 -05:00
Cameron Taylor 928f941c2f Merge pull request #331 from FunkinCrew/bugfix/countdown-pause-music 
Fix issue with incorrect music after pausing during countdown
 2024-02-16 17:36:23 -05:00
Cameron Taylor 29e1c480fd unwrap openFolder from #if sys 2024-02-16 16:35:57 -05:00
EliteMasterEric e4cd694c15 ScreenshotPlugin now uses Player.controls. VolumePlugin is now outside MusicBeatState 2024-02-16 14:42:28 -05:00
EliteMasterEric 77ff261be1 Make functions non-inline so they work on HScript 2024-02-16 13:08:34 -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
Cameron Taylor 94938313dd click preview to open screenshots folder (and moved openFolder to FileUtil 2024-02-16 05:24:43 -05:00
Cameron Taylor 0036a334bc display fancy preview as a sprite on top of FlxG.stage, to properly render over substates 2024-02-16 04:48:54 -05:00
Mike Welsh d6b3e2a9cf Fix FunkinSound not resuming after focus 
`FunkingSound.onFocus` was checking `_shouldPlay` before resuming,
but this would always be false, causing the sound to not resume
when tabbing out and back into the game.
 2024-02-16 00:08:33 -08:00
EliteMasterEric e24c78ae16 Implemented a screenshot button. FancyPreview is broken. 2024-02-15 21:34:24 -05:00
EliteMasterEric 5ec0939263 Bunch of changes to NoteScriptEvent and death logic 2024-02-15 17:25:28 -05:00
EliteMasterEric c896300b63 NoteData stringifies nicer now. 2024-02-15 17:23:43 -05:00