4537 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
EliteMasterEric	5efbff044b	Resolve merge issues	2024-09-18 06:32:06 -04:00
dombomb64	6e33cac9ec	...Okay it wasn't that simple	2024-09-17 16:47:16 -04:00
dombomb64	0706192cbe	Fix note scaling with one simple trick!	2024-09-17 13:50:59 -04:00
Eric	1fc835494d	Merge pull request #3020 from anysad/custom-popups-countdowns ... [ENHANCEMENT] Custom Popups and Countdowns	2024-09-16 20:56:26 -04:00
EliteMasterEric	2e9223ec72	Merge remote-tracking branch 'origin/develop' into anysad/custom-popups-countdowns	2024-09-16 20:50:13 -04:00
Eric	35b5957715	Merge pull request #3007 from anysad/tutorial-hey-events ... [CLEANUP] Softcode Tutorial HEY! events from code to JSON	2024-09-16 19:33:04 -04:00
EliteMasterEric	e915b637c5	Merge remote-tracking branch 'origin/develop' into anysad/tutorial-hey-events	2024-09-16 19:09:58 -04:00
Eric	ebfce9f990	Merge pull request #2820 from gamerbross/bugfix/animation-editor ... [ENHANCEMENT/BUGFIX] Few animation editor bugfixes and improvements	2024-09-16 18:48:50 -04:00
Eric	359e4b41e5	Merge branch 'develop' into bugfix/animation-editor	2024-09-16 18:48:33 -04:00
Eric	b0c9365c56	Merge pull request #2942 from FlooferLand/new-settings-items ... New settings widgets (Number, Checkbox, Enum)	2024-09-16 18:42:48 -04:00
Eric	65fddd95bb	Merge branch 'develop' into new-settings-items	2024-09-16 18:42:43 -04:00
Eric	f1d3ace247	Merge pull request #2925 from gamerbross/bugfix/character-danceevery ... [BUGFIX] Implement `danceEvery` for Characters	2024-09-16 18:42:40 -04:00
Eric	9e90e67673	Merge branch 'develop' into bugfix/character-danceevery	2024-09-16 18:42:32 -04:00
Eric	3ce7cd6990	Merge pull request #2903 from AbnormalPoof/develop ... [ENHANCEMENT] Enable auto-pause for Video Cutscenes	2024-09-16 18:42:20 -04:00
Eric	d4cd2d031c	Merge branch 'develop' into develop	2024-09-16 18:41:33 -04:00
Eric	081d2d8fd8	Merge pull request #2992 from gamerbross/bugfix/charteditor-liveinput-number-6 ... [BUGFIX + REFACTOR] ChartEditor Live Input	2024-09-16 18:40:24 -04:00
Eric	99f4d13e47	Merge branch 'develop' into bugfix/charteditor-liveinput-number-6	2024-09-16 18:40:12 -04:00
Eric	8cad10263e	Merge branch 'develop' into bugfix/animation-editor	2024-09-16 18:37:35 -04:00
Eric	8470880e4a	Merge pull request #2926 from gamerbross/tweak/funkinsound-playonce-return-value ... [CODE TWEAK] `FunkinSound.playOnce` return the created sound	2024-09-16 18:36:53 -04:00
Eric	6bde7c34a0	Merge branch 'develop' into tweak/funkinsound-playonce-return-value	2024-09-16 18:36:45 -04:00
Eric	3ac10fb45c	Merge pull request #2981 from gamerbross/bugfix/forced-sustaintrail-alpha ... [BUGFIX] SustainTrail forced alpha	2024-09-16 18:35:31 -04:00
Eric	fb0b277a9c	Merge branch 'develop' into bugfix/forced-sustaintrail-alpha	2024-09-16 18:35:17 -04:00
Eric	519a6f3412	Merge pull request #2873 from JVNpixels/JVNPixels-story-menu-scrolling-fixed ... [ENHANCEMENT]: Story Mode Menu Mouse Scrolling	2024-09-16 18:34:58 -04:00
Eric	27f700dd98	Merge branch 'develop' into JVNPixels-story-menu-scrolling-fixed	2024-09-16 18:34:43 -04:00
Eric	f015976521	Merge pull request #2712 from gamerbross/bugfix/freeplay-difficulty-stack-overflow ... [BUGFIX] Song with no "Normal" causes Stack Overflow	2024-09-16 18:34:06 -04:00
Eric	265039b025	Merge branch 'develop' into bugfix/freeplay-difficulty-stack-overflow	2024-09-16 18:33:57 -04:00
Eric	8c6cb72d47	Merge pull request #2986 from AppleHair/bugfix/cancel-menu-sound ... [BUGFIX] Fixed `cancelMenu` sound not playing after switching state	2024-09-16 18:30:02 -04:00
Eric	b3221c0e3f	Merge branch 'develop' into bugfix/cancel-menu-sound	2024-09-16 18:29:51 -04:00
Eric	c7cb03dd1d	Merge pull request #2990 from gamerbross/bugfix/f5-reload-chart ... [BUGFIX] F5 now reloads the chart in the PlayState	2024-09-16 18:29:39 -04:00
Eric	a7c0512503	Merge branch 'develop' into bugfix/f5-reload-chart	2024-09-16 18:29:33 -04:00
Eric	74a94d0080	Merge branch 'develop' into bugfix/charteditor-liveinput-number-6	2024-09-16 18:28:22 -04:00
Eric	d214ae1747	Merge pull request #3058 from Burgerballs/fix-sync ... Use chart inst offset for song resync + other resync fixes	2024-09-16 18:27:35 -04:00
Eric	6ee1bddacb	Merge branch 'develop' into fix-sync	2024-09-16 18:27:27 -04:00
Eric	8b96d1bbac	Merge pull request #2863 from gamerbross/bugfix/stickers-f5-crash ... [BUGFIX] Crash after coming back from stickers and pressing F5	2024-09-16 18:26:42 -04:00
Eric	d4e11f786c	Merge branch 'develop' into bugfix/stickers-f5-crash	2024-09-16 18:26:31 -04:00
Eric	724c415016	Merge pull request #2739 from gamerbross/bugfix/chart-key ... [BUGFIX] When pressing chart key while charting, chart gets reset	2024-09-16 18:25:42 -04:00
Eric	055ae5b932	Merge branch 'develop' into bugfix/chart-key	2024-09-16 18:25:35 -04:00
Eric	85e9dbb959	Merge pull request #2713 from KarimAkra-Stuff/memory-counter-fix ... [BUGFIX] Fixed memory counter displaying negative numbers	2024-09-16 18:25:15 -04:00
Eric	c5060b6eec	Merge pull request #2749 from NotHyper-474/path-trace-fix ... Fix small oversight in LoadingState	2024-09-16 18:24:42 -04:00
Eric	df77d11896	Merge branch 'develop' into path-trace-fix	2024-09-16 18:24:34 -04:00
Eric	aa2d934f22	Merge pull request #3036 from AppleHair/bugfix/freeplay-infinite-recursion ... [BUGFIX] Prevented infinite recursion on freeplay when a song doesn't have the `normal` difficulty	2024-09-16 18:24:22 -04:00
Eric	3f6ad6f8ad	Merge branch 'develop' into bugfix/freeplay-infinite-recursion	2024-09-16 18:24:15 -04:00
Eric	45efd78931	Merge pull request #3037 from AppleHair/bugfix/valid-vari-story-mode ... [BUGFIX] Ensure the variation used for the next song is valid.	2024-09-16 18:23:50 -04:00
Eric	b95e228322	Merge branch 'develop' into bugfix/valid-vari-story-mode	2024-09-16 18:23:39 -04:00
Eric	c9e2e7bef5	Merge pull request #3005 from gamerbross/bugfix/default-face-icon ... [BUGFIX] Default health icon (face) not used	2024-09-16 18:23:23 -04:00
Eric	bab4ac4902	Merge branch 'develop' into bugfix/default-face-icon	2024-09-16 18:21:20 -04:00
Eric	b8d1341a21	Merge pull request #2850 from MaybeMaru/constants ... Use constants pixels per ms	2024-09-16 18:20:46 -04:00
Eric	55e0970e4c	Merge branch 'develop' into constants	2024-09-16 18:20:35 -04:00
Eric	82c2d54079	Merge pull request #2567 from gamerbross/bugfix/pause-sticker-zoom ... [BUGFIX] Pause Menu and Stickers have same zoom as HUD	2024-09-16 18:20:20 -04:00
Eric	c4b475e86a	Merge branch 'develop' into bugfix/pause-sticker-zoom	2024-09-16 18:20:11 -04:00