EliteMasterEric
|
1ccb84bbf2
|
Merge remote-tracking branch 'origin/rewrite/master' into rewrite/feature/chart-editor-erect-template
|
2023-10-10 23:46:54 -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
|
b6752531bf
|
Add chart editor theme
|
2023-09-29 22:29:32 -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 |
|