Cameron Taylor
|
1e07b6ae22
|
Merge branch 'rewrite/master' into bugfix/chart-editor-modifies-freeplay
|
2024-01-05 17:41:07 -05:00 |
|
Cameron Taylor
|
65aee1dd13
|
Merge branch 'rewrite/master' into bugfix/conductor-rewrite
|
2024-01-05 15:32:42 -05:00 |
|
EliteMasterEric
|
7684757dbb
|
Merge remote-tracking branch 'origin/rewrite/master' into no-debugger
|
2024-01-03 19:54:41 -05:00 |
|
EliteMasterEric
|
a1002c4756
|
Merge remote-tracking branch 'origin/rewrite/master' into bugfix/conductor-rewrite
|
2024-01-02 14:14:26 -05:00 |
|
EliteMasterEric
|
ddfecf2cfc
|
Clean up difficulty label behavior
|
2024-01-02 14:07:07 -05:00 |
|
Cameron Taylor
|
11d21c1369
|
Merge branch 'rewrite/master' into bugfix/chart-editor-monday-fixes
|
2024-01-01 19:09:36 -05:00 |
|
Eric
|
edd8bdc014
|
Merge branch 'rewrite/master' into bugfix/chart-editor-monday-fixes
|
2023-12-19 19:04:40 -05:00 |
|
EliteMasterEric
|
711253a202
|
Update HaxeUI to latest
|
2023-12-19 16:12:25 -05:00 |
|
EliteMasterEric
|
70b7de94aa
|
Fix to Metadata toolbox causing crash when no GF :(
|
2023-12-19 01:28:13 -05:00 |
|
EliteMasterEric
|
ad02bf2ee0
|
Fix to GameOverSubstate exiting to Freeplay instead of Chart Editor
|
2023-12-19 01:27:58 -05:00 |
|
EliteMasterEric
|
bb0fb02813
|
Fix to launching directly into Chart Editor
|
2023-12-19 01:26:43 -05:00 |
|
EliteMasterEric
|
3e65e7ecc5
|
Fix for vocals not loading properly and not getting cleared properly.
|
2023-12-19 01:26:26 -05:00 |
|
EliteMasterEric
|
328bb7b938
|
Fixes to Erect/Nightmare only
|
2023-12-19 01:25:15 -05:00 |
|
Cameron Taylor
|
41ad47db52
|
Merge branch 'rewrite/master' into bugfix/selection-highlight
|
2023-12-19 01:18:49 -05:00 |
|
Cameron Taylor
|
4fc56a2280
|
small fix to backups folder not existing
|
2023-12-15 21:46:09 -05:00 |
|
EliteMasterEric
|
88ca58f9e2
|
Fixes for updated HaxeUI and Flixel.
|
2023-12-15 21:09:01 -05:00 |
|
Cameron Taylor
|
e9ed7223b6
|
no debugger
|
2023-12-15 02:29:32 -05:00 |
|
Cameron Taylor
|
15f72adeed
|
Merge branch 'rewrite/master' into bugfix/selection-highlight
|
2023-12-14 18:41:23 -05:00 |
|
EliteMasterEric
|
ca489b5609
|
Rewrite the Conductor to be a singleton instance.
|
2023-12-14 16:56:20 -05:00 |
|
EliteMasterEric
|
b3236e6134
|
Fix a bug where modifying a copied template song's BPM in the chart editor would modify BPM in Freeplay.
|
2023-12-14 00:47:04 -05:00 |
|
Cameron Taylor
|
4ea04a9a2e
|
Merge branch 'icon-charswitcher' into rewrite/master
|
2023-12-13 23:11:51 -05:00 |
|
EliteMasterEric
|
e2b0ed98dd
|
Fix a bug where making one selection and then making a different one would leave the original highlighted
|
2023-12-13 23:11:19 -05:00 |
|
Cameron Taylor
|
0a47689eaa
|
ease
|
2023-12-13 23:11:12 -05:00 |
|
EliteMasterEric
|
aeb2cf24ad
|
Fix a rebase issue
|
2023-12-13 22:42:09 -05:00 |
|
EliteMasterEric
|
b740fbf028
|
Merge remote-tracking branch 'origin/rewrite/master' into feature/chart-waveform
|
2023-12-13 22:36:08 -05:00 |
|
Cameron Taylor
|
4193cd4ee2
|
proper dialog fading
|
2023-12-13 18:24:55 -05:00 |
|
Cameron Taylor
|
028e90474c
|
Merge branch 'rewrite/master' of github.com:FunkinCrew/Funkin-secret into icon-charswitcher
|
2023-12-13 17:26:46 -05:00 |
|
Cameron Taylor
|
db76a0dd1d
|
Merge pull request #244 from FunkinCrew/chart-edit-playtest
Enabling / Disabling "playtest" mode from chart editor
|
2023-12-13 17:19:02 -05:00 |
|
Cameron Taylor
|
b09ed369e8
|
f
|
2023-12-13 09:20:15 -05:00 |
|
Cameron Taylor
|
6ca0e32391
|
Merge branch 'rewrite/master' of github.com:FunkinCrew/Funkin-secret into icon-charswitcher
|
2023-12-13 09:20:11 -05:00 |
|
Eric
|
34673c3f6c
|
Merge branch 'rewrite/master' into mac-delete
|
2023-12-12 19:44:04 -05:00 |
|
EliteMasterEric
|
42d070922b
|
Merge remote-tracking branch 'origin/rewrite/master' into feature/chart-waveform
|
2023-12-12 19:34:58 -05:00 |
|
Eric
|
f36cb84797
|
Merge pull request #242 from FunkinCrew/copy-flash
chart editor: copy notes polish
|
2023-12-12 19:29:17 -05:00 |
|
Eric
|
a6e7fc6d2c
|
Merge pull request #241 from FunkinCrew/copy-preview
note highlight preview
|
2023-12-12 19:29:06 -05:00 |
|
Eric
|
50d015c449
|
Merge branch 'rewrite/master' into chart-edit-playtest
|
2023-12-12 17:09:26 -05:00 |
|
EliteMasterEric
|
43038d0a06
|
Move the "Start at current time" checkbox
|
2023-12-12 17:07:28 -05:00 |
|
Eric
|
591de9bf6d
|
Merge branch 'rewrite/master' into icon-charswitcher
|
2023-12-12 14:29:06 -05:00 |
|
EliteMasterEric
|
52f16ce457
|
Redo icon dialog and add support to metadata dialog.
|
2023-12-12 05:24:43 -05:00 |
|
Cameron Taylor
|
b33f27f097
|
tiny lil polish and cleanin
|
2023-12-11 04:35:39 -05:00 |
|
Cameron Taylor
|
05f977f85f
|
character selector
|
2023-12-11 03:38:44 -05:00 |
|
Cameron Taylor
|
9ffffe9c8a
|
player char select
|
2023-12-11 02:40:58 -05:00 |
|
Cameron Taylor
|
181e3f85b8
|
switching opp
|
2023-12-11 02:26:37 -05:00 |
|
Cameron Taylor
|
ac3f27edd4
|
icon char select in progres
|
2023-12-11 00:19:33 -05:00 |
|
EliteMasterEric
|
e24c5877a9
|
Some quick fixes to get Mac to build.
|
2023-12-10 23:33:08 -05:00 |
|
Cameron Taylor
|
c3fa793d97
|
adds !isCursorOverHaxeUI around
|
2023-12-10 04:10:57 -05:00 |
|
Cameron Taylor
|
3a70ca4e08
|
menubar selected fix
|
2023-12-10 03:49:24 -05:00 |
|
Cameron Taylor
|
8cec180353
|
practice mode in progress
|
2023-12-10 03:37:12 -05:00 |
|
Cameron Taylor
|
7876b07c37
|
mac delete key fix
|
2023-12-09 18:00:32 -05:00 |
|
Cameron Taylor
|
87c866f662
|
copy notifier polish
|
2023-12-08 22:55:14 -05:00 |
|
Cameron Taylor
|
6f141e5f52
|
copy text popup
|
2023-12-08 22:28:34 -05:00 |
|