cowarin/Funkin
1
0
Fork 0
mirror of https://github.com/ninjamuffin99/Funkin.git synced 2024-12-12 08:25:13 +00:00
Code Issues Releases Wiki Activity
2630 commits 30 branches 20 tags 3 GiB
Commit graph

2630 commits

This branch
This branch
All branches
Author SHA1 Message Date
Cameron Taylor a50d3e817e Merge branch 'rewrite/master' into bugfix/misc-editor-fixes 2024-02-19 21:25:26 -05:00
Cameron Taylor 10c275f7e6 Merge pull request #335 from FunkinCrew/abot-fixies 
abot eyeballs fixes, and abot position fix
 2024-02-19 21:06:38 -05:00
Jenny Crowe 7524885c81 Assets submod go brrr 2024-02-19 18:18:46 -07: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
Jenny Crowe dd0632d55e Send assets submodule to the woods 2024-02-19 16:38:40 -07:00
Eric 49811713c0 Merge branch 'rewrite/master' into abot-fixies 2024-02-19 12:07:55 -05: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 d020697bc7 asset submod 2024-02-17 05:57:49 -05:00
Cameron Taylor f9199540c4 Merge pull request #333 from FunkinCrew/feature/chart-editor-note-kind 
Revamp note kind handling in the Chart Editor.
 2024-02-17 05:30:24 -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 73797688da Merge pull request #334 from FunkinCrew/bugfix/loading-state 
Fix songs failing to load on HTML5 target
 2024-02-17 03:48:45 -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
Cameron Taylor efd4ae4592 Merge pull request #332 from FunkinCrew/bugfix/smoothLerp-typo 
Fix variable name in `MathUtils.smoothLerp`
 2024-02-17 03:42:44 -05:00
EliteMasterEric 16df3f0e9d Move E to a final constant as Mike suggested. 2024-02-17 03:41:08 -05:00
Cameron Taylor ffcbef73a9 assets submod update 2024-02-17 03:33:12 -05:00
EliteMasterEric da7cb559bb Update assets submodule. 2024-02-17 02:13:29 -05:00
EliteMasterEric d535a3f547 Update haxeui 2024-02-17 02:13:19 -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
Cameron Taylor e19dfad641 Merge pull request #328 from FunkinCrew/EliteMasterEric-patch-1 
Additional mathematical utilities.
 2024-02-16 03:35:21 -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 a9bcc492bc Update assets submodule 2024-02-15 17:26:10 -05:00
EliteMasterEric 72d623bdf6 Don't prettier format FlxAnimate JSONs 2024-02-15 17:26:02 -05:00
EliteMasterEric 5ec0939263 Bunch of changes to NoteScriptEvent and death logic 2024-02-15 17:25:28 -05:00
EliteMasterEric 04b73dac9f Always force debug version in VSCode. 2024-02-15 17:23:57 -05:00
EliteMasterEric c896300b63 NoteData stringifies nicer now. 2024-02-15 17:23:43 -05:00
Eric 10f4ad704e Additional mathematical utilities. 2024-02-15 14:17:44 -05:00
Cameron Taylor 15accdf10f Merge pull request #327 from FunkinCrew/bugfix/remove-hmm-dep 
Remove `hmm` dependency to fix HTML5 target
 2024-02-15 03:40:12 -05:00
Mike Welsh 91ab1cb520 Remove hmm dependency to fix HTML5 target 
Remove the `hmm` haxelib dependency from the build.

Linking to `hmm` caused `utest` to be transitively linked, which
eventually caused OpenFL to act strangely and instatiate the
application twice on the HTML5 target.

`hmm` was only used for `HaxelibVersions.getLibraryVersions` macro
call. Instead, manually parse the `hmm.json` ourselves to avoid
the dependency. This fixes the HTML5 target.

`hmm` is still used for package management, but no longer linked
in to the build itself.
 2024-02-15 00:23:24 -08:00
Cameron Taylor 41b54fe7cc Merge pull request #326 from FunkinCrew/docs/COMPILING-lime-setup 2024-02-14 19:46:51 -05:00