1
0
Fork 0
mirror of https://github.com/ninjamuffin99/Funkin.git synced 2024-09-19 00:21:11 +00:00
Commit graph

1195 commits

Author SHA1 Message Date
EliteMasterEric 35f99b49a4 Merge branch 'rewrite/master' into input-offsets 2024-03-28 20:23:31 -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
Cameron Taylor 53d62c3c12 Merge branch 'rewrite/master' into bugfix/pico-fixes 2024-03-27 22:14:44 -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 cccfdd0638 Merge branch 'rewrite/master' into feature/more-new-charts 2024-03-27 01:09:45 -04:00
EliteMasterEric 4209c5156e Readd a missing sound in the story menu 2024-03-27 01:02:11 -04:00
EliteMasterEric 6b35898ed9 Fix some issues with Weekend 1. 2024-03-26 23:24:59 -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 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 524ae119fa Merge branch 'rewrite/master' into bugfix/blazin-crashes 2024-03-26 01:30:59 -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 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 07ad250060 Fix an audio crash when exiting a cutscene 2024-03-25 21:08:39 -04:00
Cameron Taylor ccfb9ca65b Merge branch 'rewrite/master' into feature/high-erect 2024-03-25 16:02:09 -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 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 9fd780e00c Merge branch 'rewrite/master' into bugfix/cut-pico-dadbattle 2024-03-25 13:42:50 -04:00
Cameron Taylor c456430910 Merge pull request #414 from FunkinCrew/bugfix/opponent-mute-on-miss
Fix a bug where lag could cause the opponent to miss which would mute the vocals.
2024-03-25 13:37:12 -04:00
Cameron Taylor 3c9f63892b Merge pull request #411 from FunkinCrew/feature/video-cutscene-hide
Hide a video cutscene after playing it
2024-03-25 13:37:00 -04:00
EliteMasterEric 51d36ea25e Work in progress on fixing Boyfriend's spook/tv animations 2024-03-24 04:53:05 -04:00
EliteMasterEric 138dfd61e8 Fix a bug where the Camera Zoom toggle didn't work. 2024-03-23 23:52:08 -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 a8486a47df Fix a bug where the album disappears never to return 2024-03-23 18:22:15 -04:00
EliteMasterEric 709fbc8594 Fix a bug where lag could cause the opponent to miss. 2024-03-23 18:11:06 -04:00
EliteMasterEric 6407770ed6 Rework every class to use FunkinSound. 2024-03-23 17:50:48 -04:00
EliteMasterEric dc638a1303 Fix a bunch of merge bugs. 2024-03-23 15:34:37 -04:00
EliteMasterEric 831d6aae71 Merge remote-tracking branch 'origin/rewrite/master' into input-offsets 2024-03-23 14:38:50 -04:00
Eric 8e8ec2c5aa Merge branch 'rewrite/master' into funkin-crew-presents 2024-03-22 23:55:05 -04:00
EliteMasterEric e4a9d25ac0 Syntax fix 2024-03-22 23:53:29 -04:00
EliteMasterEric 471b015d1a Add some FlxSignals and showVideo/hideVideo 2024-03-22 23:46:03 -04:00
Cameron Taylor 932f7bce41 Merge pull request #408 from FunkinCrew/bugfix/camera-behavior-fixes
Make the ZoomCamera events use sensible defaults.
2024-03-22 23:38:26 -04:00
Cameron Taylor 01e83d4713 the funkin crew presents 2024-03-22 20:21:09 -07:00
EliteMasterEric 28088146eb Fix bug where Pico dadbattle was playing over normal dadbattle 2024-03-22 22:17:34 -04:00
Cameron Taylor a695fb2b39 Merge branch 'rewrite/master' into formatting-fixes 2024-03-22 19:00:29 -07:00
EliteMasterEric 83e8865a24 Make the ZoomCamera events use sensible defaults. 2024-03-22 20:29:35 -04:00
Cameron Taylor 7d008e7247 playstate camera fixie 2024-03-22 15:03:17 -07:00
Cameron Taylor 9d7831d40b Merge branch 'rewrite/master' into bugfix/minimal-mode-gameover 2024-03-22 14:56:41 -07:00
EliteMasterEric c765249030 Complain if the main metadata file specifies a variation (like erect) but the game can't find it. 2024-03-22 03:04:52 -04:00
EliteMasterEric aea9213eea Make sure the BPM label gets updated properly 2024-03-22 03:04:33 -04:00
EliteMasterEric 2b477c9bd1 Make Conductor a lazy instance 2024-03-22 02:47:56 -04:00
EliteMasterEric 4524b66170 Only show easy/normal/hard in story mode for now 2024-03-22 02:47:43 -04:00
EliteMasterEric d50ff73d3c Registries now get added to the Flixel console (and get lazy instantiated so they don't start before the game does) 2024-03-22 02:47:21 -04:00
Cameron Taylor f7acee94cd Merge branch 'rewrite/master' into feature/freeplay-album-art 2024-03-21 23:37:20 -07:00