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

1830 commits

This branch
This branch
All branches
Author SHA1 Message Date
EliteMasterEric 4a6904d52c Merge remote-tracking branch 'origin/rewrite/master' into rewrite/feature/remember-difficulty 2023-10-17 17:32:14 -04:00
Cameron Taylor a129e6219d Merge branch 'rewrite/master' of https://github.com/ninjamuffin99/Funkin-secret into rewrite/master 2023-10-17 17:20:08 -04:00
EliteMasterEric 6dbf958d75 Readd some missing lines. 2023-10-17 02:15:53 -04:00
Cameron Taylor ed8a52d2e9 WIP on rewrite/bugfix/pause-and-results-fixes: 9b8fc872 song diff menu sort 2023-10-17 00:38:28 -04:00
Cameron Taylor afcb677fac index on rewrite/bugfix/pause-and-results-fixes: 9b8fc872 song diff menu sort 2023-10-17 00:38:28 -04:00
Cameron Taylor 9b8fc87261 song diff menu sort 2023-10-17 00:07:36 -04:00
Cameron Taylor 0ce82e49d0 story menu diff sorted 2023-10-16 23:43:59 -04:00
Cameron Taylor 160fe77bbc Merge pull request #173 from FunkinCrew/rewrite/feature/precise-inputs-gamepad 
Precise inputs on gamepad
 2023-10-16 21:38:38 -04:00
Cameron Taylor 13e2fa9a0b assets fix 2023-10-16 21:34:27 -04:00
Cameron Taylor 6e54607220 Merge branch 'rewrite/feature/precise-inputs-gamepad' of https://github.com/ninjamuffin99/Funkin-secret into rewrite/feature/precise-inputs-gamepad 2023-10-16 16:48:12 -04:00
Cameron Taylor 732fe59c3e Merge branch 'rewrite/master' of https://github.com/ninjamuffin99/Funkin-secret into rewrite/feature/precise-inputs-gamepad 2023-10-16 16:47:51 -04:00
Cameron Taylor dd6db0196b Merge branch 'rewrite/master' into rewrite/feature/precise-inputs-gamepad 2023-10-16 16:47:01 -04:00
Cameron Taylor 494019a703 Merge pull request #172 from FunkinCrew/rewrite/feature/preferences-rewrite 
Preferences rewrite, preferences now save
 2023-10-16 16:21:53 -04:00
Cameron Taylor 729e6cc9fe Merge pull request #193 from FunkinCrew/rewrite/fix-ci-clear-cache-when-deps-change 
fix: cache needs to be manually cleared when dependency versions change
 2023-10-16 16:20:57 -04:00
Hazel 808490245a pin caches to hash of hmm.json 2023-10-16 18:40:44 +01:00
Hazel c36d01230c windows style paths <3 2023-10-16 18:39:03 +01:00
Cameron Taylor 865f771c4a Merge branch 'rewrite/master' of https://github.com/ninjamuffin99/Funkin-secret into rewrite/feature/preferences-rewrite 2023-10-15 20:54:22 -04:00
Cameron Taylor a89a819590 Merge pull request #171 from FunkinCrew/rewrite/feature/save-data-rewrite 
Rewrite Save functionality
 2023-10-15 20:22:46 -04:00
Cameron Taylor cb0bddcb34 Merge branch 'rewrite/master' of https://github.com/ninjamuffin99/Funkin-secret into rewrite/feature/save-data-rewrite 2023-10-15 20:19:31 -04:00
Cameron Taylor 965363c062 Merge pull request #167 from FunkinCrew/rewrite/feature/snapped-paste 
Chart Editor: Snapped Paste and Event Visiblity
 2023-10-15 19:39:56 -04:00
EliteMasterEric d350ba3bdc Merge remote-tracking branch 'origin/rewrite/master' into rewrite/feature/save-data-rewrite 2023-10-15 19:36:36 -04:00
Cameron Taylor 937082fecf Merge branch 'rewrite/master' of https://github.com/ninjamuffin99/Funkin-secret into rewrite/feature/snapped-paste 2023-10-15 19:23:06 -04:00
Cameron Taylor 844a7e5842 Merge pull request #166 from FunkinCrew/rewrite/feature/chart-editor-erect-template 
Chart Editor: Erect Template and Instrumental Fixes
 2023-10-15 19:02:01 -04:00
