4201 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Eric	6e1ff4a6b1	Merge branch 'rewrite/master' into 70ltan/char-path-fix	2024-08-12 14:37:16 -04:00
Eric	f5826e3a35	Merge branch 'rewrite/master' into applehair/storymode-valid-variation	2024-08-12 14:37:15 -04:00
Cameron Taylor	ce559106f6	Merge pull request #691 from FunkinCrew/runners-fixins ... Windows + Mac quick runners fix	2024-08-10 15:30:35 -04:00
Cameron Taylor	a0047a482f	use --always when installing funkin-patches versions of haxelib and hmm	2024-08-09 23:31:40 -04:00
Cameron Taylor	b47c695cb7	perhaps use funkin versions of haxelib and hmm?	2024-08-09 23:09:23 -04:00
Cameron Taylor	78d9d2ad21	Merge branch 'ninjamuffin99/funk-605' into rewrite/master	2024-08-09 23:03:23 -04:00
Cameron Taylor	9ff3e0435a	assets submod	2024-08-09 23:02:46 -04:00
Cameron Taylor	21fe5f12be	Merge branch 'ninjamuffin99/funk-644' into rewrite/master	2024-08-09 23:02:02 -04:00
Cameron Taylor	e105f933ac	Merge branch 'rewrite/master' into anysad/custom-countdowns	2024-08-09 23:00:03 -04:00
Cameron Taylor	09fe8c1196	Merge pull request #687 from FunkinCrew/feature/erect-stages ... Erect stages for weeks 2,3,4 + unfinished pico shit	2024-08-09 22:27:05 -04:00
Cameron Taylor	cce6434570	Merge branch 'rewrite/master' into feature/erect-stages	2024-08-07 19:43:37 -04:00
Cameron Taylor	c3d497a9d9	hxcpp bump	2024-08-07 19:01:46 -04:00
Cameron Taylor	ae648418c2	assets submod senpai fix	2024-08-06 14:03:25 -04:00
Cameron Taylor	62d0b33689	Fix for switching to old icon on isPixel levels	2024-08-06 13:44:02 -04:00
Cameron Taylor	960c151985	Merge pull request #682 from FunkinCrew/haxelib-updates ... Update OpenFL to latest	2024-08-05 10:48:12 -04:00
Cameron Taylor	f4968b0ae5	openfl hmm commit to dev-funkin	2024-08-05 10:47:59 -04:00
FabsTheFabs	8200a08152	assets submod	2024-07-31 14:36:34 +01:00
FabsTheFabs	270748d108	fuck these decimals messing up my compiling	2024-07-31 14:36:24 +01:00
FabsTheFabs	3b7e656793	add stage names to registry + chart editor	2024-07-31 14:36:06 +01:00
Cameron Taylor	3c814dacf0	Merge pull request #672 from FunkinCrew/bugfix/character-offset-fixes ... [PUBLIC PR] Fix some bugs with how character positions are handled.	2024-07-29 21:27:04 -04:00
Cameron Taylor	c9c81fae51	assets submod?	2024-07-29 21:26:02 -04:00
Cameron Taylor	f4a2ac4dde	Merge branch 'rewrite/master' into bugfix/character-offset-fixes	2024-07-29 21:25:33 -04:00
AppleHair	cb02ea7da5	Updated to extend #2712	2024-07-29 19:03:54 -04:00
AppleHair	c8322c479c	Added a comment	2024-07-29 19:03:52 -04:00
AppleHair	4f46a8e4d0	[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-29 19:03:37 -04:00
7oltan	e2297af1cd	FIX CHARACTER PATHS ISSUE	2024-07-29 18:54:26 -04:00
AppleHair	eb78b754f8	A fix requested by Eric	2024-07-29 18:34:59 -04:00
AppleHair	bef2e98222	[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-29 18:34:59 -04:00
EliteMasterEric	68b7610225	Update OpenFL to latest (requires a few fixes)	2024-07-29 17:26:49 -04:00
Eric	9de51fd7d1	Merge pull request #674 from FunkinCrew/arm64-mac ... lime updates for arm64 mac	2024-07-29 16:53:09 -04:00
EliteMasterEric	e4e4c66c6c	Update Lime version	2024-07-29 16:24:29 -04:00
Cameron Taylor	5e04628480	lime shallow cairo	2024-07-29 16:24:29 -04:00
Cameron Taylor	195010c7ed	hxcpp and lime hmm updates for arm64 mac	2024-07-29 16:24:24 -04:00
Cameron Taylor	f1af005cf3	Merge branch 'rewrite/master' into burgerballs/song-resync-tweaks	2024-07-29 14:04:41 -04:00
Cameron Taylor	ee584d780c	Merge branch 'rewrite/master' into flooferland/new-settings-types	2024-07-29 13:44:01 -04:00
EliteMasterEric	41bd0246ac	Custom coutndown, judgements, and combo count now use the note style file instead of hardcoded paths.	2024-07-28 17:10:32 -04:00
anysad	d07564cdc2	hopefully final polish?	2024-07-28 02:44:16 -04:00
anysad	82a6ca5916	welcome fallback note styles!	2024-07-28 02:43:02 -04:00
anysad	d3209e57b7	goodbye scripts, hello notestyles!	2024-07-28 02:34:12 -04:00
anysad	d5a53855d3	how the hell did I miss these?	2024-07-28 02:31:25 -04:00
anysad	dc9dbe84fa	cache textures at their new locations!	2024-07-28 02:31:25 -04:00
anysad	bf1d4031af	remove trace	2024-07-28 02:31:20 -04:00
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