Commit graph

4277 commits

Author SHA1 Message Date
EliteMasterEric
be4fd74d40 Resolve metadata loading issues. 2023-09-25 23:24:18 -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
62c62cb53e Update json2object to fork 2023-09-25 21:18:56 -04:00
EliteMasterEric
ed6bc553ed Implemented art and assets as submodules. 2023-09-25 20:12:38 -04:00
Cameron Taylor
480b34cf6b Merge pull request #159 from FunkinCrew/feature/chart-editor-performance-revamp
Chart Editor: Peformance Revamp
2023-09-20 21:24:48 -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
26501e59dd Merge pull request #152 from FunkinCrew/feature/chart-note-snapping-ui
Improved UI for note snapping (and notif on difficulty change)
2023-09-19 19:30:37 -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
72f9cfdf76 Merge pull request #154 from FunkinCrew/feature/ghost-hold-notes
Chart Editor - Ghost Hold Notes
2023-09-19 19:20:51 -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
29c22a422f Fixed a JSON parser issue causing event data to be parsed wrong! 2023-09-18 20:14:43 -04:00
EliteMasterEric
06269e95fd Fix to crash in freeplay (swapped two args oops!) 2023-09-18 20:02:17 -04:00
Cameron Taylor
c0a65f9081 Merge pull request #141 from FunkinCrew/bugfix/chart-editor-null-safety
Apply @:nullSafety to chart editor classes.
2023-09-18 19:37:13 -04:00
EliteMasterEric
b56768d9b5 Fix an issue where the game would try and fail to load metadata for a newly created song in the Chart Editor. 2023-09-18 17:59:55 -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
ca31dc0f3c Merge pull request #149 from FunkinCrew/bugfix-squashed/macos-file-browse
Chart Editor: MacOS File Browse Fix
2023-09-18 15:49:08 -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
eae1723d87 Merge pull request #148 from FunkinCrew/feature/chart-editor-file-keybinds
Chart Editor: Added missing File menu keybinds
2023-09-12 22:37:50 -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
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