4013 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
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
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	f691de6452	Merge pull request #236 from FunkinCrew/bugfix/platform-fixes ... HTML5 and MacOS platform fixes	2023-11-29 01:48:14 -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
Eric	0704e9530b	Merge pull request #232 from FunkinCrew/polish/charting-music-bg ... charting song polish + recents menu fix	2023-11-27 19:35:11 -05:00
Cameron Taylor	6421b5d57d	Merge branch 'rewrite/master' into polish/charting-music-bg	2023-11-27 17:50:27 -05:00
Cameron Taylor	1054662faa	Merge pull request #233 from FunkinCrew/rewrite/ci-verify-submodule-commits ... fix(ci): submodules shallow cloning might run into issues when updating them	2023-11-27 15:22:48 -05:00
Hazel	8c5c706013	update submod	2023-11-27 18:20:03 +00:00