4122 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
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	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
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	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
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
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
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
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
Cameron Taylor	894ea5cc6b	Merge branch 'rewrite/master' into bugfix/character-offset-fixes	2024-07-15 12:53:34 -04:00