cowarin/Funkin
1
0
Fork 0
mirror of https://github.com/ninjamuffin99/Funkin.git synced 2024-12-11 07:55:01 +00:00
Code Issues Releases Wiki Activity
1969 commits 30 branches 20 tags 3 GiB
Commit graph

323 commits

Author SHA1 Message Date
EliteMasterEric 92a4a41d20 Fix an issue where chart editor theme continues when exiting 2023-10-17 17:59:01 -04:00
EliteMasterEric 4a6904d52c Merge remote-tracking branch 'origin/rewrite/master' into rewrite/feature/remember-difficulty 2023-10-17 17:32:14 -04:00
EliteMasterEric 6cb8a719af Additional cleanup on difficulty sort order (tested and working!) 2023-10-17 17:27:11 -04:00
EliteMasterEric 6888e7b122 Merge branch 'rewrite/bugfix/pause-and-results-fixes' of https://github.com/FunkinCrew/Funkin-secret into rewrite/bugfix/pause-and-results-fixes 2023-10-17 17:10:16 -04:00
EliteMasterEric a4fde254d9 Merge branch 'rewrite/master' into rewrite/bugfix/pause-and-results-fixes 2023-10-17 17:07:36 -04:00
EliteMasterEric 4e0934dbd1 Fix issues with changing BPMs of songs. 2023-10-17 16:57:06 -04:00
EliteMasterEric f51592963e Fixes for a few bugs in the chart editor. 2023-10-17 02:42:52 -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 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 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 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
EliteMasterEric d350ba3bdc Merge remote-tracking branch 'origin/rewrite/master' into rewrite/feature/save-data-rewrite 2023-10-15 19:36:36 -04:00
EliteMasterEric b3ca30d10a Merge remote-tracking branch 'origin/rewrite/master' into rewrite/bugfix/anim-editor-crash-fix 2023-10-15 19:25:33 -04:00
EliteMasterEric 6fc56ffd77 Merge branch 'rewrite/master' into rewrite/bugfix/anim-editor-crash-fix 2023-10-15 19:25:01 -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
EliteMasterEric 022b93bc43 Merge branch 'rewrite/master' into rewrite/feature/chart-editor-erect-template 2023-10-15 18:42:38 -04:00
EliteMasterEric 9f293d3be8 Merge branch 'rewrite/master' into rewrite/feature/save-data-rewrite 2023-10-15 01:15:49 -04:00
EliteMasterEric ccedd82210 Move FunkinDropdown to FunkinDropDown 2023-10-15 00:34:37 -04:00
EliteMasterEric 098dedd41e Fix "Could not locate metadataDialog" 2023-10-15 00:22:25 -04:00
EliteMasterEric dd38dbbadf Tweaked the numbers on scrolling 2023-10-14 23:57:40 -04:00
EliteMasterEric 0f08b1133e Rename some sounds used by the chart editor 2023-10-14 22:49:24 -04:00
EliteMasterEric 996f7b275e Remember difficulty when leaving story/freeplay menu. 2023-10-12 03:20:21 -04:00
Cameron Taylor 9ff4885173 charting sound effects in progress! 2023-10-11 19:39:52 -04:00
EliteMasterEric a88262a5f4 Hide AnimateAtlas characters in the animation editor. 2023-10-11 19:16:04 -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 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
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 cdac9aec9a Merge remote-tracking branch 'origin/rewrite/master' into rewrite/feature/chart-editor-wasd 2023-10-10 23:42:38 -04:00
EliteMasterEric 299a3a1a25 Merge branch 'rewrite/master' into rewrite/feature/chart-editor-wasd 2023-10-10 23:38:38 -04:00
EliteMasterEric 989d1c3175 Merge rewrite/master, fix high score retrieval 2023-10-10 23:32:01 -04:00
Cameron Taylor 5ddc4876bc boyfriend animations swapped to atlas sprites 2023-10-09 18:33:03 -04:00
Cameron Taylor f000d21689 shaders and blendmode overlay stuff in progres 2023-10-09 18:32:18 -04:00
EliteMasterEric 4b23eaea59 Merge remote-tracking branch 'origin/rewrite/master' into rewrite/feature/chart-editor-erect-template 2023-10-09 12:15:05 -04:00
Cameron Taylor 5617f8f63e Merge pull request #165 from FunkinCrew/rewrite/feature/chart-editor-variation-button 
Chart Editor: Add Variation Button
 2023-10-09 05:20:11 -04:00
