cowarin/Funkin
1
0
Fork 0
mirror of https://github.com/ninjamuffin99/Funkin.git synced 2024-12-01 03:04:30 +00:00
Code Issues Releases Wiki Activity
2490 commits 30 branches 20 tags 6.8 GiB
Commit graph

2490 commits

This branch
This branch
All branches
Author SHA1 Message Date
Cameron Taylor 85cb20e23d renames urls in gitmodules to current updated names of the repos 2024-02-26 15:42:56 -05:00
Eric d8b4d92d50 Merge pull request #340 from FunkinCrew/anim-editor-stuffs 
fix for dropdowns appearing on FlxG.camera (rather than hudCam) on DebugBoundingState
 2024-02-22 19:07:51 -05:00
Eric 905d47c005 Merge branch 'rewrite/master' into anim-editor-stuffs 2024-02-22 19:07:31 -05:00
EliteMasterEric c6e6772dcf Update assets submod 2024-02-22 19:07:15 -05:00
Cameron Taylor b6a21044ea Merge pull request #343 from FunkinCrew/feature/screenshot-sound 
Add a screenshot sound provided by Isaac.
 2024-02-22 19:05:28 -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
Cameron Taylor 1f67bd23bf assets submod 2024-02-22 19:01:26 -05:00
Cameron Taylor 49159c749f Merge pull request #342 from FunkinCrew/feature/louder-audio 
Update hitsound audio to be louder
 2024-02-22 18:54:14 -05:00
Cameron Taylor 2574eaaef9 Merge branch 'rewrite/master' into feature/louder-audio 2024-02-22 18:53:27 -05:00
Cameron Taylor 17a7d6d958 Merge pull request #341 from FunkinCrew/feature/gc-logging 
Add additional memory utilities and logging.
 2024-02-22 18:52:40 -05:00
Cameron Taylor 201c81cfef changed keybind to ctrl+shift+L 2024-02-22 18:51:18 -05:00
EliteMasterEric 818e80ed74 Add a screenshot sound provided by Isaac. 2024-02-22 03:15:06 -05:00
EliteMasterEric 402a84831d Update assets submodule 2024-02-22 02:18:24 -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 d95232dda0 Add .vs to gitignore 2024-02-22 00:05:56 -05:00
Cameron Taylor 2cfeb2c94d anim editor dropdown fix 2024-02-20 00:29:11 -05:00
Cameron Taylor ef6a5c033a assets submod 2024-02-19 23:48:14 -05:00
Cameron Taylor 758a8378e7 Merge pull request #339 from FunkinCrew/bugfix/darnell-stuck 
Fix Darnell to not get stuck in his sing poses when the opponent is singing
 2024-02-19 22:11:29 -05:00
EliteMasterEric ef39382fea Update assets submodule 2024-02-19 21:49:05 -05:00
Eric 7600b8264a Merge pull request #338 from FunkinCrew/leveltitle-positioning 
tiny levelitems positioning
 2024-02-19 21:43:09 -05:00
Cameron Taylor 85b3441a03 tiny levelitems positioning 2024-02-19 21:40:52 -05:00
Cameron Taylor 4b4cf7ea53 Merge pull request #336 from FunkinCrew/bugfix/misc-editor-fixes 
Chart editor bugfixes
 2024-02-19 21:25:57 -05:00
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
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
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
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 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