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

1698 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
Cameron Taylor 9c4f43b6bf Merge pull request #157 from FunkinCrew/feature/improved-cursor 
Chart Editor: Improved Cursor
 2023-09-12 22:24:36 -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
Cameron Taylor c777af6d1e Merge pull request #153 from FunkinCrew/bugfix-squash/playbar-scrollarea-height 
Chart Editor: Fix issue where playbar scroll area wasn't scaled to the grid.
 2023-09-12 19:15:54 -04:00
EliteMasterEric d7605a613d Merge remote-tracking branch 'origin/master' into bugfix/story-menu-background 2023-09-12 18:54:50 -04:00
EliteMasterEric e1d16970c1 Merge remote-tracking branch 'origin/master' into bugfix-squash/playbar-scrollarea-height 2023-09-12 18:54:36 -04:00
EliteMasterEric 459a96a791 Merge remote-tracking branch 'origin/master' into bugfix-squash/song-data-parser-rework 2023-09-12 18:54:14 -04:00
EliteMasterEric 10ded0c736 Merge remote-tracking branch 'origin/master' into bugfix-squashed/macos-file-browse 2023-09-12 18:53:28 -04:00
EliteMasterEric 82a6549075 Merge remote-tracking branch 'origin/master' into feature/chart-editor-file-keybinds 2023-09-12 18:53:06 -04:00
EliteMasterEric 3c484cb2d9 Merge remote-tracking branch 'origin/master' into feature/chart-editor-beat-lines 2023-09-12 18:52:43 -04:00
EliteMasterEric f1e7cac979 Merge remote-tracking branch 'origin/master' into feature/chart-editor-snap 2023-09-12 18:52:16 -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 8eb7d61956 Merge branch 'master' into bugfix/chart-editor-null-safety 2023-09-12 18:48:09 -04:00
Cameron Taylor 8bdd0e8189 Merge pull request #158 from FunkinCrew/bugfix/revert-openfl 
Revert OpenFL to the version which has no crash handler but un-breaks the HaxeUI style.
 2023-09-12 18:41:34 -04:00
EliteMasterEric 12c8362321 Revert OpenFL to the version which has no crash handler but un-breaks the HaxeUI style. 2023-09-12 18:38:55 -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 ee900fd7aa Merge branch 'bugfix/chart-editor-null-safety' into HEAD 2023-09-08 18:20:25 -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 dfedaa8838 Updated and revised unit tests (including new SongRegistry) 2023-09-08 17:46:10 -04:00
EliteMasterEric 7e1c11bb25 New song data parser 2023-09-08 17:45:47 -04:00
EliteMasterEric 12b5f3fbc1 Updated json2object. 2023-09-08 17:44:11 -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
Cameron Taylor 222b364e75 Merge branch 'master' of https://github.com/ninjamuffin99/funkin-secret into feature/chart-editor-beat-lines 2023-09-04 23:28:18 -04:00
Cameron Taylor f87a8ef412 Merge branch 'master' of https://github.com/ninjamuffin99/funkin-secret into bugfix/chart-editor-null-safety 2023-09-04 22:27:16 -04:00