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
|
4ea04a9a2e
|
Merge branch 'icon-charswitcher' into rewrite/master
|
2023-12-13 23:11:51 -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 |
|
Cameron Taylor
|
796e1fcbab
|
note highlight preview
|
2023-12-08 20:21:55 -05:00 |
|
Cameron Taylor
|
1871b87630
|
Merge branch 'rewrite/master' of github.com:FunkinCrew/Funkin-secret into feature/chart-waveform
|
2023-12-08 19:28:16 -05:00 |
|
Cameron Taylor
|
c99ac11d8a
|
opponent vocal
|
2023-12-08 18:44:45 -05:00 |
|
Cameron Taylor
|
81432100b8
|
Merge branch 'rewrite/master' of github.com:FunkinCrew/Funkin-secret into feature/chart-waveform
|
2023-12-08 18:35:28 -05:00 |
|
EliteMasterEric
|
6060282f20
|
Merge remote-tracking branch 'origin/rewrite/master' into feature/chart-editor-offsets-part-2
|
2023-12-08 16:12:56 -05:00 |
|
EliteMasterEric
|
64cba7ca2d
|
Okay offsets should be actually done now.
|
2023-12-08 16:12:36 -05:00 |
|
EliteMasterEric
|
7c6baea7d2
|
Rework to fix variant issues
|
2023-12-08 14:01:12 -05:00 |
|
Cameron Taylor
|
2858cbf56b
|
mac file filter fix
|
2023-12-08 02:14:26 -05:00 |
|
Cameron Taylor
|
88409df992
|
Merge branch 'rewrite/master' of github.com:FunkinCrew/Funkin-secret into feature/chart-waveform
|
2023-12-08 01:34:26 -05:00 |
|
EliteMasterEric
|
f3fa9a58d3
|
Merge remote-tracking branch 'origin/rewrite/master' into feature/chart-editor-offsets-part-2
|
2023-12-08 01:16:16 -05:00 |
|
EliteMasterEric
|
7f0caeb026
|
Work in progress on offsets in Chart Editor state.
|
2023-12-08 01:15:22 -05:00 |
|
EliteMasterEric
|
e23c1464f6
|
Merge remote-tracking branch 'origin/rewrite/master' into feature/chart-editor-offsets-part-1
|
2023-12-07 16:32:12 -05:00 |
|
Cameron Taylor
|
cd0bd7ff55
|
assets
|
2023-12-07 14:41:53 -05:00 |
|
Cameron Taylor
|
554c7bb31d
|
null + macro things?
|
2023-12-07 14:29:45 -05:00 |
|
EliteMasterEric
|
1abd587645
|
Rework offsets to be built into the FlxSound
|
2023-12-06 15:04:24 -05:00 |
|
Cameron Taylor
|
a750cc1620
|
vis wips wips wips
|
2023-12-01 19:58:58 -05:00 |
|
EliteMasterEric
|
a0ae30a7c1
|
Metronome slider and scroll anchor
|
2023-12-01 17:14:48 -05:00 |
|
EliteMasterEric
|
8ef380e0b2
|
Resolve merge issues
|
2023-11-29 16:53:08 -05:00 |
|
EliteMasterEric
|
eebb2e874f
|
Merge branch 'rewrite/master' into bugfix/chart-editor-notif-in-bg
|
2023-11-29 16:42:40 -05:00 |
|