EliteMasterEric 7a1a2e1ab4 Correct FunkinDropDown capitalization 2023-10-08 22:09:09 -04:00
EliteMasterEric e33c825a1f Merge branch 'rewrite/master' into rewrite/feature/chart-editor-variation-button 2023-10-06 23:11:11 -04:00
EliteMasterEric 7c653a9e9b Merge branch 'rewrite/master' into rewrite/feature/chart-editor-wasd 2023-10-06 22:54:12 -04:00
EliteMasterEric 5931345c71 Rewrite precise inputs to work on gamepad 2023-10-05 02:21:01 -04:00
EliteMasterEric 380d30d63f Rewrote code for preferences to use Save data. 2023-10-04 11:40:55 -04:00
EliteMasterEric 490b2f18d0 Rewrite save data functionality (now with type safety and migration) 2023-10-03 19:14:46 -04:00
EliteMasterEric b6752531bf Add chart editor theme 2023-09-29 22:29:32 -04:00
EliteMasterEric 6c99f7161d Working Input Style, note snapping in menu, W/S to scroll 2023-09-29 21:49:07 -04:00
EliteMasterEric 8580cf1640 Snapped/unsnapped pasting, plus fixes for selection box and event rendering. 2023-09-26 20:36:41 -04:00
EliteMasterEric 2fcb906edf Fixed volume sliders, Load Instrumental button, and fixed hitsounds. 2023-09-26 17:46:07 -04:00
EliteMasterEric 42bb50882d "Add Variation" button, SongMetadata format changes, bug fixes, resolve metadata loading issues. 2023-09-25 23:24:07 -04:00
EliteMasterEric dc728133d1 Merge remote-tracking branch 'origin/master' into feature/chart-editor-performance-revamp 2023-09-20 19:41:17 -04:00
Cameron Taylor cbbdba031d Merge pull request #150 from FunkinCrew/bugfix-squash/song-data-parser-rework 
Chart Editor: Song Data Parser Rework
 2023-09-19 19:54:28 -04:00
Cameron Taylor f6bcd8bf05 Merge branch 'master' of https://github.com/ninjamuffin99/funkin-secret into feature/chart-note-snapping-ui 2023-09-19 19:25:42 -04:00
Cameron Taylor a2e43b8e4e Merge branch 'master' of https://github.com/ninjamuffin99/funkin-secret into feature/ghost-hold-notes 2023-09-19 19:16:02 -04:00
EliteMasterEric 86c105aff8 Merge remote-tracking branch 'origin/master' into bugfix-squash/song-data-parser-rework 2023-09-18 21:58:22 -04:00
EliteMasterEric 06269e95fd Fix to crash in freeplay (swapped two args oops!) 2023-09-18 20:02:17 -04:00
EliteMasterEric 0d84559606 HTML5 should build now 2023-09-18 17:19:31 -04:00
EliteMasterEric 09b03efeea Merge branch 'master' into bugfix/chart-editor-null-safety 2023-09-18 16:52:47 -04:00
Cameron Taylor 35239909d0 woops fix conditional 2023-09-18 15:48:40 -04:00
Cameron Taylor 446dc30277 Merge branch 'master' into bugfix-squashed/macos-file-browse 2023-09-18 15:40:52 -04:00
EliteMasterEric 8dd07d2763 I discovered a new profiling tool and stayed up until 5 AM optimizing shit. 2023-09-13 14:51:12 -04:00
Cameron Taylor 5d7efcd6b9 Merge pull request #142 from FunkinCrew/bugfix/chart-editor-playbar-buttons 
Fixed a bug where the playbar buttons wouldn't work
 2023-09-13 00:09:37 -04:00
Cameron Taylor fc3d2a17b6 Merge pull request #143 from FunkinCrew/feature/chart-editor-snap 
Chart Editor: Configure Snapping (+ important bug fix!)
 2023-09-12 23:56:05 -04:00
EliteMasterEric b42e4ceb67 Fix cursor modes on toolboxes. 2023-09-12 23:37:07 -04:00
EliteMasterEric 257fa2da6a Remove old Notifbar code 2023-09-12 23:31:38 -04:00
Cameron Taylor 2b3f99547a Merge pull request #144 from FunkinCrew/feature/chart-editor-beat-lines 
Darkened beat dividers on chart grid.
 2023-09-12 22:41:46 -04:00
Cameron Taylor ff34771ca3 Merge branch 'master' into feature/chart-editor-file-keybinds 2023-09-12 22:37:37 -04:00
Cameron Taylor e02dee2601 fixed N -> O typo? 2023-09-12 22:34:49 -04:00
Cameron Taylor b4042dba8c Merge pull request #155 from FunkinCrew/bugfix/story-menu-background 
Bugfixes: Story Menu Visuals
 2023-09-12 22:29:39 -04:00
