402 commits

Author	SHA1	Message	Date
Cameron Taylor	6b80e292e5	Merge branch 'rewrite/master' into input-offsets	2024-02-13 03:02:33 -05:00
EliteMasterEric	c4522fe177	Merge branch 'rewrite/master' into rewrite/weekend-1-gameplay-shaderdev	2024-02-13 02:17:06 -05:00
EliteMasterEric	f7da12acbc	Apparently the transition bug was TransitionableSubState's fault so kill it with fire.	2024-02-13 02:09:25 -05:00
EliteMasterEric	f0b5ef4491	Rest in peace, SwagCamera.	2024-02-13 01:38:11 -05:00
Cameron Taylor	41e94f951e	Merge branch 'rewrite/master' of https://github.com/funkincrew/funkin-secret into feature/freeplay-pico-character	2024-02-13 00:48:26 -05:00
Cameron Taylor	8c54a62ed6	Merge branch 'rewrite/master' into feature/freeplay-pico-character	2024-02-13 00:41:03 -05:00
Cameron Taylor	6e0f577d54	debugger fixes	2024-02-13 00:29:46 -05:00
EliteMasterEric	0ff258ce75	Use stickers to transition from the Results state	2024-02-12 23:34:51 -05:00
EliteMasterEric	1b5b7f0ae2	Fix a bug where stickers were broken on story mode	2024-02-12 23:34:40 -05:00
EliteMasterEric	0494ddb506	Fix crash in chart editor minimal Playtest	2024-02-12 23:19:25 -05:00
Cameron Taylor	25766dbde9	decoupling some stuff from Conductor.instance	2024-02-12 21:41:16 -05:00
Cameron Taylor	0145d7ed2d	input offset edits in progress	2024-02-12 20:06:43 -05:00
EliteMasterEric	ef28d34520	Sort PlayState imports	2024-02-12 16:50:29 -05:00
Cameron Taylor	d903edcb59	Merge branch 'rewrite/master' into input-offsets	2024-02-10 15:43:27 -05:00
EliteMasterEric	d0b3842d44	Merge branch 'feature/freeplay-pico-character' into rewrite/weekend-1-gameplay-shaderdev	2024-02-10 02:38:23 -05:00
EliteMasterEric	eea8dde455	Merge branch 'rewrite/master' into rewrite/weekend-1-gameplay-shaderdev	2024-02-10 02:30:50 -05:00
EliteMasterEric	091f8eb724	Merge branch 'rewrite/master' into feature/freeplay-pico-character	2024-02-09 23:13:40 -05:00
EliteMasterEric	2dd5f476b5	Fix a bug where alt instrumentals will load but not cache.	2024-02-08 02:21:12 -05:00
EliteMasterEric	31cd5b3414	Rework Conversation data parsing	2024-02-07 18:45:13 -05:00
EliteMasterEric	fa556dc1f2	Rewrite conversation JSON parsing code.	2024-02-07 09:21:44 -05:00
EliteMasterEric	82b63c02e1	Reworks to make Pico mode actually work.	2024-02-05 21:35:58 -05:00
EliteMasterEric	e5fb1de4ba	Fix a boatload of deprecation warnings and upgrade a few libraries.	2024-02-05 19:46:11 -05:00
EliteMasterEric	167976c8ba	Work in progress	2024-02-05 13:35:30 -05:00
Cameron Taylor	0f29f2f7a6	Merge branch 'rewrite/master' into input-offsets	2024-01-31 00:39:35 -05:00
Jenny Crowe	bfb032dc7f	Added units to other song events.	2024-01-26 18:51:36 -07:00
Jenny Crowe	8b19a7511c	Merge branch 'rewrite/master' of https://github.com/FunkinCrew/Funkin-secret into feature/units	2024-01-26 18:20:04 -07:00
Jenny Crowe	e111e91a9c	Editor: Added ability to set units for event properties. Fixed bug where event icon tooltip wouldn't show an enum text value correctly.	2024-01-24 20:31:25 -07:00
Jenny Crowe	a7e9f08e26	Editor now loads saved inst/vocal offset properly.	2024-01-19 21:24:18 -07:00
EliteMasterEric	26b7610663	Fix an error with playable Pico death	2024-01-17 23:14:28 -05:00
EliteMasterEric	a0c4499b03	Fix a bug where replaying a level makes a pink screen	2024-01-17 23:12:59 -05:00
Cameron Taylor	96d02261c5	Merge branch 'rewrite/master' into feature/stage-solids	2024-01-17 21:40:26 -05:00
EliteMasterEric	80c7bcdfdf	Rewrite Stage data handling to use the Registry pattern, and add support for solid colors.	2024-01-16 17:08:25 -05:00
Cameron Taylor	4375dfd13a	Merge pull request #285 from FunkinCrew/feature/play-state-note-polish ... Feature/play state note polish	2024-01-16 06:27:30 -05:00
EliteMasterEric	673f7f57d4	Fix pink rim on low zoom levels.	2024-01-16 00:03:30 -05:00
EliteMasterEric	5ac4b14891	Fix week 7 death animations.	2024-01-15 23:51:37 -05:00
EliteMasterEric	3d2e50906f	I was in fact a dumbass.	2024-01-15 22:13:01 -05:00
EliteMasterEric	e391c02015	Polish note display visuals, and scrap Killer judgement.	2024-01-15 22:10:42 -05:00
EliteMasterEric	e0dfdd40a2	Merge remote-tracking branch 'origin/rewrite/master' into feature/play-state-note-polish	2024-01-15 21:55:23 -05:00
EliteMasterEric	313fd55e98	WIP	2024-01-15 14:20:44 -05:00
EliteMasterEric	d53dbd67e3	Rewrite to character animation, boyfriend death animation should be fixed	2024-01-14 09:18:32 -05:00
EliteMasterEric	549d461172	Fix an issue where Song offsets would be null rather than zero.	2024-01-14 06:46:58 -05:00
Cameron Taylor	e87c895131	Merge branch 'rewrite/master' into feature/chart-editor-drag-edit-holds	2024-01-12 08:13:30 -05:00
Eric	2a7f9a0880	Merge branch 'rewrite/master' into bugfix/controller-overflow	2024-01-12 07:48:03 -05:00
EliteMasterEric	025fd326bd	Click and drag on a sustain to edit it.	2024-01-12 06:13:34 -05:00
EliteMasterEric	462eece09a	Use proper difficulty rating data, proper clear percentage	2024-01-11 00:30:00 -05:00
EliteMasterEric	043fb553f6	Fix an issue causing an overflow error when using gamepad (WINDOWS ONLY)	2024-01-10 00:20:00 -05:00
Cameron Taylor	5d0c1521d5	strumline refactor stuffy	2024-01-09 13:16:00 -05:00
Cameron Taylor	da4e77bf44	Merge branch 'rewrite/master' into feature/chart-editor-context-menus	2024-01-05 20:11:38 -05:00
Cameron Taylor	65aee1dd13	Merge branch 'rewrite/master' into bugfix/conductor-rewrite	2024-01-05 15:32:42 -05:00
EliteMasterEric	4c353101ae	Merge remote-tracking branch 'origin/rewrite/master' into feature/chart-editor-context-menus	2024-01-04 01:55:00 -05:00