cowarin/Funkin
1
0
Fork 0
mirror of https://github.com/ninjamuffin99/Funkin.git synced 2024-12-25 22:47:52 +00:00
Code Issues Releases Wiki Activity
3373 commits 31 branches 21 tags 3 GiB
Commit graph

3373 commits

This branch
This branch
All branches
Author SHA1 Message Date
Hazel 918c05b0ed insane in the membrane 2024-04-24 21:06:21 +01:00
EliteMasterEric b6247c933a Disable chart editor on web until it's fixed. 2024-04-24 16:00:50 -04:00
EliteMasterEric a2c38a3e17 Revise Weekend 1 charts 2024-04-24 16:00:33 -04:00
Hazel fbff2dc156 git good 2024-04-24 20:44:24 +01:00
Hazel 2c1109cba0 meow 2024-04-24 20:40:45 +01:00
Hazel 73bc4d4740 https://open.spotify.com/track/2zXbLJiS5099aDVyTHIDU4 2024-04-24 20:35:55 +01:00
Hazel 804ae7ca6f i am in spain but the s is silent 2024-04-24 20:29:39 +01:00
Hazel 354f4cced0 meow 2024-04-24 20:26:01 +01:00
Hazel c896fed6c7 no 2024-04-24 20:22:16 +01:00
Hazel a5b3d62a4a devops is such a fun profession, featuring 'staring at github actions broken web ui for 5 minutes' 2024-04-24 20:07:53 +01:00
Hazel 54605ec430 https://open.spotify.com/track/7LVHVU3tWfcxj5aiPFEW4Q 2024-04-24 20:02:28 +01:00
Hazel 53d99df3fb fuck around & find out 2024-04-24 19:54:12 +01:00
Hazel b9b5c0dd9b i love working with git 2024-04-24 19:48:18 +01:00
Hazel c87a16a0e1 shasjakslkas 2024-04-24 19:40:24 +01:00
Hazel 9a36c14f53 debug moment 2024-04-24 19:32:28 +01:00
Cameron Taylor e535a35fb9 Merge pull request #506 from FunkinCrew/options-menu-bg 
options screen menu bg fix
 2024-04-24 12:13:32 -04:00
Cameron Taylor e33f14ea5c options screen menu bg fix 2024-04-24 12:11:37 -04:00
Cameron Taylor 7087b6de6f Merge pull request #505 from FunkinCrew/bugfix/tuesday-fixes 
Bugfix/tuesday fixes
 2024-04-24 11:46:47 -04:00
Cameron Taylor ff5aacf1c1 assets submod 2024-04-24 11:44:32 -04:00
EliteMasterEric 3734c6ecd3 Make credits no longer pause and no longer autoformat. Add some names. 2024-04-24 01:48:39 -04:00
EliteMasterEric 374c042ad0 Fix a critical issue causing instrumental variations to not load on web. 2024-04-23 18:32:07 -04:00
Cameron Taylor def8fc6977 Merge pull request #494 from FunkinCrew/freeplay-sorting-fixes 
fix letter sort regex, and tiny LetterSort.hx cleanin
 2024-04-23 04:52:40 -04:00
Cameron Taylor 4fada0fd4e Merge pull request #500 from FunkinCrew/bugfix/weekend-1-can-death-freeze 
Preload Pico explosion death so the game doesn't stutter when you die to the can
 2024-04-23 04:24:53 -04:00
Cameron Taylor 878bb18c53 art submod 2024-04-23 04:24:23 -04:00
Cameron Taylor 5aba4008ac Merge branch 'feature/2hot-cutscenes-eric' into bugfix/weekend-1-can-death-freeze 2024-04-23 04:20:28 -04:00
Cameron Taylor c7163afc19 assets submod 2024-04-23 04:20:26 -04:00
Cameron Taylor 6c63f84369 Merge branch 'rewrite/master' into bugfix/weekend-1-can-death-freeze 2024-04-23 04:14:41 -04:00
Cameron Taylor 939cb1e171 assets submod 2024-04-23 04:14:36 -04:00
Cameron Taylor ed0cfc36fb Merge pull request #504 from FunkinCrew/bugfix/monday-fixes 
Bugfix/monday fixes
 2024-04-23 04:08:23 -04:00
Cameron Taylor 46f2dec672 assets submod 2024-04-23 04:08:00 -04:00
EliteMasterEric 1e5153f133 Fix an issue where zooming in the camera would persist to results screen 2024-04-22 23:04:57 -04:00
EliteMasterEric 6edd9e8c6a Make cars stop moving while the game is paused. 2024-04-22 22:30:29 -04:00
EliteMasterEric 66b45b526f Fix issue where controller couldn't switch difficulties in Story Menu 2024-04-22 21:24:44 -04:00
EliteMasterEric b23ea58561 Fix Weekend 1 audio issue 2024-04-22 21:24:15 -04:00
Cameron Taylor 23051a5c60 Merge branch 'rewrite/master' into feature/2hot-cutscenes-eric 2024-04-21 17:26:55 -04:00
Cameron Taylor ab336f07af Merge pull request #502 from FunkinCrew/bugfix/rayman 
Fix a bug where Darnell's arms would be invisible on HTML5
 2024-04-21 17:25:47 -04:00
Cameron Taylor d1c5449fa8 Merge pull request #496 from FunkinCrew/04-16-some_cleanins_with_letter_sorts 
some cleanins with letter sorts
 2024-04-21 17:24:29 -04:00
EliteMasterEric d760a0d209 Add Ctrl-Alt-Shift-W as a debug hotkey to unlock all Darnell songs in Freeplay 2024-04-21 17:23:48 -04:00
EliteMasterEric 5f26eaacd3 Fix issue where some FlxAnimate symbols wouldn't render on HTML5 2024-04-21 17:23:27 -04:00
Cameron Taylor 5063e747a1 Merge pull request #501 from FunkinCrew/bugfix/credits-ng-logo 
Fix the animated NG logo overlapping the text in the credits
 2024-04-21 17:20:55 -04:00
EliteMasterEric 4671a9172c Fix the NG logo overlapping the text 2024-04-20 23:48:27 -04:00
EliteMasterEric 7f18eb62d7 Moved can explosion animation to weekend1 library so it's preloaded. 2024-04-20 23:04:08 -04:00
EliteMasterEric 84c3fd452b Update Weekend 1 cutscenes to use the instanced Conductor 2024-04-20 02:11:04 -04:00
EliteMasterEric a9dd85c865 Merge remote-tracking branch 'origin/feature/conductor-signal-rework' into feature/2hot-cutscenes 2024-04-19 18:49:18 -04:00
EliteMasterEric 4fcec49943 Merge remote-tracking branch 'origin/rewrite/master' into feature/2hot-cutscenes 2024-04-19 18:47:51 -04:00
Cameron Taylor ba240c45a4 Merge pull request #352 from FunkinCrew/a-bot-bars 
A-Bot bars phase 1
 2024-04-19 15:11:56 -04:00
Cameron Taylor 678dbc0ab7 Merge branch 'rewrite/master' into a-bot-bars 2024-04-19 15:11:28 -04:00
Cameron Taylor 7826c79871 assets update for submodule 2024-04-19 15:11:20 -04:00
Cameron Taylor 57df7db5f1 add small #if web define 2024-04-19 15:10:43 -04:00
Cameron Taylor e87830c117 Merge pull request #498 from FunkinCrew/polish/popup-combo-fixes-rebased 
Polish/popup combo fixes rebased
 2024-04-19 15:01:59 -04:00