cowarin/Funkin
1
0
Fork 0
mirror of https://github.com/ninjamuffin99/Funkin.git synced 2024-11-16 03:43:36 +00:00
Code Issues Releases Wiki Activity
2825 commits 30 branches 20 tags 6.8 GiB
Commit graph

2825 commits

This branch
This branch
All branches
Author SHA1 Message Date
EliteMasterEric 6a131555f8 Merge branch 'rewrite/master' into feature/chart-editor-gamepad-support 2024-03-28 20:15:32 -04:00
Cameron Taylor 86c91d1e82 Merge pull request #436 from FunkinCrew/feature/touch-here-to-play 
New Funkin' Preloader, and Touch Here To Play
 2024-03-28 07:15:53 -04:00
EliteMasterEric 8a9eee3aa3 Rework Funkin Preloader and added "Touch to Play" graphic 2024-03-28 04:34:43 -04:00
EliteMasterEric 4cd2a622a9 Update ART submodule! 2024-03-28 04:34:20 -04:00
Cameron Taylor 2c7fb62f72 Merge pull request #424 from FunkinCrew/bugfix/pico-fixes 
Fix some issues with Week 3
 2024-03-27 22:15:27 -04:00
Cameron Taylor 53d62c3c12 Merge branch 'rewrite/master' into bugfix/pico-fixes 2024-03-27 22:14:44 -04:00
Cameron Taylor 17df6a515f assets submod 2024-03-27 22:11:31 -04:00
Cameron Taylor 96fe131544 Merge pull request #430 from FunkinCrew/feature/miss-judgement-debug 
Add debug logging to Flixel debugger for miss judgements
 2024-03-27 21:56:18 -04:00
Cameron Taylor 0f80f1c8a6 Merge pull request #417 from FunkinCrew/bugfix/freeplay-afk-fixes 
Bugfix/freeplay afk fixes
 2024-03-27 21:08:08 -04:00
Cameron Taylor 3181795985 remove trace() calls from ages ago while im here 2024-03-27 20:58:58 -04:00
EliteMasterEric 843095e3de Add debug logging to Flixel debugger for miss judgements 2024-03-27 01:25:38 -04:00
Cameron Taylor 31827f30b1 Merge pull request #425 from FunkinCrew/feature/more-new-charts 
Update several charts (Lit Up, 2hot, High Erect, South Erect)
 2024-03-27 01:10:17 -04:00
Cameron Taylor cccfdd0638 Merge branch 'rewrite/master' into feature/more-new-charts 2024-03-27 01:09:45 -04:00
Cameron Taylor 75b8336dce assets submod 2024-03-27 01:09:24 -04:00
Cameron Taylor 14c10448d2 Merge pull request #427 from FunkinCrew/bugfix/song-delay+volume-fixes 
fixed song delay and made volume consistent across all tracks
 2024-03-27 01:08:33 -04:00
Cameron Taylor ce53e46510 Merge branch 'rewrite/master' into bugfix/song-delay+volume-fixes 2024-03-27 01:08:04 -04:00
Cameron Taylor b3076c7ec4 assets submod 2024-03-27 01:07:37 -04:00
Cameron Taylor 030be3a24b Merge pull request #429 from FunkinCrew/bugfix/story-mode-scroll-sound 
Readd scroll sounds to Story Menu
 2024-03-27 01:06:35 -04:00