EliteMasterEric a02058b260 Merge branch 'feature/improved-cursor' into develop 2023-09-12 19:52:08 -04:00
EliteMasterEric 7083f6e7ce Additional cursor and playbar fixes. 2023-09-12 19:43:19 -04:00
EliteMasterEric fa28932dea Implementing custom cursor modes for better interface readability. 2023-09-12 19:42:39 -04:00
EliteMasterEric 71e1fccce1 Merge remote-tracking branch 'origin/master' into bugfix/chart-editor-playbar-buttons 2023-09-12 18:51:16 -04:00
EliteMasterEric 1acb048930 Merge remote-tracking branch 'origin/bugfix/story-menu-background' into develop 2023-09-12 02:37:02 -04:00
EliteMasterEric aa1ca65c35 Fix issue where title text wasn't displaying properly. 2023-09-12 01:17:15 -04:00
EliteMasterEric acdb44703c Merge remote-tracking branch 'origin/bugfix/story-menu-background' 2023-09-12 01:06:35 -04:00
EliteMasterEric 2f16b9af96 Merge remote-tracking branch 'origin/feature/chart-editor-snap' into develop 2023-09-12 01:02:08 -04:00
EliteMasterEric a63246ff51 Remove notification on snapping change. 2023-09-12 00:25:05 -04:00
EliteMasterEric 74bd9084b6 Merge remote-tracking branch 'origin/feature/ghost-hold-notes' into develop 2023-09-11 19:42:25 -04:00
EliteMasterEric abcec3c5f6 Render a ghost hold note when dragging to place (plus fix for hold notes on different note quants) 2023-09-11 19:42:10 -04:00
EliteMasterEric 430c937811 Merge remote-tracking branch 'origin/feature/chart-editor-snap' into develop 2023-09-11 18:29:29 -04:00
EliteMasterEric d3f5a81b13 Fix a bug where ghost note would be properly snapped but placed note would not. 2023-09-11 18:29:08 -04:00
EliteMasterEric 1524f6a96e Merge branch 'bugfix-squashed/macos-file-browse' into develop 2023-09-11 17:52:04 -04:00
EliteMasterEric 2dad5953fd I hope someone got fired for that blunder. 2023-09-11 17:42:46 -04:00
EliteMasterEric 2ea030d5a2 Merge remote-tracking branch 'origin/bugfix-squash/playbar-scrollarea-height' into HEAD 2023-09-08 18:25:40 -04:00
EliteMasterEric 1acce31123 Merge remote-tracking branch 'origin/feature/chart-note-snapping-ui' into HEAD 2023-09-08 18:25:20 -04:00
EliteMasterEric a3e3341a1a Merge branch 'bugfix-squash/chart-editor-template-bpm' into HEAD 2023-09-08 18:24:21 -04:00
EliteMasterEric ef1cb10bb3 Merge remote-tracking branch 'origin/bugfix-squash/song-data-parser-rework' into HEAD 2023-09-08 18:23:55 -04:00
EliteMasterEric e8952d101a Merge remote-tracking branch 'origin/bugfix-squashed/macos-file-browse' into HEAD 2023-09-08 18:23:01 -04:00
EliteMasterEric acadec80de Merge remote-tracking branch 'origin/feature/chart-editor-file-keybinds' into HEAD 2023-09-08 18:21:25 -04:00
EliteMasterEric 15741843fc Merge remote-tracking branch 'origin/feature/chart-editor-beat-lines' into HEAD 2023-09-08 18:21:08 -04:00
EliteMasterEric f46c8821c8 Merge remote-tracking branch 'origin/feature/chart-editor-snap' into HEAD 2023-09-08 18:20:52 -04:00
EliteMasterEric f8ae4b2a62 Merge remote-tracking branch 'origin/bugfix/chart-editor-playbar-buttons' into HEAD 2023-09-08 18:20:46 -04:00
EliteMasterEric c24fa3c154 Fix issue where playbar scroll area wasn't scaled to the grid. 2023-09-08 18:07:08 -04:00
EliteMasterEric 7a161e4cec Improved UI for note snapping (and notif on difficulty change) 2023-09-08 18:04:25 -04:00
EliteMasterEric 8431e18d37 Fixed issue where ChartEditorState was not copying SongMetadata properly 2023-09-08 18:00:48 -04:00
EliteMasterEric f4bc682ea1 Remove funkin.play.song.SongData and refactor app to match. 2023-09-08 17:46:44 -04:00
EliteMasterEric 2c3e513d5b Fixed bugs with saving charts on Mac 
Added FILE_DROP_SUPPORTED compilation flag and edited UI text to match.
 2023-09-08 17:41:20 -04:00
Cameron Taylor 96a0b2fe87 Merge branch 'master' of https://github.com/ninjamuffin99/funkin-secret into feature/chart-editor-snap 2023-09-04 23:30:02 -04:00