834 commits

Author	SHA1	Message	Date
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	8fea7eb734	Fix a bug where the background of the game over screen is pink	2023-12-19 01:57:39 -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
EliteMasterEric	4ff5bd21df	Fixes to the FNF Legacy JSON parser	2023-12-19 01:23:42 -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	3f2d1b4c1b	Update haxelibs, add flixel-text-input to fix overlapping text	2023-12-14 17:34:02 -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
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	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
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	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
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	66611c5d2f	Fixes to FlxSound when pausing before starting	2023-12-06 22:03:36 -05:00
EliteMasterEric	1abd587645	Rework offsets to be built into the FlxSound	2023-12-06 15:04:24 -05:00
EliteMasterEric	1716ffc57f	Implement instrumental and vocal offsets into the PlayState.	2023-12-05 02:44:57 -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
Cameron Taylor	df427c8ecb	player vis in progress	2023-11-29 06:17:01 -05:00
Cameron Taylor	eea614b4f5	samples stability	2023-11-29 05:49:59 -05:00
Cameron Taylor	73810a5059	Merge branch 'rewrite/master' of https://github.com/funkincrew/funkin-secret into feature/chart-waveform	2023-11-29 04:44:37 -05:00
Cameron Taylor	0899c60e8d	Merge pull request #234 from FunkinCrew/polish/welcome-screen ... more info on playbar	2023-11-29 04:25:11 -05:00
Cameron Taylor	87b1cabbac	Merge branch 'rewrite/master' into bugfix/platform-fixes	2023-11-29 01:46:10 -05:00
Cameron Taylor	ca9f42fedf	waveform in progres	2023-11-29 01:43:59 -05:00
EliteMasterEric	99ed8b94d7	Target the current time change rather than the first one.	2023-11-28 21:44:09 -05:00
EliteMasterEric	90fc00f9bb	Additional web fixes, Github CI should be happy now.	2023-11-28 21:19:07 -05:00
EliteMasterEric	9a2f235bed	Platform-specific fixes for HTML5 and MacOS	2023-11-28 20:52:45 -05:00
EliteMasterEric	ed10d2c5d0	Multiple chart editor bug fixes +tweaks	2023-11-28 20:36:59 -05:00
Cameron Taylor	21b79c0b83	bpm in playbar	2023-11-28 04:30:29 -05:00
Cameron Taylor	d9d5744f1e	difficulty playbar	2023-11-28 04:05:17 -05:00
Cameron Taylor	aee8df4fcb	default note snapps	2023-11-27 23:29:48 -05:00
Cameron Taylor	e44559d056	last modified	2023-11-27 20:37:10 -05:00
Cameron Taylor	41384ddf0d	playtesting fix	2023-11-25 03:50:22 -05:00
Cameron Taylor	f3a38e0232	fixing the stop	2023-11-25 02:48:43 -05:00
Cameron Taylor	64a4512980	charting song polish + recents menu fix	2023-11-25 02:18:39 -05:00
EliteMasterEric	290c568cb5	Disable notification actions while playtest is open.	2023-11-24 16:11:53 -05:00
EliteMasterEric	a2cee82779	Fixing up a rough Git merge	2023-11-24 00:58:12 -05:00
EliteMasterEric	4e1945b373	Merge remote-tracking branch 'origin/rewrite/master' into bugfix/chart-editor-macro-rework	2023-11-24 00:49:51 -05:00
EliteMasterEric	47f39b072a	Convert chart editor to macro-based UIState	2023-11-24 00:42:07 -05:00
EliteMasterEric	bab7d6cf53	Reworks to dialogs	2023-11-24 00:41:38 -05:00
Cameron Taylor	811640ef6a	Merge branch 'rewrite/master' into feature/chart-editor-backup-popup	2023-11-23 20:08:13 -05:00
Cameron Taylor	a2ce1fdd5e	opening and selecting specific file	2023-11-23 19:54:34 -05:00
Cameron Taylor	2d33461a24	windows file slash fix for opening folders	2023-11-23 19:48:28 -05:00
Cameron Taylor	645b9b579a	don't close backup dialog if opening folder	2023-11-23 18:35:57 -05:00
Cameron Taylor	ecdb89c3a6	Merge pull request #228 from FunkinCrew/polish/chart-intro-screen ... Polish/chart intro screen	2023-11-22 20:45:35 -05:00
Cameron Taylor	dbaaf639ac	Merge branch 'rewrite/master' into feature/chart-editor-backup-popup	2023-11-22 20:27:37 -05:00
EliteMasterEric	668fbd3b37	Fixes for autosave notification	2023-11-22 20:25:25 -05:00
Cameron Taylor	d66141c15a	playhead dragging	2023-11-22 19:53:56 -05:00