4791 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
anysad	0e7fad090b	custom popups and countdowns yay!!!	2024-07-28 02:31:01 -04:00
EliteMasterEric	f3624f7e76	Fixes for scripted song events, define vocal tracks per variation, display suffixed difficulties properly.	2024-07-28 01:42:09 -04:00
EliteMasterEric	3db0cf3e0a	Update Polymod to support applying JSON patches in the _merge folder of mods.	2024-07-26 00:22:36 -04:00
Eric	f07777116d	Merge pull request #676 from FunkinCrew/haxelib/hxcpp ... update hxcpp haxelib	2024-07-25 07:46:54 -04:00
Eric	1f1d467156	Merge branch 'rewrite/master' into haxelib/hxcpp	2024-07-25 07:46:45 -04:00
Cameron Taylor	4dfb469552	update hxcpp haxelib	2024-07-25 06:39:12 -04:00
Cameron Taylor	a15695c3dc	compile dev version of hxcpp	2024-07-25 06:39:12 -04:00
Eric	35c8b2c818	Merge pull request #634 from FunkinCrew/haxelib/flixels ... flixel haxelib updates	2024-07-25 06:38:28 -04:00
Eric	a2838fffd0	Merge branch 'rewrite/master' into haxelib/flixels	2024-07-25 06:38:18 -04:00
Cameron Taylor	aaab24850d	flixel haxelib updates	2024-07-25 06:34:35 -04:00
Burgerballs	1831daac38	Update PlayState.hx	2024-07-25 03:34:59 -04:00
Burgerballs	6e301bf648	Update PlayState.hx	2024-07-25 03:34:58 -04:00
Burgerballs	964f6878c3	Update PlayState.hx	2024-07-23 19:02:09 +01:00
Burgerballs	8778ab1d0e	Update PlayState.hx	2024-07-23 18:09:39 +01:00
Burgerballs	59ad15aee4	Merge branch 'develop' of https://github.com/FunkinCrew/Funkin into develop	2024-07-23 18:05:54 +01:00
AppleHair	c8caeb42de	A fix requested by Eric	2024-07-23 11:34:26 +03:00
Cameron Taylor	c60299e51a	Merge pull request #671 from FunkinCrew/lemz1/note-kind-scripts ... [PUBLIC PR] Note Kind Scripts	2024-07-22 22:21:14 -04:00
Cameron Taylor	4164329ca9	Merge branch 'rewrite/master' into lemz1/note-kind-scripts	2024-07-22 22:20:58 -04:00
Cameron Taylor	9b8961d4b5	assets submod	2024-07-22 22:20:51 -04:00
EliteMasterEric	04c88baff0	CI fix?	2024-07-22 20:53:34 -04:00
EliteMasterEric	a071e90746	Added alt vocal offsets feature, disabled alt instrumentals on Pico mix (for now?)	2024-07-22 20:52:03 -04:00
EliteMasterEric	1515719a0f	Implemented instrumental select (you need to beat the song as Pico first)!	2024-07-22 18:38:22 -04:00
EliteMasterEric	0110936a3e	Update assets submodule	2024-07-20 02:19:34 -04:00
Cameron Taylor	bfa0bafc6f	Merge pull request #675 from FunkinCrew/bugfix/hud-hiding ... Several tiny bug fixes	2024-07-19 19:10:28 -04:00
EliteMasterEric	7547875535	Allow hiding HUD on launcher builds.	2024-07-18 23:27:41 -04:00
EliteMasterEric	729745899e	Blacklist haxe.Unserializer in scripts.	2024-07-18 23:27:24 -04:00
EliteMasterEric	558ec53532	Switch songs with no difficulties from an error to a warning.	2024-07-18 23:27:12 -04:00
Cameron Taylor	3f242eb96c	Merge pull request #666 from FunkinCrew/anysad/tutorial-hey-events ... [PUBLIC PR] Un-hardcode animation events from Tutorial.	2024-07-18 15:12:15 -04:00
Cameron Taylor	f90c2bda99	Merge branch 'rewrite/master' into anysad/tutorial-hey-events	2024-07-18 15:08:10 -04:00
Cameron Taylor	b0a842c2c7	Merge pull request #664 from FunkinCrew/gamerbross/chart-reload-f5 ... [PUBLIC PR] Pressing F5 in play state now reloads the chart data from your assets folder	2024-07-18 15:07:52 -04:00
Cameron Taylor	8d9071d4fd	Merge pull request #669 from FunkinCrew/gamerbross/pause-sticker-zoom ... [PUBLIC PR] Fix a bug where pausing during a camera zoom would break the HUD funk-612	2024-07-18 15:00:09 -04:00
Cameron Taylor	e26a99d128	Merge pull request #668 from FunkinCrew/gamerbross/chart-editor-live-inputs ... [PUBLIC PR] Cleanup chart editor live inputs	2024-07-18 14:56:41 -04:00
anysad	ba96b11196	hopefully final polish?	2024-07-18 17:56:54 +03:00
FabsTheFabs	563905ebd4	assets submod	2024-07-18 06:04:32 +01:00
FabsTheFabs	a0ab216617	merged rain shader stuff from 'feature/week2-erect-bg-rain'	2024-07-18 06:04:19 +01:00
FabsTheFabs	4bcfbc957f	assets submod	2024-07-18 05:24:15 +01:00
FabsTheFabs	ad93706b1d	adjust color shader	2024-07-18 05:23:37 +01:00
FabsTheFabs	73fc855f8e	new stage names	2024-07-18 05:23:31 +01:00
anysad	ff1ab1eb42	welcome fallback note styles!	2024-07-17 23:19:18 +03:00
AppleHair	4d81aa0fe6	[BUGFIX] Ensure the variation used for the next song is valid. ... When playing in story mode, `PlayState` assumes all the songs use the same variation, which is usually true, but not guaranteed. This PR makes `PlayState` use the `getFirstValidVariation` method to find the valid variation instead of using the `currentVariation` variable, which might not be valid.	2024-07-17 18:00:07 +03:00
AppleHair	691da783fc	Updated to extend #2712	2024-07-17 10:20:48 +03:00
AppleHair	a93cd05aeb	Added a comment	2024-07-16 22:36:11 +03:00
anysad	ee44981995	you know what, make countdown sprites a little bigger	2024-07-16 22:02:05 +03:00
AppleHair	5e1d25e791	[BUGFIX] Prevented infinite recursion on freeplay when a song doesn't have the normal difficulty ... Any attempt to create a song without the `normal` difficulty will result in a silent crash when opening freeplay. After some debugging, I discovered that the issue is caused by infinite recursion, which gets triggered at the start of `FreeplaySongData`'s `updateValues`.	2024-07-16 21:17:53 +03:00
anysad	f8a0627fd2	goodbye scripts, hello notestyles!	2024-07-16 20:53:12 +03:00
7oltan	f8232911cb	FIX CHARACTER PATHS ISSUE	2024-07-16 12:52:51 +03:00
Cameron Taylor	35ba5663a1	uncapped framerate on web	2024-07-15 23:10:08 -04:00
Cameron Taylor	fbe224731a	Merge branch 'rewrite/master' into lemz1/note-kind-scripts	2024-07-15 12:54:06 -04:00
Cameron Taylor	d7794374d9	Merge branch 'rewrite/master' into gamerbross/chart-editor-live-inputs	2024-07-15 12:53:59 -04:00
Cameron Taylor	b6a8b62950	Merge branch 'rewrite/master' into gamerbross/pause-sticker-zoom	2024-07-15 12:53:50 -04:00