3133 commits

Author	SHA1	Message	Date
CheemsAndFriends	f3722e5da2	Add hmm flxanimate, new conditional for Cheems' PC sake and more wip char select animation	2024-09-07 02:07:00 +02:00
FabsTheFabs	e0a4818e5a	registry updates	2024-09-07 00:52:38 +01:00
Cameron Taylor	a623ec77f7	Merge branch 'feature/char-unlock-notif' into rewrite/master	2024-09-06 19:44:58 -04:00
Cameron Taylor	89e1cb8258	small null fix for if we're not playing music	2024-09-06 19:44:33 -04:00
CheemsAndFriends	a901677853	Merge branch 'feature/char-unlock' of https://github.com/FunkinCrew/Funkin-secret into feature/char-unlock	2024-09-06 06:33:01 +02:00
CheemsAndFriends	a61f40571d	add wip bizz	2024-09-06 06:28:08 +02:00
CheemsAndFriends	1021f5c2ee	wip sequence	2024-09-05 22:44:05 -04:00
CheemsAndFriends	4cad56705a	Add lock bizz	2024-09-05 22:40:27 -04:00
CheemsAndFriends	677357ba37	wip sequence	2024-09-06 02:55:47 +02:00
EliteMasterEric	34d13c61de	Cleanup character unlock impl and queue it for after Story Mode is completed.	2024-09-05 17:54:03 -04:00
Cameron Taylor	33aaabe190	lil console command helper for camera zoom	2024-09-05 01:22:45 -04:00
Cameron Taylor	0e37cb9540	Merge branch 'rewrite/master' into bugfix/blazin-flxanimate-fixes	2024-09-05 00:31:47 -04:00
Cameron Taylor	5c44e61ce1	assets submod	2024-09-05 00:20:55 -04:00
cyn	df266e66d3	dont do that	2024-09-04 19:24:14 -07:00
CheemsAndFriends	def2b64a41	Add lock bizz	2024-09-04 20:08:38 +02:00
EliteMasterEric	24096bd319	Fixed positioning in Blazin'.	2024-09-04 10:58:18 -04:00
EliteMasterEric	3a2ca6b525	Code changes to fix Blazin'	2024-09-04 09:58:04 -04:00
Cameron Taylor	788f0ee026	Merge branch 'bugfix/labor-daybor' into rewrite/master	2024-09-03 23:56:45 -04:00
Cameron Taylor	bd144d6adb	Merge branch 'rewrite/master' into bugfix/friday-fixes	2024-09-03 23:42:51 -04:00
EliteMasterEric	36505f75c1	The actual code for custom freeplay music LOL	2024-09-03 21:14:57 -04:00
FabsTheFabs	b58bd07fd2	rain shader recolor support	2024-09-03 19:16:58 +01:00
FabsTheFabs	d049478c65	registry updates	2024-09-03 19:16:46 +01:00
Cameron Taylor	930f5ff5a6	Merge branch 'feature/instrumental-select-hud' into rewrite/master	2024-09-03 11:25:34 -04:00
Cameron Taylor	498cd4a830	Merge branch 'cards-and-char-select' into rewrite/master	2024-09-01 17:56:12 -04:00
EliteMasterEric	7511de1e7a	A bunch of Freeplay visual fixes	2024-09-01 03:28:56 -04:00
FabsTheFabs	71da847158	forgot to change these back	2024-08-30 01:12:26 +01:00
FabsTheFabs	27970e4c2d	freeplay style changelog oops	2024-08-30 01:04:51 +01:00
FabsTheFabs	60c10aae99	char select to freeplay transition, backing card implementation, beatHit for backing cards	2024-08-30 01:04:30 +01:00
FabsTheFabs	0c809c828e	color tint for angle mask shader	2024-08-30 01:03:11 +01:00
FabsTheFabs	de03da7e6f	backing card classes	2024-08-30 01:02:32 +01:00
FabsTheFabs	e7448cb8f7	style support	2024-08-30 00:58:19 +01:00
FabsTheFabs	a4f3c2cb84	freeplay style code	2024-08-30 00:55:24 +01:00
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
cyn	00c7767f8a	Update FunkinSound.hx	2024-08-23 20:17:10 -07:00
FabsTheFabs	55dd1857c9	freeplay transition + wip card classes	2024-08-23 13:36:35 +01:00
FabsTheFabs	e37330f288	character select transition	2024-08-23 13:36:00 +01:00
FabsTheFabs	0d3fa41b29	blue fade shader	2024-08-23 13:35:50 +01: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	8a2d8a9941	Committing all the additional stuff (Lowering FPS ... For my PC lol)	2024-08-19 13:41:29 +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
Hyper_	d43042fd36	Fix out of bounds note selection	2024-08-05 20:02:23 -03:00
Cameron Taylor	960c151985	Merge pull request #682 from FunkinCrew/haxelib-updates ... Update OpenFL to latest	2024-08-05 10:48:12 -04: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	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
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
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
Cameron Taylor	4164329ca9	Merge branch 'rewrite/master' into lemz1/note-kind-scripts	2024-07-22 22:20:58 -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
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	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
anysad	ba96b11196	hopefully final polish?	2024-07-18 17:56:54 +03:00
FabsTheFabs	a0ab216617	merged rain shader stuff from 'feature/week2-erect-bg-rain'	2024-07-18 06:04:19 +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
anysad	ee44981995	you know what, make countdown sprites a little bigger	2024-07-16 22:02:05 +03:00
anysad	f8a0627fd2	goodbye scripts, hello notestyles!	2024-07-16 20:53:12 +03:00
Cameron Taylor	35ba5663a1	uncapped framerate on web	2024-07-15 23:10:08 -04:00
EliteMasterEric	416d60000f	Implement Nene Christmas, and fix Nene offsets on other stages.	2024-07-15 06:30:10 -04:00
anysad	aed100df47	how the hell did I miss these?	2024-07-13 23:39:56 +03:00
anysad	9d3c043f8a	cache textures at their new locations!	2024-07-13 23:29:26 +03:00
anysad	2547fbb8f4	remove trace	2024-07-13 23:08:16 +03:00
anysad	2993e17278	custom popups and countdowns yay!!!	2024-07-13 22:45:58 +03:00
lemz	0c5815c176	add completion check	2024-07-13 21:27:14 +02:00
EliteMasterEric	6116ec3639	Some more fixes for offsets handling and stuffs	2024-07-12 22:31:04 -04:00
EliteMasterEric	492874ce32	Merge branch 'sword352/indirect-anim-offsets' into bugfix/character-offset-fixes	2024-07-12 21:41:25 -04:00
EliteMasterEric	d4cbe74939	Smaller fixes tied to note kinds	2024-07-12 21:40:46 -04:00
EliteMasterEric	ace762413e	Fix an issue where display would break on invalid note styles.	2024-07-12 16:39:42 -04:00
EliteMasterEric	f76309c91e	Update rendering for custom note styles	2024-07-12 04:13:20 -04:00
lemz	1fe44fa368	add from	2024-07-12 02:13:23 -04:00
lemz	4746c1da0e	checking empty suffix is stupid	2024-07-12 02:13:22 -04:00
lemz	f9bccb057a	use suffixes instead of pixel boolean	2024-07-12 02:13:22 -04:00
lemz	492af8add4	String works now	2024-07-12 02:13:21 -04:00
lemz	44d9785317	editing them works now ... still need to implement String and do some testing	2024-07-12 02:13:21 -04:00
lemz	c41d846df5	store params in chart ... chart editor still doesnt fully work	2024-07-12 02:13:20 -04:00
lemz	764cdee63d	add more options	2024-07-12 02:13:20 -04:00
lemz	0fe726cefa	fix min, max	2024-07-12 02:13:20 -04:00
lemz	437cc68ba7	adapt to minimize problem	2024-07-12 02:13:19 -04:00
lemz	93475ae8aa	minimized check	2024-07-12 02:13:19 -04:00
lemz	d9b9854d91	add params to toolbox ... not completely finished	2024-07-12 02:13:18 -04:00
lemz	9a563ec46b	switch seemingly doesnt work	2024-07-12 02:13:18 -04:00
lemz	94fe4a06b9	Update NoteKind.hx	2024-07-12 02:13:18 -04:00
lemz	c8d019da2f	Update NoteKind.hx	2024-07-12 02:13:17 -04:00
lemz	acd8912d16	Add Custom Params For NoteKind ... still need to implement the chart editor stuff	2024-07-12 02:13:17 -04:00
lemz	fbcc73dcee	unhardcode notestyledropdown	2024-07-12 02:13:17 -04:00
lemz	7a0c7ade35	Update ChartEditorDropdowns.hx	2024-07-12 02:13:16 -04:00
lemz	928de7b8eb	check for pixel style if necessary	2024-07-12 02:13:16 -04:00
lemz	c4855c0ca8	fix hold note	2024-07-12 02:13:15 -04:00
lemz	49d302be95	make code a bit simpler	2024-07-12 02:13:15 -04:00
lemz	bb97549171	fixed a bit	2024-07-12 02:13:14 -04:00
lemz	040fc85a62	change note style on change	2024-07-12 02:13:14 -04:00
lemz	ca2cbb44f5	display custom note style in chart editor	2024-07-12 02:13:14 -04:00
lemz	9d7846a0d5	loop through all note style entries	2024-07-12 02:13:13 -04:00
lemz	ca69e7b850	custom note styles in chart editor	2024-07-12 02:13:13 -04:00
lemz	328e590f92	hold assets are updated aswell	2024-07-12 02:13:13 -04:00
lemz	b6eda8e498	remove note kind logic from playstate	2024-07-12 02:13:12 -04:00
lemz	14771e72de	no more note getter	2024-07-12 02:13:12 -04:00
lemz	3f39d9509c	make custom note style less clunky	2024-07-12 02:13:12 -04:00
lemz	e3e4e9fac0	helper function	2024-07-12 02:13:11 -04:00
lemz	c83e505f5b	onUpdate, etc. works now too	2024-07-12 02:13:11 -04:00
lemz	606d9d4af4	Update NoteKindManager.hx	2024-07-12 02:13:11 -04:00
lemz	134b467876	rename stuff	2024-07-12 02:13:10 -04:00
lemz	a7482410b9	add note kind scripts	2024-07-12 02:13:10 -04:00
EliteMasterEric	03d1f858ec	Remove flixel-ui and add a new dropdown to the animation offset editor	2024-07-12 00:57:08 -04:00
gamerbross	c3f8075b5f	Few animation editor bugfixes	2024-07-11 23:11:58 -04:00
gamerbross	e6c9767800	Revert camCutscene rename	2024-07-11 22:48:21 -04:00
gamerbross	e23e6c160d	Fix references to camCutscene	2024-07-11 22:48:20 -04:00
gamerbross	17f5a06256	Add camOther to fix zooms on pause and stickers	2024-07-11 22:48:20 -04:00
gamerbross	90155bcfbf	ChartEditor Live Input Code Refactor + 6 key fix	2024-07-11 22:24:38 -04:00
EliteMasterEric	4a7545a0db	Remove empty function.	2024-07-11 21:45:06 -04:00
anysad	18b795d4f7	Add HEY! song events to Tutorial	2024-07-11 21:39:20 -04:00
EliteMasterEric	50b587e3b8	Merge remote-tracking branch 'public/develop' into rewrite/master	2024-07-11 20:58:42 -04:00
Cameron Taylor	5a26ece9d6	Merge branch 'rewrite/master' into gamerbross/chart-reload-f5	2024-07-11 19:59:15 -04:00
Cameron Taylor	7cd19a0135	Merge pull request #656 from FunkinCrew/feature/nene-combo-anims ... Implement combo animations for Nene + other changes	2024-07-11 19:52:01 -04:00
Cameron Taylor	966fce3426	Merge branch 'rewrite/master' into feature/nene-combo-anims	2024-07-11 19:51:13 -04:00
Cameron Taylor	d423753de0	Merge branch 'rewrite/master' into flooferland/new-settings-types	2024-07-11 19:48:51 -04:00
Cameron Taylor	cffe41985d	Merge pull request #663 from FunkinCrew/gamerbross/hold-note-forced-alpha ... [PUBLIC PR] Fix a bug where mods can't change the transparency of hold notes	2024-07-11 19:48:35 -04:00
Cameron Taylor	068a660a91	Merge branch 'rewrite/master' of github.com:FunkinCrew/Funkin-secret into rewrite/master	2024-07-11 19:46:40 -04:00
Cameron Taylor	19fd8b5e4e	Merge branch 'gamerbross/chart-editor-key' into rewrite/master	2024-07-11 19:45:10 -04:00
Eric	71947c581e	[PUBLIC PR] Fix a bug where the memory counter would overflow into the negatives (#662) ... * get Float instead of Int in cpp (Float is 64-bit in so it works easier than Int64) * use Math.fround instead of Math.round --------- Co-authored-by: Karim Akra <144803230+KarimAkra@users.noreply.github.com>	2024-07-11 19:35:41 -04:00
Cameron Taylor	dd3f41ab1b	Merge pull request #659 from FunkinCrew/feature/commas-in-score ... Add commas to the score to make it more readable	2024-07-11 18:36:35 -04:00
lemz	2be22055cc	Merge branch 'develop' into fps-setting	2024-07-11 10:25:16 +02:00
Eric	1a44853c88	Merge pull request #2452 from eltociear/patch-1 ... Update ScriptEventType.hx	2024-07-11 03:56:07 -04:00
gamerbross	7b9e4a0542	Fix F5 chart not reloading	2024-07-11 03:41:51 -04:00
gamerbross	2fb55ba3ed	Fix default health icon not used	2024-07-11 06:59:22 +02:00
gamerbross	8107d1a290	Remove SustainTrail forced alpha	2024-07-10 20:18:29 -04:00
AppleHair	34a19ef583	[BUGFIX] Fixed cancelMenu sound not playing after switching state.	2024-07-10 18:08:55 -04:00
EliteMasterEric	2ae6882241	Swappable album art and updated FlxAnimate	2024-07-10 17:25:52 -04:00
EliteMasterEric	d8572cd323	Thank you loggo	2024-07-10 14:23:50 -04:00
EliteMasterEric	98ed4bd843	Implement Nene/GFXmas combo anims	2024-07-09 04:21:14 -04:00
EliteMasterEric	cb4620d33a	Fix background props not bopping on Week 5	2024-07-09 04:20:42 -04:00
Cameron Taylor	7a653707a8	Merge pull request #641 from FunkinCrew/maybemaru/pixels-per-ms ... [PUBLIC PR] Make use of Constants.PIXELS_PER_MS consistent.	2024-07-08 22:12:18 -04:00
Cameron Taylor	fdf52efdd1	Merge branch 'rewrite/master' of github.com:FunkinCrew/Funkin-secret into rewrite/master	2024-07-08 22:10:52 -04:00
Cameron Taylor	51a156eec9	Merge branch 'char-select-cherrypick' into rewrite/master	2024-07-08 22:10:17 -04:00
Cameron Taylor	d9d0facfca	Merge pull request #653 from FunkinCrew/feature/playable-pico-results ... Feature/playable pico results	2024-07-08 21:52:23 -04:00
Cameron Taylor	6e5c6a8f6d	assets submod	2024-07-08 21:51:44 -04:00
Cameron Taylor	b338dfe8f0	Merge pull request #649 from FunkinCrew/jvnpixels/story-menu-scrolling ... [PUBLIC PR] Scroll wheel in Story Menu	2024-07-08 17:39:30 -04:00
Cameron Taylor	3a37b79a55	add TAB to controls stuff	2024-07-08 16:40:10 -04:00
Cameron Taylor	57c995e19d	char select screen controls stuff	2024-07-08 16:30:17 -04:00
Cameron Taylor	a92334d5ae	Merge branch 'rewrite/master' into char-select-cherrypick	2024-07-08 16:23:32 -04:00
Cameron Taylor	d7105e8b8e	change debug menu and add key for freeplay	2024-07-08 16:22:38 -04:00
EliteMasterEric	a9aa142b8d	Added more pico results + charts	2024-07-07 04:10:37 -04:00
Cameron Taylor	c9c94a5fda	note fadein fix	2024-07-04 15:55:19 -04:00
Cameron Taylor	6593ddbbc8	Merge pull request #646 from FunkinCrew/gamerbross/playonce-returns ... [PUBLIC PR] FunkinSound.playOnce now returns the created sound	2024-07-04 15:10:20 -04:00
Cameron Taylor	4d9b506380	Merge pull request #645 from FunkinCrew/gamerbross/char-danceevery ... [PUBLIC PR + CHANGES] Fix danceEvery for characters	2024-07-04 15:08:51 -04:00
Cameron Taylor	67b1c3864e	Merge branch 'rewrite/master' into feature/character-anim-fixes	2024-07-04 15:07:07 -04:00
Cameron Taylor	130440fd6e	assets submod	2024-07-04 15:06:04 -04:00
Cameron Taylor	eddfa23955	Merge pull request #644 from FunkinCrew/abnormalpoof/cutscene-auto-pause ... [PUBLIC PR] Automatically pause video cutscenes when tabbing away from the game	2024-07-04 14:52:46 -04:00
Cameron Taylor	a7cfae8545	mer	2024-07-04 14:48:24 -04:00
EliteMasterEric	7fbc765403	Implement Pico results (good animation)	2024-07-04 03:32:50 -04:00
EliteMasterEric	e32fcee77c	Migrate results animations to JSON data so we can implement them per-character	2024-07-03 22:50:39 -04:00
AppleHair	bd17d965f5	[BUGFIX] Fixed Ranks not appearing in freeplay for custom variations ... Freeplay tries to access a song's rank using the current difficulty name alone, but custom variation ranks are being saved with a variation prefix. This PR makes freeplay look for the variation prefix when necessary.	2024-07-03 18:03:46 -04:00
EliteMasterEric	ad57e64994	Working Pico DJ	2024-07-03 18:03:31 -04:00
EliteMasterEric	5c2bad888d	Make Boyfriend DJ animations data driven	2024-07-03 18:02:16 -04:00
EliteMasterEric	72a00b9ae2	Implemented playable character registry, added Freeplay character filtering, added alt instrumental support	2024-07-03 18:01:49 -04:00
AppleHair	b1021530d8	now using getVariationsByCharId instead	2024-07-03 18:00:59 -04:00
AppleHair	837efcea36	[BUGFIX] Made freeplay use the metadata to get the instrumental suffix ... Song previews in freeplay will now use the instrumental suffix from the current difficulty's corresponding song variation metadata instead of using the variation id as an instrumental suffix and checking only the "erect" variation.	2024-07-03 18:00:58 -04:00
Cameron Taylor	105e3dccba	spritesheet fixins for char select	2024-07-02 21:26:16 -04:00
lemz	927e37b35b	use new numberpreferenceitem	2024-07-02 17:18:46 +02:00
FabsTheFabs	3fa9b2a635	new music	2024-07-01 22:18:04 -04:00
Cameron Taylor	8dfd36d227	menu spam fixie	2024-07-01 22:18:03 -04:00
FabsTheFabs	b1b7a032be	music updates	2024-07-01 22:17:55 -04:00
FabsTheFabs	28068b1a86	updating more stuff	2024-07-01 22:17:55 -04:00
FabsTheFabs	d686890f76	most of the old code	2024-07-01 22:16:56 -04:00
Cameron Taylor	043c8e8ade	Merge pull request #638 from FunkinCrew/cyn0x8/flash-fix ... [PUBLIC PR] Make flashing effects look more consistent	2024-07-01 20:23:16 -04:00
Cameron Taylor	5134547071	Merge pull request #648 from FunkinCrew/gamerbross/freeplay-stack-overflow ... [PUBLIC PR] Fix Stack Overflow if song doesn't have "normal" difficulty	2024-07-01 20:20:38 -04:00
Cameron Taylor	bb1fc64754	Merge pull request #647 from FunkinCrew/gamerbross/stickers-f5-screen ... [PUBLIC PR] Fix crash after pressing F5 and coming back from stickers	2024-07-01 20:19:09 -04:00
Cameron Taylor	88263b9ffd	Merge pull request #640 from FunkinCrew/nothyper-474/loading-state-trace ... [PUBLIC PR] Fix broken trace call in LoadingState	2024-07-01 16:53:07 -04:00
EliteMasterEric	432c709075	Animated pixel icons for freeplay ... mend	2024-07-01 16:51:54 -04:00
FlooferLand!	cd08116aed	Added getWidth	2024-07-01 15:41:08 -04:00
FlooferLand!	fbc78adb65	Added new settings items	2024-07-01 15:41:08 -04:00
gamerbross	09c8a2600e	Fix null safety compiling	2024-06-29 22:54:25 +02:00
lemz	0a7902c4b4	Merge branch 'develop' into fps-setting	2024-06-29 14:27:31 +02:00
Pixel	a9c6b9ff8a	Extra newline removal. ... Removes the extra line in code.	2024-06-29 01:15:48 -04:00
Pixel	90f3a8f285	Update source/funkin/ui/story/StoryMenuState.hx ... Co-authored-by: gamerbross <55158797+gamerbross@users.noreply.github.com>	2024-06-29 01:15:48 -04:00
Pixel	55d02d49c2	Update StoryMenuState.hx	2024-06-29 01:15:47 -04:00
gamerbross	7e6ef61169	Fix Stack Overflow if song doesn't have "normal" difficulty	2024-06-29 00:35:01 -04:00
gamerbross	32deb8d190	Fix crash after pressing F5 and coming back from stickers	2024-06-29 00:29:23 -04:00
EliteMasterEric	62501a1ded	Fix null safety error.	2024-06-29 00:03:28 -04:00
gamerbross	03eab140f1	FunkinSound.playOnce return sound	2024-06-28 23:29:23 -04:00
EliteMasterEric	b022581e23	Make danceEvery a float precise up to 0.25 beats (1 step)	2024-06-28 23:25:59 -04:00
gamerbross	6bf28a5416	Implement danceEvery for Characters	2024-06-28 22:57:44 -04:00
AbnormalPoof	9d9d7a853c	video cutscene autopause magic	2024-06-28 22:36:01 -04:00
EliteMasterEric	84dd1cd3b9	Fix several character animation issues	2024-06-28 22:29:59 -04:00
gamerbross	91bc63004a	FunkinSound.playOnce return sound	2024-06-27 21:00:25 +02:00
EliteMasterEric	fbfd8259a6	Merge branch 'applehair/ranks-for-custom-variations' into feature/playable-pico-mode	2024-06-27 04:06:10 -04:00
MaybeMaru	16d64991ed	Add missing constants	2024-06-27 03:56:41 -04:00
NotHyper-474	6f26fbba5f	Fix trace	2024-06-26 20:57:01 -04:00
gamerbross	a7bdf23832	Fix chart reset when charting and pressing chart key	2024-06-26 20:52:32 -04:00
Cameron Taylor	dd30012d80	Merge pull request #637 from FunkinCrew/hundrec/tankman-chart-editor-fix ... [PUBLIC PR] Fix tankmanpixel icon in Chart Editor	2024-06-26 20:41:24 -04:00
cyn	dad8b0815d	flash fix	2024-06-26 20:36:53 -04:00
Hundrec	08d35eb00d	Fix tankmanpixel icon in Chart Editor	2024-06-25 18:07:09 -04:00
Cameron Taylor	8a144352a0	remove bopper trace	2024-06-25 13:56:31 -04:00
Cameron Taylor	1757532097	more retro week 6 stuff	2024-06-25 13:56:31 -04:00
Cameron Taylor	ab2f949d7e	fix for heart icons being on the wrong frames	2024-06-25 13:56:31 -04:00
Cameron Taylor	5751430261	fix the camera not panning when opening then closing the debug menu during transition	2024-06-25 13:56:31 -04:00
Cameron Taylor	39c3af58f2	fix: bf v pose playing during a gameover	2024-06-25 13:56:31 -04:00
lemz	f3e04114eb	use new offsets	2024-06-25 17:05:15 +02:00
EliteMasterEric	4e65c49e0e	Get rid of a warning about missing BPM info	2024-06-24 14:40:55 -04:00
Karim Akra	983d241e47	remove the library strip	2024-06-24 14:40:55 -04:00
EliteMasterEric	d44275c2c7	Fix a bug where songs with no notes would crash the results screen.	2024-06-24 14:40:55 -04:00
Cameron Taylor	81cada675c	fix for release, no bf printing directly to stdout!	2024-06-24 14:40:55 -04:00
lemz	3b3b9d97ba	use different implementation	2024-06-23 21:03:30 +02:00
EliteMasterEric	9b3a748f37	Working Pico DJ	2024-06-20 16:17:53 -04:00
EliteMasterEric	263039f52c	Make Boyfriend DJ animations data driven	2024-06-18 20:07:27 -04:00
EliteMasterEric	60e741434c	Implemented playable character registry, added Freeplay character filtering, added alt instrumental support	2024-06-18 17:56:24 -04:00
EliteMasterEric	6f2f2a9aa4	Merge branch 'applehair/preview-inst-suffix' into feature/playable-pico-mode	2024-06-18 15:40:51 -04:00
gamerbross	ba4677857a	Few animation editor bugfixes	2024-06-15 20:23:55 +02:00
AppleHair	1f1fe62a06	[BUGFIX] Fixed Ranks not appearing in freeplay for custom variations ... Freeplay tries to access a song's rank using the current difficulty name alone, but custom variation ranks are being saved with a variation prefix. This PR makes freeplay look for the variation prefix when necessary.	2024-06-14 16:53:33 +03:00
lemz	e3159745fb	Merge branch 'develop' into fps-setting	2024-06-13 09:02:27 +02:00
Cameron Taylor	a63b60d458	fix for release, no bf printing directly to stdout!	2024-06-12 20:31:27 -04:00
Cameron Taylor	80981eee37	inputs null fix	2024-06-12 15:41:42 -04:00
AppleHair	c4d6e18885	now using getVariationsByCharId instead	2024-06-12 11:23:45 +03:00
Cameron Taylor	47d5c4d141	Merge pull request #619 from FunkinCrew/freeplay-dad-smoother ... freeplay bg nicer AA and proper sizing	2024-06-11 16:16:13 -04:00
Cameron Taylor	c325fdaa1b	Merge pull request #618 from FunkinCrew/speaker-volume-desktop ... [funk-378] reactive speaker to gamevolume on desktop	2024-06-11 16:16:02 -04:00
Cameron Taylor	c05f053fe3	Merge branch 'rewrite/master' into bugfix/instrumental-id	2024-06-11 16:12:39 -04:00
Cameron Taylor	1e3ef61fc9	freeplay bg nicer AA and proper sizing	2024-06-11 15:57:45 -04:00
Cameron Taylor	37a15e0a0f	reactive speaker to gamevolume on desktop	2024-06-11 12:13:10 -04:00
Cameron Taylor	817c216d06	Merge pull request #617 from FunkinCrew/bugfix/save-highest-rank ... [FUNK-387] Save high scores and high ranks separately.	2024-06-11 12:04:38 -04:00
Cameron Taylor	381e0104e9	Merge pull request #616 from FunkinCrew/feature/freeplay-keybinds ... [FUNK-391] Rebindable controls for the Freeplay menu	2024-06-11 11:49:24 -04:00
EliteMasterEric	b30faad7d9	Save high scores and high ranks separately.	2024-06-11 00:40:43 -04:00
Cameron Taylor	00021523bc	lower volume on freeplay easter egg	2024-06-10 17:35:49 -04:00
Ikko Eltociear Ashimine	e8f8a0c181	chore: update MenuList.hx ... lenth -> length	2024-06-10 16:45:22 -04:00
DM-kun	da61b72c48	crash fix	2024-06-10 16:21:41 -04:00
Cameron Taylor	f31ea8fb73	add sound for changing sorting	2024-06-10 16:13:32 -04:00
gamerbross	8f44d9606d	Remove unnecessary scrollMenu sounds + adjust volume	2024-06-10 13:17:38 -04:00