2889 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
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	cd05761725	assets master merge	2023-12-13 17:18:39 -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
Cameron Taylor	b39e952408	Merge pull request #243 from FunkinCrew/mac-delete ... Mac chart editor delete key fix	2023-12-13 03:47:53 -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	8f85e09de8	Merge pull request #245 from FunkinCrew/bugfix/quick-mac-fixes ... Some quick fixes to get Mac to build.	2023-12-11 11:31:50 -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	cf41eb661d	Merge pull request #239 from FunkinCrew/feature/chart-editor-offsets-part-2 ... Feature/chart editor offsets part 2	2023-12-08 19:21:17 -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	87c3d7d330	Update assets module.	2023-12-08 16:14:30 -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	8f30532ed4	offsets null fix quick	2023-12-08 01:57:46 -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
Cameron Taylor	9c68fdb2ae	assets submod update	2023-12-08 01:34:07 -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
Cameron Taylor	8d8b8743ae	Merge pull request #238 from FunkinCrew/feature/chart-editor-offsets-part-1 ... Implement instrumental and vocal offsets into the PlayState.	2023-12-07 19:30:54 -05:00
Cameron Taylor	3652550b1a	Merge branch 'rewrite/master' of github.com:FunkinCrew/Funkin-secret into feature/chart-editor-offsets-part-1	2023-12-07 18:14:10 -05:00
Cameron Taylor	e753d63d1d	assets merge	2023-12-07 18:12:31 -05:00
Cameron Taylor	90cf1edad1	Merge pull request #237 from FunkinCrew/feature/chart-editor-metronome-slider ... Metronome slider and scroll anchor	2023-12-07 18:10:02 -05:00
Cameron Taylor	d3245b7ec7	assets update	2023-12-07 18:01:21 -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	378cbbf32e	Merge pull request #235 from FunkinCrew/bugfix/chart-editor-notif-in-bg ... Multiple chart editor fixes	2023-12-07 14:30:00 -05:00
Cameron Taylor	554c7bb31d	null + macro things?	2023-12-07 14:29:45 -05:00