Cameron Taylor 982616e2ba assets submod 2024-03-27 01:05:53 -04:00
EliteMasterEric 4209c5156e Readd a missing sound in the story menu 2024-03-27 01:02:11 -04:00
FabsTheFabs 5ec3546bbc fixed song delay and made volume consistent across all tracks 2024-03-27 04:31:03 +00:00
EliteMasterEric 6b35898ed9 Fix some issues with Weekend 1. 2024-03-26 23:24:59 -04:00
EliteMasterEric d373e1bfed Implement a bunch of updated charts. 2024-03-26 21:30:25 -04:00
EliteMasterEric 0e93f2ab27 Improve error logging when the game can't find a chart file. 2024-03-26 21:30:08 -04:00
EliteMasterEric 291a9f630d Update assets submodule 2024-03-26 19:39:02 -04:00
EliteMasterEric 9ebb253b53 Fix music updating issue. 2024-03-26 19:38:56 -04:00
EliteMasterEric e84fdf9fac Resolve FlxG.sound.music crash 2024-03-26 19:38:42 -04:00
Eric 88c973f1ae Merge branch 'rewrite/master' into bugfix/freeplay-afk-fixes 2024-03-26 19:35:10 -04:00
Cameron Taylor 99ea7bbe84 Merge pull request #422 from FunkinCrew/bugfix/blazin-crashes 
Fix crashes tied to Blazin' character animations not parsing
 2024-03-26 01:31:19 -04:00
Cameron Taylor 524ae119fa Merge branch 'rewrite/master' into bugfix/blazin-crashes 2024-03-26 01:30:59 -04:00
Cameron Taylor 6d4c2e804f assets submod 2024-03-26 01:30:48 -04:00
Cameron Taylor 593b9f30d2 Merge pull request #420 from FunkinCrew/bugfix/some-mac-fixins 
MacOS fixins
 2024-03-26 01:30:00 -04:00
Cameron Taylor e9121ac64d Merge pull request #421 from FunkinCrew/bugfix/funkin-sound-overhaul-2 
Funkin Sound Overhaul 2: Electric Boogaloo
 2024-03-26 01:29:35 -04:00
Cameron Taylor 1cfbcb964c Merge branch 'rewrite/master' into bugfix/funkin-sound-overhaul-2 2024-03-26 01:29:11 -04:00
Cameron Taylor 364652a22f assets submod 2024-03-26 01:28:58 -04:00
EliteMasterEric 8943cd117e Make the error message a bit better if an Animate atlas fails to parse. 2024-03-26 01:12:46 -04:00
EliteMasterEric 32b21e21b2 Update assets submodule 2024-03-26 01:12:22 -04:00
EliteMasterEric 368b82846e Update assets submodule 2024-03-25 21:15:20 -04:00
EliteMasterEric 5ae075e947 Fix a couple Flixel warnings on the results screen. 2024-03-25 21:09:14 -04:00
EliteMasterEric 90f861628d Fix an HTML5 build issue. 2024-03-25 21:09:02 -04:00
EliteMasterEric f4617cbbda Add mac builds with proper arguments 2024-03-25 21:08:53 -04:00
EliteMasterEric 07ad250060 Fix an audio crash when exiting a cutscene 2024-03-25 21:08:39 -04:00
Cameron Taylor 0409c0ba6a Merge pull request #405 from FunkinCrew/feature/high-erect 
Implement High Erect draft, plus some bug fixes
 2024-03-25 16:02:46 -04:00
Cameron Taylor ccfb9ca65b Merge branch 'rewrite/master' into feature/high-erect 2024-03-25 16:02:09 -04:00
Cameron Taylor a66b746e43 assets submod 2024-03-25 16:01:38 -04:00
Cameron Taylor fe6cb8c5a9 Merge pull request #413 from FunkinCrew/bugfix/funkin-sound-overhaul 
Funkin Sound overhaul
 2024-03-25 15:59:02 -04:00
Cameron Taylor 6a5026b714 assets submod 2024-03-25 15:06:47 -04:00
Cameron Taylor 6a0672684c Merge pull request #416 from FunkinCrew/bugfix/camera-zoom-option 
Fix a bug where the Camera Zoom toggle didn't work.
 2024-03-25 14:52:24 -04:00
Cameron Taylor 01ff4acc1a Merge pull request #409 from FunkinCrew/bugfix/cut-pico-dadbattle 
Fix bug where Pico dadbattle was playing over normal dadbattle
 2024-03-25 13:43:05 -04:00
Cameron Taylor 9fd780e00c Merge branch 'rewrite/master' into bugfix/cut-pico-dadbattle 2024-03-25 13:42:50 -04:00