1
0
Fork 0
mirror of https://github.com/ninjamuffin99/Funkin.git synced 2024-12-27 15:37:49 +00:00
Commit graph

793 commits

Author SHA1 Message Date
Burgerballs edfde606a1 magical machine of death 2024-05-09 17:51:03 +01:00
Eric e3ee68abf2
Merge pull request #2370 from MadBear422/main
Character selection fix for chart editor
2024-05-08 23:08:48 -04:00
MadBear422 4d1c2c1b88 Character selection fix for chart editor. 2024-05-08 15:30:40 -07:00
codist b49fac742f Fixed stutter once a transition to the main menu completes. 2024-05-08 04:21:30 -04:00
TheGalo X 5160fd02d4
fix window tween 2024-05-07 23:17:49 -03:00
Cameron Taylor 1aa53ee97b Merge branch 'story-mode-diff-position' into develop-0.3.2 2024-05-03 01:14:31 -04:00
Cameron Taylor 7efc633f45 Merge branch 'actual-merch-fix' into develop-0.3.2 2024-05-03 01:12:23 -04:00
Cameron Taylor ae9a132ccd remove typing bit 2024-05-03 01:12:18 -04:00
Cameron Taylor 6620b2e83c actual merch fix stuff 2024-05-02 23:02:47 -04:00
Cameron Taylor a3969ad5c0 hardcode storymenu difficulties to avoid overlaps 2024-05-02 21:37:07 -04:00
EliteMasterEric a2aa1bd84a Remove unused "typing" element. 2024-05-02 21:23:55 -04:00
EliteMasterEric 76b7baa44a Remove options from the debug menu 2024-05-02 20:06:08 -04:00
EliteMasterEric a8a2dc83d3 Add a .visible attribute to story weeks. 2024-05-02 12:46:24 -04:00
EliteMasterEric dc50a4ba5e Clean up log spam in the preloader. 2024-05-02 12:45:31 -04:00
EliteMasterEric 88c7ed7949 Fix substate lifecycle script events not dispatching. 2024-05-02 04:08:51 -04:00
EliteMasterEric b06a35ea2f Add , and . hotkeys to chart editor. 2024-05-02 03:38:27 -04:00
EliteMasterEric 5ce9e98b15 Add an error handler to DebugBoundingState. 2024-05-02 00:32:40 -04:00
EliteMasterEric 1e5f90774c What if modded songs showed up in game with no extra work? 😳 2024-05-01 21:51:33 -04:00
Cameron Taylor 0f6ee32d8f add saruky gf ringtone as easter egg 2024-05-01 16:23:02 -04:00
Cameron Taylor 05361af964 easter egg fix in progress 2024-05-01 15:54:44 -04:00
Cameron Taylor 192f1113b4 merch link freeplay fix 2024-05-01 15:22:20 -04:00
EliteMasterEric 9030b165df Final attract screen 2024-04-30 19:01:39 -04:00
Cameron Taylor 7986dbe2a0 revert mainmenu persistentUpdate chagne 2024-04-30 16:30:22 -04:00
EliteMasterEric 11c0249f42 Fix an issue with Freeplay sorting when leaving an Erect song. 2024-04-30 14:36:57 -04:00
EliteMasterEric e7a09fcee2 Fix an issue where returning to Freeplay from gameplay would let you interact with the menu underneath 2024-04-30 13:58:39 -04:00
EliteMasterEric dae7d71b17 Better (but not perfect) results screen text alignment 2024-04-30 13:34:34 -04:00
Cameron Taylor aff9ee5312 volume preference fix 2024-04-30 07:54:42 -04:00
Cameron Taylor 45941af161 Merge branch 'rewrite/master' into freeplay-objects-tweens 2024-04-30 04:15:22 -04:00
Cameron Taylor c0ae253c40 Merge branch 'rewrite/master' into preloader-fnf-spacing 2024-04-30 04:15:00 -04:00
Cameron Taylor 61012fab68 dad art tween and shader on ost text 2024-04-30 03:22:30 -04:00
Cameron Taylor 84668432ba better tween in for bg dad art 2024-04-30 01:38:00 -04:00
Cameron Taylor b12d86c959 completion number and box fadeout 2024-04-30 01:33:29 -04:00
Cameron Taylor 0c72f0f5a2 fix spacing on the fnf text on the preloader 2024-04-30 01:09:40 -04:00
Cameron Taylor ce24ad1a8a add fullscreen rebindable keybind across whole game 2024-04-30 00:40:42 -04:00
Cameron Taylor 7610fb4205 Merge pull request #528 from FunkinCrew/main-menu-cam
persistentUpdate true main menu
2024-04-30 00:19:28 -04:00
Cameron Taylor bd551092dc persistentUpdate true main menu 2024-04-29 23:31:55 -04:00
Cameron Taylor e1327f1b2c remove filter from touch here to play, and make it more responsive to input 2024-04-29 23:00:39 -04:00
Cameron Taylor 12f5904aa5 Merge branch 'rewrite/master' into cutscene-updates 2024-04-29 22:21:06 -04:00
Eric 4856ea4435 Merge branch 'rewrite/master' into hxcodec-hmm 2024-04-29 22:12:41 -04:00
EliteMasterEric 3b1f84b4bd Fixes to attract state. 2024-04-29 18:31:27 -04:00
EliteMasterEric ea61c19aa5 Replace cutscenes. 2024-04-29 17:51:36 -04:00
Cameron Taylor 81f8338c99 sets the selected track as first one in group when swapping sorts on freeplay 2024-04-29 03:49:28 -04:00
Cameron Taylor 64b416e956 async the LoadingState asset preloads 2024-04-29 02:31:40 -04:00
FabsTheFabs b35822f9a4 soundtray fade 2024-04-29 02:22:11 +01:00
EliteMasterEric 01b80ab5c8 Merge remote-tracking branch 'origin/input-offsets' into rewrite/master 2024-04-28 19:07:44 -04:00
Cameron Taylor 85350013d7 Merge pull request #511 from FunkinCrew/freeplay/cam-move
fix main menu -> freeplay camera positioning
2024-04-25 05:55:57 -04:00
Cameron Taylor 09ef915877 creds tweakin / polish 2024-04-25 05:45:27 -04:00
EliteMasterEric 85e06ef18f Make it possible to escape the input offsets menu on controller. 2024-04-24 22:08:20 -04:00
EliteMasterEric c3ba4081f1 Fix a crash issue caused when pressing a key after leaving the input offsets state. 2024-04-24 21:57:50 -04:00
EliteMasterEric f474bc32a5 Merge remote-tracking branch 'origin/rewrite/master' into input-offsets 2024-04-24 21:54:45 -04:00