1954 commits

Author	SHA1	Message	Date
Cameron Taylor	78fb6e1188	Merge pull request #712 from FunkinCrew/menu-music-fix ... FUNK-525 stop main menu music from playing when entering freeplay from pausemenu	2024-08-29 18:28:00 -04:00
Cameron Taylor	737a679196	merge conflict fixins	2024-08-29 15:26:35 -04:00
Cameron Taylor	825327e1c8	Merge branch 'rewrite/master' into feature/charSelect	2024-08-29 15:13:58 -04:00
Cameron Taylor	0392eddba6	gf/nene char select mini optimization	2024-08-29 14:32:10 -04:00
Cameron Taylor	b27aa4c94d	Merge branch 'rewrite/master' into feature/pico-playable-christmas	2024-08-29 13:40:56 -04:00
Cameron Taylor	0a316c815f	stop main menu music from playing when entering freeplay from pausemenu	2024-08-29 13:22:56 -04:00
Cameron Taylor	1fbca9ab6a	Merge branch 'bugfix/various-develop-fixes' into rewrite/master	2024-08-28 16:32:50 -04:00
EliteMasterEric	6cff1efc72	Fix several compile errors, and update assets submodule.	2024-08-28 06:45:18 -04:00
EliteMasterEric	e7fca119f8	Logic + animations for new unlocks	2024-08-28 06:11:01 -04:00
EliteMasterEric	1fb5c31c22	Don't apply global offset twice (NOTE: this may break Nene again!)	2024-08-28 06:09:34 -04:00
EliteMasterEric	7e39687994	Data driven char select grid positions	2024-08-28 06:09:14 -04:00
EliteMasterEric	16a6dba9df	Pico Fist Pump animation (with loss animation)	2024-08-28 06:08:30 -04:00
EliteMasterEric	2e7eabc494	Remember character ID between visits to Freeplay, plus some fixes to prevent spamming keys	2024-08-28 06:05:28 -04:00
EliteMasterEric	570e672296	Fix magenta flicker on the main menu.	2024-08-28 06:03:26 -04:00
EliteMasterEric	152820f2e1	Fix some warnings with props in StoryMenu	2024-08-28 06:03:12 -04:00
EliteMasterEric	89402f8bb8	Fix a bug where Bot Play could miss (via lag or the player mashing) and lose the song.	2024-08-28 05:47:34 -04:00
EliteMasterEric	ccabded2cc	Fix warning related to bad asset caching for judgements.	2024-08-28 05:43:41 -04:00
EliteMasterEric	af93da6cd4	Fixes to Chart Editor toolboxes	2024-08-28 05:43:23 -04:00
EliteMasterEric	b0f04779dc	Fix to Spooky icon in Freeplay menu	2024-08-28 05:43:01 -04:00
EliteMasterEric	382af3b485	Reimplement ghost tapping (disabled via compile define)	2024-08-28 05:42:14 -04:00
EliteMasterEric	469ff6690f	Fix a crash when skipping in the song before it started.	2024-08-28 05:40:50 -04:00
CheemsAndFriends	353aa42f5b	Fixes for the atlasSprite bizz	2024-08-28 02:48:56 +02:00
Cameron Taylor	9b712ce2aa	bump flixel	2024-08-27 16:13:52 -04:00
Cameron Taylor	861b869b2d	fonts fix for mac	2024-08-27 15:23:27 -04:00
Cameron Taylor	ce62c240fa	Merge branch 'rewrite/master' into bugfix/nene-pico-offsets	2024-08-27 14:40:56 -04:00
Cameron Taylor	a7334d8ff9	Merge pull request #705 from FunkinCrew/bugfix/week-4-boppers ... Fix a bug where stage props would receive events twice	2024-08-27 14:26:19 -04:00
EliteMasterEric	d02f632c0e	Fix a bug where stage props would receive events twice	2024-08-27 04:54:02 -04:00
EliteMasterEric	df42ac7531	Fixed issues with Nene offsets in Pico mode	2024-08-27 04:20:49 -04:00
EliteMasterEric	200b3c963b	Updated compile defines to use feature flag system	2024-08-26 18:01:36 -04:00
CheemsAndFriends	7f0f0efe46	initial Commit	2024-08-22 23:36:43 +02:00
Cameron Taylor	5756eff7cf	dont need null check, we just need to declare string type	2024-08-21 16:39:34 -04:00
Cameron Taylor	e1d8e758bb	completion server fixin?	2024-08-21 16:31:10 -04:00
Cameron Taylor	cee5d53deb	Merge pull request #686 from FunkinCrew/applehair/freeplay-stack-overflow ... [PUBLIC PR] Fix a stack overflow for songs with no "Normal" difficulty	2024-08-20 15:09:36 -04:00
Cameron Taylor	df588f86af	Merge branch 'rewrite/master' into applehair/storymode-valid-variation	2024-08-20 15:06:07 -04:00
Cameron Taylor	78d299db4e	Merge branch 'gamerbross/animation-editor' into rewrite/master	2024-08-20 15:03:42 -04:00
Cameron Taylor	76edf2e4e9	remove unused imports	2024-08-20 14:44:53 -04:00
Cameron Taylor	6e3fba4d3d	Merge branch 'rewrite/master' into gamerbross/animation-editor	2024-08-20 14:29:43 -04:00
Cameron Taylor	1b309e33ef	Merge branch 'rewrite/master' into 70ltan/char-path-fix	2024-08-20 14:21:36 -04:00
CheemsAndFriends	a6f8cf0141	Setting a simple mask test	2024-08-20 01:20:13 +02:00
CheemsAndFriends	82eea221d8	Can't seem to understand AtlasSprite	2024-08-19 14:41:20 +02:00
CheemsAndFriends	4dad17d241	Prepare the FlxAnimate bizz	2024-08-19 13:40:58 +02:00
FabsTheFabs	9d85d423c6	add stage to registry and chart editor	2024-08-19 04:29:22 +01:00
Cameron Taylor	0e46f91a60	Merge branch 'rewrite/master' into feature/album-art-swap	2024-08-16 20:21:51 -04:00
Eric	f4e42375d1	Merge branch 'rewrite/master' into applehair/freeplay-stack-overflow	2024-08-12 14:37:18 -04:00
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	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	cce6434570	Merge branch 'rewrite/master' into feature/erect-stages	2024-08-07 19:43:37 -04:00
Cameron Taylor	62d0b33689	Fix for switching to old icon on isPixel levels	2024-08-06 13:44:02 -04:00