4908 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
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
Eric	9fddb727b8	Merge pull request #2724 from KarimAkra-Stuff/FlxPartialSound-openfl/polymod-support ... [BUGFIX] Fixed Polymod and Mods Support in FlxPartialSound	2024-09-16 18:19:20 -04:00
lemz	224d930ae6	Update PreferencesMenu.hx	2024-09-17 00:17:56 +02:00
Eric	3b9d400f57	Merge pull request #3328 from FunkinCrew/docs/troubleshooting-update ... [DOCS] Update to troubleshooting guide	2024-09-16 18:17:25 -04:00
EliteMasterEric	f8d0ddef34	Update troubleshooting guide	2024-09-16 18:17:07 -04:00
lemz	18edadb712	Merge branch 'fps-setting' of https://github.com/lemz1/Funkin into fps-setting	2024-09-17 00:16:33 +02:00
lemz	80fc0cd526	Update Preferences.hx	2024-09-17 00:16:27 +02:00
lemz	e7674ec31c	Merge branch 'develop' into fps-setting	2024-09-17 00:13:49 +02:00
Abnormal	0b531c5b21	add getPath	2024-09-16 22:13:16 +00:00
Eric	8efcd1eae1	Merge pull request #2584 from FunkinCrew/docs/compiling-guide ... [DOCS] Update compiling guide with more troubleshooting	2024-09-16 18:12:55 -04:00
Eric	06485518db	Merge branch 'develop' into docs/compiling-guide	2024-09-16 18:12:49 -04:00
Eric	57523c9439	Merge pull request #3035 from 7oltan/character-path-fix ... FIXES CHARACTER PATH ONLY CHECKING IN SHARED	2024-09-16 18:10:25 -04:00
Eric	42544ee757	Merge branch 'develop' into character-path-fix	2024-09-16 18:10:09 -04:00
Til Tjardes	4be4570c94	Merge branch 'main' of https://github.com/FunkinCrew/Funkin into playsound-typo	2024-09-16 16:08:58 -06:00
lemz	d0ec26c44a	Merge branch 'develop' into completion-fix	2024-09-17 00:08:19 +02:00
lemz	8252b2a6b3	Merge branch 'develop' into substate-dispatch-event-fix	2024-09-17 00:07:25 +02:00
Eric	a5ac717677	Merge branch 'develop' into bugfix/freeplay-difficulty-stack-overflow	2024-09-16 18:03:47 -04:00
Eric	ea2e6506c8	Merge pull request #2494 from cyn0x8/flash_fix ... consistent flashing	2024-09-16 18:03:18 -04:00
Eric	1e8d3c715b	Merge branch 'develop' into flash_fix	2024-09-16 18:03:05 -04:00
Cameron Taylor	4bc2510d3c	Merge remote-tracking branch 'origin/bugfix/pixel-shit-aliasing' into rewrite/master	2024-09-16 17:40:44 -04:00
Cameron Taylor	0574f8b07b	Merge remote-tracking branch 'origin/dadbattle-pico-chart-fix' into rewrite/master	2024-09-16 17:31:05 -04:00
Cameron Taylor	11224c5999	Merge remote-tracking branch 'origin/bugfix/song-credits-fixes' into rewrite/master	2024-09-16 17:24:56 -04:00
Cameron Taylor	367e3e9008	priv modules	2024-09-16 17:18:42 -04:00
Cameron Taylor	a27c4ae24f	pub modules art	2024-09-16 17:14:45 -04:00
Cameron Taylor	1f21e1114b	pub modules	2024-09-16 17:12:11 -04:00
EliteMasterEric	16aff6e7c3	Fix bugs with highscore display in Freeplay	2024-09-14 21:37:02 -04:00
EliteMasterEric	9f3af1ab94	Add a separate Gold Perfect animation for modders	2024-09-14 20:56:21 -04:00
EliteMasterEric	e23a85682a	Update some script files.	2024-09-14 20:26:39 -04:00
EliteMasterEric	fd6ca6e267	Remove some spammy log traces.	2024-09-14 20:26:33 -04:00
EliteMasterEric	d5c7e4ffdb	Fix bug where Pico would become locked on every game restart.	2024-09-14 20:26:19 -04:00
EliteMasterEric	688abb5571	Update example mod's API version so it actually loads.	2024-09-14 20:25:45 -04:00
Til Tjardes	0a8719088d	techniktil coming back with another typo lets go	2024-09-14 15:06:03 -06:00
EliteMasterEric	df87d677e1	Typo lol	2024-09-14 17:00:41 -04:00
EliteMasterEric	517984d120	Fix a bug where Shit judgement would always display with anti-aliasing.	2024-09-13 18:46:49 -04:00
FabsTheFabs	3fba55a422	assets submod	2024-09-13 21:36:20 +01:00