EliteMasterEric 022b93bc43 Merge branch 'rewrite/master' into rewrite/feature/chart-editor-erect-template 2023-10-15 18:42:38 -04:00
Cameron Taylor ff7ce90b4d derped... 2023-10-15 18:40:06 -04:00
Cameron Taylor 7cbeea808a update submodule? 2023-10-15 18:38:23 -04:00
EliteMasterEric 9f293d3be8 Merge branch 'rewrite/master' into rewrite/feature/save-data-rewrite 2023-10-15 01:15:49 -04:00
EliteMasterEric 88f9584fd9 Fix an issue where the game would crash when loading a song in Freeplay 2023-10-15 01:06:06 -04:00
EliteMasterEric ccefa972a0 Fixes an issue where Freeplay Menu wasn't properly flagging the Week 6 assets to load. 2023-10-15 00:59:35 -04:00
EliteMasterEric ccedd82210 Move FunkinDropdown to FunkinDropDown 2023-10-15 00:34:37 -04:00
EliteMasterEric e2864777e3 Fast forward assets/ 2023-10-15 00:26:42 -04:00
EliteMasterEric 098dedd41e Fix "Could not locate metadataDialog" 2023-10-15 00:22:25 -04:00
Cameron Taylor 3228b86d07 Merge pull request #191 from FunkinCrew/rewrite/feature/chart-editor-scroll-speed 
Chart Editor: Tweaked the numbers on scrolling
 2023-10-14 23:59:33 -04:00
EliteMasterEric dd38dbbadf Tweaked the numbers on scrolling 2023-10-14 23:57:40 -04:00
Cameron Taylor eb95f105d7 Merge pull request #187 from FunkinCrew/rewrite/bugfix/menu-spam 
Fix spamming buttons on Pause/Freeplay breaking shit
 2023-10-14 20:33:36 -04:00
EliteMasterEric c1684b218e More fixes to github actions 2023-10-12 20:17:41 -04:00
EliteMasterEric 9ec3f7aaac Fix to FORCE_DEBUG_VERSION flag 2023-10-12 19:57:16 -04:00
EliteMasterEric dd3d1116c0 Add a flag to make Git hash display on launcher builds. 2023-10-12 13:22:59 -04:00
EliteMasterEric 996f7b275e Remember difficulty when leaving story/freeplay menu. 2023-10-12 03:20:21 -04:00
EliteMasterEric f3737601f8 Can't spam enter on pause menu or freeplay menu anymore 2023-10-11 18:54:58 -04:00
EliteMasterEric 8589c10c75 Fixes to Pause screen and Results screen 2023-10-11 17:33:55 -04:00
Cameron Taylor 652a1836a0 assets submodule update 2023-10-11 16:50:16 -04:00
EliteMasterEric 0327aeb45f Replace assets/ commit reference with one that exists 2023-10-11 15:34:05 -04:00
Cameron Taylor 0c0829b2d0 sound effects for stickersubstate 2023-10-11 07:43:44 -04:00
Cameron Taylor 6e2441b540 Merge pull request #184 from FunkinCrew/rewrite/bugfix/glowup-autosave 
Fix exit button in Chart Editor menu
 2023-10-11 06:32:00 -04:00
Cameron Taylor b9572fe9e9 Merge pull request #169 from FunkinCrew/rewrite/feature/chart-editor-wasd 
Chart Editor Working Live Inputs, Note snapping in menu, W/S to scroll
 2023-10-11 06:28:48 -04:00
EliteMasterEric 05044d9af3 Override F4 behavior 2023-10-11 00:39:16 -04:00
EliteMasterEric d7a15dc713 Fix exit button in Chart Editor menu 2023-10-11 00:30:41 -04:00
EliteMasterEric 1ccb84bbf2 Merge remote-tracking branch 'origin/rewrite/master' into rewrite/feature/chart-editor-erect-template 2023-10-10 23:46:54 -04:00
EliteMasterEric 4a70f73c4b Merge branch 'rewrite/master' into rewrite/feature/chart-editor-erect-template 2023-10-10 23:44:53 -04:00