864 commits

Author	SHA1	Message	Date
Cameron Taylor	c4e2f61e2d	Merge branch 'rewrite/master' into rewrite/feature/remember-difficulty	2023-10-18 23:59:21 -04:00
Cameron Taylor	902ad4be3a	Merge branch 'rewrite/master' into rewrite/bugfix/chart-editor-more-fixes	2023-10-18 19:47:50 -04:00
Cameron Taylor	25c24a9bc8	Merge branch 'rewrite/master' into rewrite/bugfix/chart-editor-various-fixes	2023-10-18 19:32:31 -04:00
EliteMasterEric	26f83b5a81	Fix _time of nullable compile error.	2023-10-18 16:02:56 -04:00
EliteMasterEric	fa358e455e	Merge branch 'rewrite/master' into charting-sfx	2023-10-18 15:50:12 -04:00
EliteMasterEric	fbcce75ea4	Merge branch 'rewrite/master' into rewrite/feature/remember-difficulty	2023-10-18 15:47:18 -04:00
EliteMasterEric	cdab8753ea	Lots of reported bugs fixed.	2023-10-18 01:02:10 -04:00
EliteMasterEric	6bf6b8ef11	Merge branch 'rewrite/master' into rewrite/bugfix/chart-editor-various-fixes	2023-10-18 00:04:04 -04:00
Cameron Taylor	d4e6befc28	submodule merge fix	2023-10-17 21:40:20 -04:00
Cameron Taylor	08845915ea	fixed cutscene skipping too fast from disabling inputs	2023-10-17 21:26:32 -04:00
EliteMasterEric	d47c5f5765	Merge branch 'rewrite/bugfix/chart-editor-various-fixes' into rewrite/master	2023-10-17 21:21:46 -04:00
Cameron Taylor	4b255174fb	Merge pull request #196 from FunkinCrew/rewrite/bugfix/chart-editor-bpm-fixes ... Chart Editor: Fix issues with changing BPMs of songs.	2023-10-17 19:11:57 -04:00
Cameron Taylor	7cfbd0ca0f	Merge branch 'rewrite/master' into rewrite/bugfix/pause-and-results-fixes	2023-10-17 19:02:36 -04:00
EliteMasterEric	92a4a41d20	Fix an issue where chart editor theme continues when exiting	2023-10-17 17:59:01 -04:00
EliteMasterEric	4a6904d52c	Merge remote-tracking branch 'origin/rewrite/master' into rewrite/feature/remember-difficulty	2023-10-17 17:32:14 -04:00
EliteMasterEric	6cb8a719af	Additional cleanup on difficulty sort order (tested and working!)	2023-10-17 17:27:11 -04:00
Cameron Taylor	a129e6219d	Merge branch 'rewrite/master' of https://github.com/ninjamuffin99/Funkin-secret into rewrite/master	2023-10-17 17:20:08 -04:00
EliteMasterEric	6888e7b122	Merge branch 'rewrite/bugfix/pause-and-results-fixes' of https://github.com/FunkinCrew/Funkin-secret into rewrite/bugfix/pause-and-results-fixes	2023-10-17 17:10:16 -04:00
EliteMasterEric	a4fde254d9	Merge branch 'rewrite/master' into rewrite/bugfix/pause-and-results-fixes	2023-10-17 17:07:36 -04:00
EliteMasterEric	4e0934dbd1	Fix issues with changing BPMs of songs.	2023-10-17 16:57:06 -04:00
EliteMasterEric	f51592963e	Fixes for a few bugs in the chart editor.	2023-10-17 02:42:52 -04:00
EliteMasterEric	6dbf958d75	Readd some missing lines.	2023-10-17 02:15:53 -04:00
Cameron Taylor	afcb677fac	index on rewrite/bugfix/pause-and-results-fixes: 9b8fc872 song diff menu sort	2023-10-17 00:38:28 -04:00
Cameron Taylor	9b8fc87261	song diff menu sort	2023-10-17 00:07:36 -04:00
Cameron Taylor	0ce82e49d0	story menu diff sorted	2023-10-16 23:43:59 -04:00
EliteMasterEric	3add6a965e	Several crashes fixed and working Random!	2023-10-16 20:12:40 -04:00
Cameron Taylor	732fe59c3e	Merge branch 'rewrite/master' of https://github.com/ninjamuffin99/Funkin-secret into rewrite/feature/precise-inputs-gamepad	2023-10-16 16:47:51 -04:00
Cameron Taylor	865f771c4a	Merge branch 'rewrite/master' of https://github.com/ninjamuffin99/Funkin-secret into rewrite/feature/preferences-rewrite	2023-10-15 20:54:22 -04:00
Cameron Taylor	cb0bddcb34	Merge branch 'rewrite/master' of https://github.com/ninjamuffin99/Funkin-secret into rewrite/feature/save-data-rewrite	2023-10-15 20:19:31 -04:00
EliteMasterEric	f41a7fbc23	Fast-forward assets submodule	2023-10-15 19:39:11 -04:00
EliteMasterEric	d350ba3bdc	Merge remote-tracking branch 'origin/rewrite/master' into rewrite/feature/save-data-rewrite	2023-10-15 19:36:36 -04:00
EliteMasterEric	b3ca30d10a	Merge remote-tracking branch 'origin/rewrite/master' into rewrite/bugfix/anim-editor-crash-fix	2023-10-15 19:25:33 -04:00
EliteMasterEric	6fc56ffd77	Merge branch 'rewrite/master' into rewrite/bugfix/anim-editor-crash-fix	2023-10-15 19:25:01 -04:00
Cameron Taylor	937082fecf	Merge branch 'rewrite/master' of https://github.com/ninjamuffin99/Funkin-secret into rewrite/feature/snapped-paste	2023-10-15 19:23:06 -04:00
EliteMasterEric	022b93bc43	Merge branch 'rewrite/master' into rewrite/feature/chart-editor-erect-template	2023-10-15 18:42:38 -04:00
EliteMasterEric	9f293d3be8	Merge branch 'rewrite/master' into rewrite/feature/save-data-rewrite	2023-10-15 01:15:49 -04:00
EliteMasterEric	88f9584fd9	Fix an issue where the game would crash when loading a song in Freeplay	2023-10-15 01:06:06 -04:00
EliteMasterEric	ccefa972a0	Fixes an issue where Freeplay Menu wasn't properly flagging the Week 6 assets to load.	2023-10-15 00:59:35 -04:00
EliteMasterEric	7a9b4d6bf0	Add the "death.cameraOffset" attribute to character data	2023-10-15 00:51:20 -04:00
EliteMasterEric	ccedd82210	Move FunkinDropdown to FunkinDropDown	2023-10-15 00:34:37 -04:00
EliteMasterEric	098dedd41e	Fix "Could not locate metadataDialog"	2023-10-15 00:22:25 -04:00
EliteMasterEric	dd38dbbadf	Tweaked the numbers on scrolling	2023-10-14 23:57:40 -04:00
EliteMasterEric	0f08b1133e	Rename some sounds used by the chart editor	2023-10-14 22:49:24 -04:00
Cameron Taylor	eb95f105d7	Merge pull request #187 from FunkinCrew/rewrite/bugfix/menu-spam ... Fix spamming buttons on Pause/Freeplay breaking shit	2023-10-14 20:33:36 -04:00
EliteMasterEric	c1684b218e	More fixes to github actions	2023-10-12 20:17:41 -04:00
EliteMasterEric	9ec3f7aaac	Fix to FORCE_DEBUG_VERSION flag	2023-10-12 19:57:16 -04:00
EliteMasterEric	dd3d1116c0	Add a flag to make Git hash display on launcher builds.	2023-10-12 13:22:59 -04:00
EliteMasterEric	996f7b275e	Remember difficulty when leaving story/freeplay menu.	2023-10-12 03:20:21 -04:00
Cameron Taylor	9ff4885173	charting sound effects in progress!	2023-10-11 19:39:52 -04:00
EliteMasterEric	a88262a5f4	Hide AnimateAtlas characters in the animation editor.	2023-10-11 19:16:04 -04:00
EliteMasterEric	f3737601f8	Can't spam enter on pause menu or freeplay menu anymore	2023-10-11 18:54:58 -04:00
EliteMasterEric	8589c10c75	Fixes to Pause screen and Results screen	2023-10-11 17:33:55 -04:00
Cameron Taylor	0c0829b2d0	sound effects for stickersubstate	2023-10-11 07:43:44 -04:00
Cameron Taylor	6e2441b540	Merge pull request #184 from FunkinCrew/rewrite/bugfix/glowup-autosave ... Fix exit button in Chart Editor menu	2023-10-11 06:32:00 -04:00
EliteMasterEric	05044d9af3	Override F4 behavior	2023-10-11 00:39:16 -04:00
EliteMasterEric	d7a15dc713	Fix exit button in Chart Editor menu	2023-10-11 00:30:41 -04:00
EliteMasterEric	1ccb84bbf2	Merge remote-tracking branch 'origin/rewrite/master' into rewrite/feature/chart-editor-erect-template	2023-10-10 23:46:54 -04:00
EliteMasterEric	cdac9aec9a	Merge remote-tracking branch 'origin/rewrite/master' into rewrite/feature/chart-editor-wasd	2023-10-10 23:42:38 -04:00
EliteMasterEric	299a3a1a25	Merge branch 'rewrite/master' into rewrite/feature/chart-editor-wasd	2023-10-10 23:38:38 -04:00
EliteMasterEric	989d1c3175	Merge rewrite/master, fix high score retrieval	2023-10-10 23:32:01 -04:00
Cameron Taylor	e5fbf5d99f	Merge pull request #180 from FunkinCrew/rewrite/bugfix/difficulty-switch-crash ... [CRASH FIX] Safely handle difficulty switching to avoid null object reference in Play State	2023-10-10 21:33:57 -04:00
Cameron Taylor	e26a82275c	Merge branch 'rewrite/master' into rewrite/bugfix/alt-animation-fixes	2023-10-10 20:32:12 -04:00
EliteMasterEric	f652beb382	Fix several merge errors.	2023-10-09 20:04:21 -04:00
Cameron Taylor	8009045e76	fix to song selection	2023-10-09 18:38:52 -04:00
Cameron Taylor	9446f268e0	diff stars pop in nicer	2023-10-09 18:38:10 -04:00
Cameron Taylor	9926706e6e	litty fix	2023-10-09 18:38:05 -04:00
Cameron Taylor	4b1af216d4	capsule alpha stuff in progress	2023-10-09 18:38:02 -04:00
Cameron Taylor	387acd211e	icon scaling fix + removed temp lighting	2023-10-09 18:37:20 -04:00
Cameron Taylor	ba896508cc	cartoons and stuff	2023-10-09 18:35:43 -04:00
Cameron Taylor	546e15dcac	click polish	2023-10-09 18:34:54 -04:00
Cameron Taylor	8c74fcd73a	playingCartoon bool woops	2023-10-09 18:34:38 -04:00
Cameron Taylor	8f9206f639	python file to generate shitty audio	2023-10-09 18:34:29 -04:00
Cameron Taylor	ab5d6d2f48	sounds in progress	2023-10-09 18:33:50 -04:00
Cameron Taylor	66f77a985f	boyfriend blink code	2023-10-09 18:33:09 -04:00
Cameron Taylor	82bb619864	boyfriend tv looping	2023-10-09 18:33:09 -04:00
Cameron Taylor	5ddc4876bc	boyfriend animations swapped to atlas sprites	2023-10-09 18:33:03 -04:00
Cameron Taylor	f000d21689	shaders and blendmode overlay stuff in progres	2023-10-09 18:32:18 -04:00
Cameron Taylor	b20cb27f82	hue shifting in progress	2023-10-09 18:31:06 -04:00
Cameron Taylor	20d13f56ac	capsule text effect	2023-10-09 18:29:32 -04:00
Cameron Taylor	5d6264e67e	sprites follow rotation of capsule	2023-10-09 18:28:59 -04:00
Cameron Taylor	0dbcc50bcc	random song music in progress	2023-10-09 18:28:56 -04:00
Cameron Taylor	8525cfaf21	cute text popin	2023-10-09 18:28:11 -04:00
Cameron Taylor	f474c3aac5	better grouping stuf	2023-10-09 18:28:11 -04:00
Cameron Taylor	eacd76a0fa	difficulty rankings and grayscale mockup	2023-10-09 18:28:08 -04:00
Cameron Taylor	a8e39d90e8	temp rank stuff in progress	2023-10-09 18:27:17 -04:00
EliteMasterEric	f7bac02ee3	Fix crashing, broken countdown, broken miss muting in song preview	2023-10-09 18:24:07 -04:00
EliteMasterEric	5fa9c5246f	Fixed a bug where beat hit events were called multiple times during the conductor	2023-10-09 18:22:52 -04:00
EliteMasterEric	11b1ca5100	Fix bug where pressing ENTER in UI would cause song to try to preview. Fix bug where trying to preview a newly created song would crash.	2023-10-09 18:22:28 -04:00
EliteMasterEric	5b4a00e893	Make sure timestamps are consistent with use of Int64.	2023-10-09 18:22:02 -04:00
EliteMasterEric	4f0e9614e0	Fix build issues caused by int64 handling	2023-10-09 18:21:58 -04:00
EliteMasterEric	2f56c74060	Fix HTML typing issue	2023-10-09 18:19:58 -04:00
EliteMasterEric	4468e2a5a5	Fixed several bugs with Play State (mostly restarting the song)	2023-10-09 18:16:26 -04:00
Cameron Taylor	b96c0e6256	album artist stuff	2023-10-09 18:12:14 -04:00
Cameron Taylor	097b5dab46	freeplay optimize fix	2023-10-09 18:11:19 -04:00
Cameron Taylor	97267d18b9	freeplay wrapping fix	2023-10-09 18:10:02 -04:00
Cameron Taylor	c3d30f6711	polish / optimize in progress	2023-10-09 18:10:02 -04:00
Cameron Taylor	92f45d93aa	pixel icons	2023-10-09 18:09:59 -04:00
Cameron Taylor	8052773f92	comment	2023-10-09 18:09:25 -04:00
Cameron Taylor	ee7108757b	proper fav and # symbol move	2023-10-09 18:09:24 -04:00
Cameron Taylor	9c641f9e90	tabbing movement	2023-10-09 18:09:24 -04:00
Cameron Taylor	c469d4b7c0	regexp filter	2023-10-09 18:09:24 -04:00
Cameron Taylor	ce2e6a3993	proper letter stuff	2023-10-09 18:09:24 -04:00
Cameron Taylor	e618fbc64f	bouncing thingie	2023-10-09 18:09:23 -04:00
Cameron Taylor	c2f46309ab	arrow and seperator back in	2023-10-09 18:09:20 -04:00
Cameron Taylor	11ffc62238	new letters	2023-10-09 18:08:13 -04:00
Cameron Taylor	f460af1ba0	positioning stuff	2023-10-09 18:05:01 -04:00
Cameron Taylor	dc452bbe9a	different colors / sizes	2023-10-09 18:05:01 -04:00
Cameron Taylor	eb87d40d58	random capsule in progres	2023-10-09 18:04:50 -04:00
Cameron Taylor	65422393cf	letter sort	2023-10-09 18:04:28 -04:00
Cameron Taylor	84f908fbde	tween in fixed	2023-10-09 18:04:28 -04:00
Cameron Taylor	9571eb70e0	scaling of capsules	2023-10-09 18:04:28 -04:00
Cameron Taylor	7ac2e91c8d	selected in middle-ish	2023-10-09 18:04:28 -04:00
EliteMasterEric	5ae2bc814b	Fix issue causing crash on F5	2023-10-09 15:35:50 -04:00
EliteMasterEric	e967b1e7f3	Fix vocals not changing when switching difficulties.	2023-10-09 14:19:52 -04:00
EliteMasterEric	74b925d2c6	Assert the difficulty exists (and throw an error if it doesn't) before performing reset.	2023-10-09 14:13:14 -04:00
EliteMasterEric	4b23eaea59	Merge remote-tracking branch 'origin/rewrite/master' into rewrite/feature/chart-editor-erect-template	2023-10-09 12:15:05 -04:00
Cameron Taylor	5617f8f63e	Merge pull request #165 from FunkinCrew/rewrite/feature/chart-editor-variation-button ... Chart Editor: Add Variation Button	2023-10-09 05:20:11 -04:00
Cameron Taylor	9fe74d719b	Merge pull request #175 from FunkinCrew/rewrite/bugfix/hold-note-scoring ... Fix a bug where hold notes wouldn't grant score	2023-10-09 05:19:17 -04:00
EliteMasterEric	7a1a2e1ab4	Correct FunkinDropDown capitalization	2023-10-08 22:09:09 -04:00
EliteMasterEric	e33c825a1f	Merge branch 'rewrite/master' into rewrite/feature/chart-editor-variation-button	2023-10-06 23:11:11 -04:00
EliteMasterEric	7c653a9e9b	Merge branch 'rewrite/master' into rewrite/feature/chart-editor-wasd	2023-10-06 22:54:12 -04:00
EliteMasterEric	4a4708fe23	That is the fastest I have ever fixed a bug holy shit.	2023-10-06 11:42:39 -04:00
EliteMasterEric	5931345c71	Rewrite precise inputs to work on gamepad	2023-10-05 02:21:01 -04:00
EliteMasterEric	380d30d63f	Rewrote code for preferences to use Save data.	2023-10-04 11:40:55 -04:00
EliteMasterEric	490b2f18d0	Rewrite save data functionality (now with type safety and migration)	2023-10-03 19:14:46 -04:00
EliteMasterEric	b6752531bf	Add chart editor theme	2023-09-29 22:29:32 -04:00
EliteMasterEric	6c99f7161d	Working Input Style, note snapping in menu, W/S to scroll	2023-09-29 21:49:07 -04:00
EliteMasterEric	8580cf1640	Snapped/unsnapped pasting, plus fixes for selection box and event rendering.	2023-09-26 20:36:41 -04:00
EliteMasterEric	2fcb906edf	Fixed volume sliders, Load Instrumental button, and fixed hitsounds.	2023-09-26 17:46:07 -04:00
EliteMasterEric	be4fd74d40	Resolve metadata loading issues.	2023-09-25 23:24:18 -04:00
EliteMasterEric	42bb50882d	"Add Variation" button, SongMetadata format changes, bug fixes, resolve metadata loading issues.	2023-09-25 23:24:07 -04:00
EliteMasterEric	dc728133d1	Merge remote-tracking branch 'origin/master' into feature/chart-editor-performance-revamp	2023-09-20 19:41:17 -04:00
Cameron Taylor	cbbdba031d	Merge pull request #150 from FunkinCrew/bugfix-squash/song-data-parser-rework ... Chart Editor: Song Data Parser Rework	2023-09-19 19:54:28 -04:00
Cameron Taylor	f6bcd8bf05	Merge branch 'master' of https://github.com/ninjamuffin99/funkin-secret into feature/chart-note-snapping-ui	2023-09-19 19:25:42 -04:00
Cameron Taylor	a2e43b8e4e	Merge branch 'master' of https://github.com/ninjamuffin99/funkin-secret into feature/ghost-hold-notes	2023-09-19 19:16:02 -04:00
EliteMasterEric	86c105aff8	Merge remote-tracking branch 'origin/master' into bugfix-squash/song-data-parser-rework	2023-09-18 21:58:22 -04:00
EliteMasterEric	29c22a422f	Fixed a JSON parser issue causing event data to be parsed wrong!	2023-09-18 20:14:43 -04:00
EliteMasterEric	06269e95fd	Fix to crash in freeplay (swapped two args oops!)	2023-09-18 20:02:17 -04:00
EliteMasterEric	b56768d9b5	Fix an issue where the game would try and fail to load metadata for a newly created song in the Chart Editor.	2023-09-18 17:59:55 -04:00
EliteMasterEric	0d84559606	HTML5 should build now	2023-09-18 17:19:31 -04:00
EliteMasterEric	09b03efeea	Merge branch 'master' into bugfix/chart-editor-null-safety	2023-09-18 16:52:47 -04:00
Cameron Taylor	35239909d0	woops fix conditional	2023-09-18 15:48:40 -04:00
Cameron Taylor	446dc30277	Merge branch 'master' into bugfix-squashed/macos-file-browse	2023-09-18 15:40:52 -04:00
EliteMasterEric	8dd07d2763	I discovered a new profiling tool and stayed up until 5 AM optimizing shit.	2023-09-13 14:51:12 -04:00
Cameron Taylor	5d7efcd6b9	Merge pull request #142 from FunkinCrew/bugfix/chart-editor-playbar-buttons ... Fixed a bug where the playbar buttons wouldn't work	2023-09-13 00:09:37 -04:00
Cameron Taylor	fc3d2a17b6	Merge pull request #143 from FunkinCrew/feature/chart-editor-snap ... Chart Editor: Configure Snapping (+ important bug fix!)	2023-09-12 23:56:05 -04:00
EliteMasterEric	b42e4ceb67	Fix cursor modes on toolboxes.	2023-09-12 23:37:07 -04:00
EliteMasterEric	257fa2da6a	Remove old Notifbar code	2023-09-12 23:31:38 -04:00
Cameron Taylor	2b3f99547a	Merge pull request #144 from FunkinCrew/feature/chart-editor-beat-lines ... Darkened beat dividers on chart grid.	2023-09-12 22:41:46 -04:00
Cameron Taylor	ff34771ca3	Merge branch 'master' into feature/chart-editor-file-keybinds	2023-09-12 22:37:37 -04:00
Cameron Taylor	e02dee2601	fixed N -> O typo?	2023-09-12 22:34:49 -04:00
Cameron Taylor	b4042dba8c	Merge pull request #155 from FunkinCrew/bugfix/story-menu-background ... Bugfixes: Story Menu Visuals	2023-09-12 22:29:39 -04:00
EliteMasterEric	a02058b260	Merge branch 'feature/improved-cursor' into develop	2023-09-12 19:52:08 -04:00
EliteMasterEric	7083f6e7ce	Additional cursor and playbar fixes.	2023-09-12 19:43:19 -04:00
EliteMasterEric	fa28932dea	Implementing custom cursor modes for better interface readability.	2023-09-12 19:42:39 -04:00
EliteMasterEric	82a6549075	Merge remote-tracking branch 'origin/master' into feature/chart-editor-file-keybinds	2023-09-12 18:53:06 -04:00
EliteMasterEric	71e1fccce1	Merge remote-tracking branch 'origin/master' into bugfix/chart-editor-playbar-buttons	2023-09-12 18:51:16 -04:00
EliteMasterEric	1acb048930	Merge remote-tracking branch 'origin/bugfix/story-menu-background' into develop	2023-09-12 02:37:02 -04:00
EliteMasterEric	aa1ca65c35	Fix issue where title text wasn't displaying properly.	2023-09-12 01:17:15 -04:00
EliteMasterEric	acdb44703c	Merge remote-tracking branch 'origin/bugfix/story-menu-background'	2023-09-12 01:06:35 -04:00
EliteMasterEric	2f16b9af96	Merge remote-tracking branch 'origin/feature/chart-editor-snap' into develop	2023-09-12 01:02:08 -04:00
EliteMasterEric	a63246ff51	Remove notification on snapping change.	2023-09-12 00:25:05 -04:00
EliteMasterEric	74bd9084b6	Merge remote-tracking branch 'origin/feature/ghost-hold-notes' into develop	2023-09-11 19:42:25 -04:00
EliteMasterEric	abcec3c5f6	Render a ghost hold note when dragging to place (plus fix for hold notes on different note quants)	2023-09-11 19:42:10 -04:00
EliteMasterEric	430c937811	Merge remote-tracking branch 'origin/feature/chart-editor-snap' into develop	2023-09-11 18:29:29 -04:00
EliteMasterEric	d3f5a81b13	Fix a bug where ghost note would be properly snapped but placed note would not.	2023-09-11 18:29:08 -04:00
EliteMasterEric	1524f6a96e	Merge branch 'bugfix-squashed/macos-file-browse' into develop	2023-09-11 17:52:04 -04:00
EliteMasterEric	2dad5953fd	I hope someone got fired for that blunder.	2023-09-11 17:42:46 -04:00
EliteMasterEric	2ea030d5a2	Merge remote-tracking branch 'origin/bugfix-squash/playbar-scrollarea-height' into HEAD	2023-09-08 18:25:40 -04:00
EliteMasterEric	1acce31123	Merge remote-tracking branch 'origin/feature/chart-note-snapping-ui' into HEAD	2023-09-08 18:25:20 -04:00
EliteMasterEric	a3e3341a1a	Merge branch 'bugfix-squash/chart-editor-template-bpm' into HEAD	2023-09-08 18:24:21 -04:00
EliteMasterEric	ef1cb10bb3	Merge remote-tracking branch 'origin/bugfix-squash/song-data-parser-rework' into HEAD	2023-09-08 18:23:55 -04:00
EliteMasterEric	e8952d101a	Merge remote-tracking branch 'origin/bugfix-squashed/macos-file-browse' into HEAD	2023-09-08 18:23:01 -04:00
EliteMasterEric	acadec80de	Merge remote-tracking branch 'origin/feature/chart-editor-file-keybinds' into HEAD	2023-09-08 18:21:25 -04:00
EliteMasterEric	15741843fc	Merge remote-tracking branch 'origin/feature/chart-editor-beat-lines' into HEAD	2023-09-08 18:21:08 -04:00
EliteMasterEric	f46c8821c8	Merge remote-tracking branch 'origin/feature/chart-editor-snap' into HEAD	2023-09-08 18:20:52 -04:00
EliteMasterEric	f8ae4b2a62	Merge remote-tracking branch 'origin/bugfix/chart-editor-playbar-buttons' into HEAD	2023-09-08 18:20:46 -04:00
EliteMasterEric	ee900fd7aa	Merge branch 'bugfix/chart-editor-null-safety' into HEAD	2023-09-08 18:20:25 -04:00
EliteMasterEric	c24fa3c154	Fix issue where playbar scroll area wasn't scaled to the grid.	2023-09-08 18:07:08 -04:00
EliteMasterEric	7a161e4cec	Improved UI for note snapping (and notif on difficulty change)	2023-09-08 18:04:25 -04:00
EliteMasterEric	8431e18d37	Fixed issue where ChartEditorState was not copying SongMetadata properly	2023-09-08 18:00:48 -04:00
EliteMasterEric	f4bc682ea1	Remove funkin.play.song.SongData and refactor app to match.	2023-09-08 17:46:44 -04:00
EliteMasterEric	7e1c11bb25	New song data parser	2023-09-08 17:45:47 -04:00
EliteMasterEric	2c3e513d5b	Fixed bugs with saving charts on Mac ... Added FILE_DROP_SUPPORTED compilation flag and edited UI text to match.	2023-09-08 17:41:20 -04:00
Cameron Taylor	96a0b2fe87	Merge branch 'master' of https://github.com/ninjamuffin99/funkin-secret into feature/chart-editor-snap	2023-09-04 23:30:02 -04:00
Cameron Taylor	222b364e75	Merge branch 'master' of https://github.com/ninjamuffin99/funkin-secret into feature/chart-editor-beat-lines	2023-09-04 23:28:18 -04:00
Cameron Taylor	f87a8ef412	Merge branch 'master' of https://github.com/ninjamuffin99/funkin-secret into bugfix/chart-editor-null-safety	2023-09-04 22:27:16 -04:00
Eric	bb09cc19e7	HTML5: Several fixes to asset loading (#136) ... * Update Polymod to fix async script loading. * Got into the Main Menu but playstate doesn't work * Got into PlayState but GF script breaks! --------- Co-authored-by: Cameron Taylor <cameron.taylor.ninja@gmail.com>	2023-09-04 22:18:45 -04:00
EliteMasterEric	2b092abd8a	Added missing File menu keybinds	2023-09-04 15:33:08 -04:00
EliteMasterEric	3a47eed3b9	Darkened beat dividers on chart grid.	2023-09-01 00:56:10 -04:00
EliteMasterEric	97b640f30b	Note snapping yay!	2023-08-31 23:48:15 -04:00
EliteMasterEric	2f26a97dcb	WIP on chart editor snapping	2023-08-31 21:56:49 -04:00
EliteMasterEric	bc5b34cdd2	Fixed a bug where the playbar buttons wouldn't work while the cursor was over the UI.	2023-08-31 19:14:01 -04:00
EliteMasterEric	c813e23203	Merge remote-tracking branch 'origin/master' into bugfix/chart-editor-null-safety	2023-08-31 18:47:31 -04:00
EliteMasterEric	c78c6439a6	Filled out null safety checks.	2023-08-31 18:47:23 -04:00
Eric	279277b18c	Unit Tests: Coverage Reporting and Github Actions Integration (#131) ... * Initial test suite * Fix some build warnings * Implemented working unit tests with coverage * Reduced some warnings * Fix a mac-specific issue * Add 2 additional unit test classes. * Multiple new unit tests * Some fixins * Remove auto-generated file * WIP on hiding ignored tests * Added list of debug hotkeys * Remove old website * Remove empty file * Add more unit tests * Fix bug where arrows would nudge BF * Fix bug where ctrl/alt would flash capsules * Fixed bug where bf-old easter egg broke * Remove duplicate lines * More test-related stuff * Some code cleanup * Add mocking and a test assets folder * More TESTS! * Update Hmm... * Update artist on Monster * More minor fixes to individual functions * 1.38% unit test coverage! * Even more tests? :O * More unit test work * Rework migration for BaseRegistry * gameover fix * Fix an issue with Lime * Fix issues with version parsing on data files * 100 total unit tests! * Added even MORE unit tests! * Additional test tweaks :3 * Fixed tests on windows by updating libraries. * A bunch of smaller syntax tweaks. * New crash handler catches and logs critical errors! * Chart editor now has null safety enabled. * Null safety on all tests * New Level data test * Generate proper code coverage reports! * Disable null safety on ChartEditorState for unit testing * Update openfl to use latest fixes for crash reporting * Added unit test to Github Workflow * Updated unit tests to compile with null safety enabled by inlining assertions. * Added coverage gutters as a recommended extension * Impreovements to tests involving exceptions * Disable a few incomplete tests. * Add scripts for building unit coverage reports on linux --------- Co-authored-by: Cameron Taylor <cameron.taylor.ninja@gmail.com>	2023-08-30 18:31:59 -04:00
Eric	3828179218	Chart Editor: Several bug fixes (#139) ... * Fix a crash bug caused by unhandled null value. * Fix bug where note preview wouldn't update on song load * Fix note preview not updating when loading inst, fixed BF health icon positioning	2023-08-30 18:29:09 -04:00
EliteMasterEric	e157c23ea7	Apply @:nullSafety to chart editor classes.	2023-08-30 02:24:35 -04:00
Eric	cb81371b4a	Fix an occasional bug where "default" will be used over "" causing a crash on song load. (#135)	2023-08-28 15:07:51 -04:00
Eric	21f44edf1d	New crash handler + Additional null safety for ChartEditorState (#130) ... * A bunch of smaller syntax tweaks. * New crash handler catches and logs critical errors! * Chart editor now has null safety enabled. * Fix -W build issue. * Actually update hmm.json to use the crash handling branch * Fix issues causing crash handler to trigger	2023-08-28 15:03:29 -04:00
Eric	74dac9d830	Fix a story mode bug where charts would sometimes not be loaded for the second and third song. (#134)	2023-08-22 23:18:37 -04:00
Eric	235969e9a7	Fixed an issue where the Week 6 countdown was anti-aliased. (#133)	2023-08-22 22:45:58 -04:00
Eric	42d8d55067	Unit Test Suite (#119) ... * Initial test suite * Fix some build warnings * Implemented working unit tests with coverage * Reduced some warnings * Fix a mac-specific issue * Add 2 additional unit test classes. * Multiple new unit tests * Some fixins * Remove auto-generated file * WIP on hiding ignored tests * Added list of debug hotkeys * Remove old website * Remove empty file * Add more unit tests * Fix bug where arrows would nudge BF * Fix bug where ctrl/alt would flash capsules * Fixed bug where bf-old easter egg broke * Remove duplicate lines * More test-related stuff * Some code cleanup * Add mocking and a test assets folder * More TESTS! * Update Hmm... * Update artist on Monster * More minor fixes to individual functions * 1.38% unit test coverage! * Even more tests? :O * More unit test work * Rework migration for BaseRegistry * gameover fix * Fix an issue with Lime * Fix issues with version parsing on data files * 100 total unit tests! * Added even MORE unit tests! * Additional test tweaks :3 * Fixed tests on windows by updating libraries. * Set versions for flixel-ui and hamcrest --------- Co-authored-by: Cameron Taylor <cameron.taylor.ninja@gmail.com>	2023-08-22 04:27:30 -04:00
Cameron Taylor	ab34bbdcee	Merge pull request #129 from FunkinCrew/feature/chart-editor-note-graph ... Chart Editor: Note Preview Graph	2023-08-16 04:14:12 -04:00
Cameron Taylor	280ecc2003	Merge pull request #128 from FunkinCrew/feature/chart-editor-difficulty-stuff ... Chart Editor: Difficulty tweaks and bug fixes	2023-08-16 04:12:07 -04:00
EliteMasterEric	a548a43759	Note preview graph renders nicely and is fully interactable!	2023-08-16 03:40:44 -04:00
Cameron Taylor	db9f7f503f	Merge branch 'master' into bugfix/attract-screen	2023-08-15 22:10:22 -04:00
EliteMasterEric	8732adc144	Difficulty selection now updates metadata toolbox	2023-08-15 16:08:12 -04:00
EliteMasterEric	d03a2f0157	WIP on improving the difficulty toolbox	2023-08-14 23:13:12 -04:00
EliteMasterEric	c6a1f5ffea	Work on fixing issues with difficulty/variation handling in charts	2023-08-11 14:00:38 -04:00
EliteMasterEric	68c85d9214	Made the currently-unused Divisions field optional.	2023-08-10 15:34:40 -04:00
EliteMasterEric	6096f12307	Fix an issue where new songs on specific stages would crash	2023-08-10 14:21:10 -04:00
EliteMasterEric	2226f1f05e	Fix an issue where tracknames weren't loading properly	2023-08-10 14:04:09 -04:00
EliteMasterEric	214c706cac	Fix a story menu crash	2023-08-10 14:03:57 -04:00
EliteMasterEric	de6972cb90	Fix issue where stage wasn't loaded properly, and metronome would play in song preview.	2023-08-09 18:11:50 -04:00
EliteMasterEric	34abee594d	Fix bug where onUpdate was called twice per frame	2023-08-09 18:11:19 -04:00
EliteMasterEric	859b543118	Merge branch 'bugfix/play-state-fix' into feature/chart-editor-song-preview	2023-08-09 17:53:25 -04:00
EliteMasterEric	3e02f7fca9	Fix a bug where beatState sometimes gets called before create	2023-08-09 00:28:09 -04:00
EliteMasterEric	92e94a84b6	Fix a bug where returning to title displays a black screen.	2023-08-08 16:41:23 -04:00
EliteMasterEric	ea31d72cbe	AttractState now properly plays the trailer	2023-08-08 16:37:17 -04:00
EliteMasterEric	b7f5f33f3e	Delete ancient VideoState.	2023-08-08 15:42:15 -04:00
EliteMasterEric	ec76c54ccd	Implement basic AttractState.	2023-08-08 15:41:48 -04:00
EliteMasterEric	3f99e0e3da	Move TitleState into its own package.	2023-08-08 15:41:25 -04:00
EliteMasterEric	b9c25d6ed9	Fix crashing, broken countdown, broken miss muting in song preview	2023-08-04 17:25:13 -04:00
EliteMasterEric	a0a8d47216	Imported music now plays properly in chart editor state	2023-08-04 16:15:07 -04:00
EliteMasterEric	3e093510af	Fixed a bug where beat hit events were called multiple times during the conductor	2023-08-04 12:35:01 -04:00
EliteMasterEric	4852515c42	Fix bug where pressing ENTER in UI would cause song to try to preview. Fix bug where trying to preview a newly created song would crash.	2023-08-04 11:18:00 -04:00
EliteMasterEric	13671cf290	Make sure timestamps are consistent with use of Int64.	2023-08-04 11:13:41 -04:00
EliteMasterEric	49622f2441	Fix build issues caused by int64 handling	2023-08-03 22:22:29 -04:00
EliteMasterEric	5590331e10	Fix HTML typing issue	2023-08-03 12:41:54 -04:00
EliteMasterEric	29466af4b7	Fix issue where strumline would stay pressed when resetting.	2023-08-03 12:19:36 -04:00
EliteMasterEric	050086fb36	Fixed camera focus on game over.	2023-08-03 11:40:19 -04:00
Cameron Taylor	5bbf279208	gameover fix	2023-08-03 11:22:52 -04:00
EliteMasterEric	3a31c9731c	Fixed several bugs with Play State (mostly restarting the song)	2023-08-02 18:08:49 -04:00
EliteMasterEric	b54c335886	Fix for Menu->Freeplay and Play->Pause transitions	2023-08-02 11:00:23 -04:00
EliteMasterEric	0136202c36	Janky fix	2023-08-02 10:15:54 -04:00
EliteMasterEric	005ffafe23	Merge remote-tracking branch 'origin/master' into feature/chart-editor-song-preview	2023-08-01 16:03:34 -04:00
EliteMasterEric	639a36a9c7	Fix some weird issues with constants	2023-08-01 15:29:17 -04:00
EliteMasterEric	9b66bc186a	alphabetical -> alphabetically	2023-08-01 15:25:46 -04:00
EliteMasterEric	979a5ad493	Merge branch 'master' into feature/chart-editor-bpm	2023-08-01 14:08:41 -04:00
Cameron Taylor	d750af4396	directory fix and hmm lock	2023-07-31 15:40:47 -04:00
EliteMasterEric	624d4f5111	Fix asset redirection	2023-07-31 15:04:18 -04:00
EliteMasterEric	c0745d4ad7	Hide warning	2023-07-31 14:08:48 -04:00
EliteMasterEric	4e67791249	Vwoosh notes on reset	2023-07-31 13:42:13 -04:00
EliteMasterEric	92a0c367b7	Typo fixes	2023-07-31 13:31:17 -04:00
EliteMasterEric	d0ef34ced6	Merge branch 'master' into feature/new-input-system-yay	2023-07-26 22:00:14 -04:00
EliteMasterEric	b974e6d6d7	Fix issues with playtest and backwards time travel	2023-07-26 21:34:38 -04:00
EliteMasterEric	03444161e8	Merge branch 'feature/new-input-system-yay' into feature/chart-editor-song-preview	2023-07-26 20:03:37 -04:00
EliteMasterEric	2048e65bf2	Added ability to start song at a specific timestamp	2023-07-26 20:03:31 -04:00
EliteMasterEric	5ff546bacc	First iteration of song playtesting from editor!	2023-07-26 16:52:58 -04:00
EliteMasterEric	a6daf3b0d6	Resolved lag issues caused by creating too many notes in the pool.	2023-07-25 23:11:12 -04:00
EliteMasterEric	6af5259a10	Fix an issue where sustain sprites were not killed when the song was reset.	2023-07-25 21:39:19 -04:00
Cameron Taylor	211ccc2e47	Merge pull request #107 from FunkinCrew/feature/offset-editor-tweaks ... Tweaks and improvements to the animation editor	2023-07-24 16:26:04 -04:00
Cameron Taylor	e21511bc13	Merge pull request #108 from FunkinCrew/feature/chart-editor-importer ... Chart editor legacy importer	2023-07-22 22:48:43 -04:00
Cameron Taylor	cd2f0d840d	Merge pull request #115 from FunkinCrew/feature/asset-redirect-2 ... Asset redirecting	2023-07-22 22:48:09 -04:00
EliteMasterEric	3c218ec01c	Done with BPM change fixes, currently working on rendering efficiency	2023-07-22 20:16:43 -04:00
Cameron Taylor	f634a099c3	actual songdata git merge proper lol	2023-07-22 14:43:28 -04:00
Cameron Taylor	85af96d654	Merge branch 'master' into feature/chart-editor-importer	2023-07-22 14:43:05 -04:00
EliteMasterEric	aaad06c97d	Merge branch 'feature/new-input-system-yay' into feature/chart-editor-bpm	2023-07-19 21:19:21 -04:00
EliteMasterEric	16e3bfe85e	Fix for BPM changes, plus working on hold note rendering	2023-07-19 21:16:39 -04:00
EliteMasterEric	c56517f94f	Sort the template view	2023-07-19 01:30:43 -04:00
EliteMasterEric	140afd3c31	Redo note positioning	2023-07-19 01:30:36 -04:00
EliteMasterEric	ae76b24a65	New time calculation functions	2023-07-19 01:30:23 -04:00
EliteMasterEric	adda3020a9	Alphabetical sort	2023-07-19 01:29:43 -04:00
EliteMasterEric	ce0be2374d	Event notes have different sprites for each type.	2023-07-19 01:29:13 -04:00
EliteMasterEric	d251d71daa	Asset redirect	2023-07-17 21:54:58 -04:00
EliteMasterEric	16bcf2c767	Rework note sprites to pull note style data	2023-07-13 20:27:45 -04:00
EliteMasterEric	ba53957191	Fixed an issue where dialogue scripts were not being reloaded	2023-07-13 20:26:56 -04:00
EliteMasterEric	00cfeeff72	Created the Note Style class and data registry	2023-07-13 20:25:44 -04:00
EliteMasterEric	883ab87931	Moved AnimationData into the data package	2023-07-13 20:25:01 -04:00
EliteMasterEric	70584c6e88	Make funkin.util.Constants auto-imported	2023-07-13 01:13:26 -04:00
EliteMasterEric	736eecfd9a	Fixed some random crash bug?	2023-07-13 00:37:54 -04:00
EliteMasterEric	b0b8b4fba0	Shut up StickerState	2023-07-10 23:23:18 -04:00
EliteMasterEric	24c9786166	Merge branch 'master' into feature/new-input-system-yay	2023-07-10 18:16:16 -04:00
EliteMasterEric	17a8610640	Added colors to hold note covers	2023-07-10 18:14:34 -04:00
EliteMasterEric	796a51325f	Hold note covers are in and properly positioned	2023-07-08 01:03:46 -04:00
EliteMasterEric	54a9b09155	Merge branch 'master' into bugfix/conductor-monster	2023-07-06 12:35:49 -04:00
EliteMasterEric	a3929db7a8	Merge branch 'master' into feature/offset-editor-tweaks	2023-07-06 01:00:32 -04:00
EliteMasterEric	8e071221ff	Work in progress on hold covers	2023-07-05 22:11:58 -04:00
EliteMasterEric	b615fbf82a	WIP on hold covers	2023-07-04 16:38:10 -04:00
EliteMasterEric	f932422d74	Merge branch 'master' into feature/week-6-dialogue	2023-07-03 13:18:53 -04:00
EliteMasterEric	3bf7955ffa	Conductor fix	2023-07-03 13:16:02 -04:00
EliteMasterEric	b764656a4e	Merge branch 'master' into feature/chart-editor-importer	2023-07-03 13:09:40 -04:00
EliteMasterEric	39cd304ef2	Expanded shortcut list, fixed build errors	2023-07-03 12:51:27 -04:00
EliteMasterEric	90bd5af376	Merge branch 'master' into feature/offset-editor-tweaks	2023-07-03 12:22:33 -04:00
EliteMasterEric	36898a8c04	Few more conductor tweaks	2023-07-02 16:46:49 -04:00
EliteMasterEric	bb8b0b59b1	Video cutscenes in Week 7 no longer broken	2023-07-02 16:46:40 -04:00
EliteMasterEric	49ce962e34	Make metadata file loading actually work	2023-07-02 16:17:25 -04:00
EliteMasterEric	cddc50bbe5	Rework quickWatch	2023-07-02 16:17:04 -04:00
EliteMasterEric	1ef17770e9	crochet->lengthMs	2023-07-02 16:16:49 -04:00
EliteMasterEric	8685054696	Freaky Menu uses metadata.json for BPM data.	2023-07-02 15:34:34 -04:00
EliteMasterEric	66f56dbf2c	system->sound	2023-07-02 15:34:07 -04:00
EliteMasterEric	956277ff4e	Updates and fixes to Conductor for use with changing BPMs.	2023-07-02 15:33:34 -04:00
EliteMasterEric	93f653969a	Added new set of constants	2023-07-02 15:33:12 -04:00
EliteMasterEric	100565f9fc	Messing with transitions.	2023-06-27 21:29:58 -04:00
EliteMasterEric	085d7aaa9d	Fix for note splashes	2023-06-27 21:29:50 -04:00
EliteMasterEric	d91c341bd2	Fixed a bug where you could hold notes forever	2023-06-27 18:06:33 -04:00
EliteMasterEric	2f7708c106	Hold notes pretty much done! yay!	2023-06-27 17:22:51 -04:00
Cameron Taylor	740c547293	Merge branch 'master' of https://github.com/ninjamuffin99/Funkin-secret into feature/week-7-cutscenes	2023-06-27 17:07:35 -04:00
EliteMasterEric	983466c0fe	Visual fixes for story menu	2023-06-27 15:21:09 -04:00