330 commits

Author	SHA1	Message	Date
Cameron Taylor	23dd9937ec	black camera bg	2024-04-30 07:21:45 -04:00
EliteMasterEric	01b80ab5c8	Merge remote-tracking branch 'origin/input-offsets' into rewrite/master	2024-04-28 19:07:44 -04:00
EliteMasterEric	dd90d430ee	Replace the zoom with a fade (for now)	2024-04-24 23:50:19 -04:00
EliteMasterEric	e0721b901e	Fix a bug where negative visual offsets would break the countdown.	2024-04-24 21:57:23 -04:00
EliteMasterEric	f474bc32a5	Merge remote-tracking branch 'origin/rewrite/master' into input-offsets	2024-04-24 21:54:45 -04:00
EliteMasterEric	b6247c933a	Disable chart editor on web until it's fixed.	2024-04-24 16:00:50 -04:00
EliteMasterEric	84c3fd452b	Update Weekend 1 cutscenes to use the instanced Conductor	2024-04-20 02:11:04 -04:00
Cameron Taylor	678dbc0ab7	Merge branch 'rewrite/master' into a-bot-bars	2024-04-19 15:11:28 -04:00
FabsTheFabs	351cb8cbaa	popupstuff changes + make combopopup able to be edited outside of playstate	2024-04-19 14:14:33 -04:00
Cameron Taylor	035db7f00a	Merge branch 'rewrite/master' into bugfix/draw-crash	2024-04-19 14:03:58 -04:00
Cameron Taylor	93ae7692c8	Merge branch 'rewrite/master' into bugfix/weekend-1-bug-fixes	2024-04-19 13:55:01 -04:00
Cameron Taylor	1405e21e3d	Merge branch 'rewrite/master' into a-bot-bars	2024-04-16 20:02:08 -04:00
EliteMasterEric	43ec72fb9d	Ensure playNoteHoldCover doesn't call if note is judged as 'miss'	2024-04-15 20:36:38 -04:00
Cameron Taylor	658fd392fa	Merge branch 'rewrite/master' into a-bot-bars	2024-04-14 02:57:05 -04:00
EliteMasterEric	6f5c3a043f	Fix crash caused when game tries to render disposed sprites during a Sticker transition.	2024-04-10 14:45:07 -04:00
EliteMasterEric	b464f51ba2	Fix an issue where a missing stage would cause a crash (rather than an error popup)	2024-04-06 22:38:32 -04:00
EliteMasterEric	5beb20ec7c	Fix bug where restarting the song would sometimes crash.	2024-04-06 21:42:18 -04:00
EliteMasterEric	14869b9373	Also disable highscores in botplay	2024-04-06 02:08:10 -04:00
EliteMasterEric	99ee2b07ca	Make results screen use full campaign score in Story Mode	2024-04-06 02:06:06 -04:00
EliteMasterEric	29f105a44d	Practice mode = no highscore!	2024-04-06 01:59:46 -04:00
EliteMasterEric	95434018f7	Readd GF camera zoom into results state.	2024-04-05 02:56:47 -04:00
EliteMasterEric	9c8ab72494	Merge remote-tracking branch 'origin/rewrite/master' into bugfix/quick-camera-fixes	2024-04-05 02:45:23 -04:00
EliteMasterEric	08e8530ad4	Fix SetCameraBopSongEvent to be additive	2024-04-05 02:44:44 -04:00
EliteMasterEric	07092269b8	Merge branch 'rewrite/master' into input-offsets	2024-04-04 18:45:16 -04:00
Cameron Taylor	8f3406cb0e	Merge branch 'rewrite/master' into feature/results-screen-score	2024-04-04 05:34:29 -04:00
EliteMasterEric	8826d0741b	Hide miss popups when hitting ~160ms	2024-04-04 03:31:44 -04:00
EliteMasterEric	1759f5c388	Note cover now only plays splash on player	2024-04-03 04:52:28 -04:00
Cameron Taylor	dcffe0537f	Merge branch 'rewrite/master' into bugfix/buncha-2hot-fixes	2024-04-01 22:40:10 -04:00
Cameron Taylor	d6723a8212	Merge branch 'rewrite/master' into bugfix/freeplay-menu-transition	2024-04-01 22:14:29 -04:00
Cameron Taylor	165e20c318	Merge pull request #453 from FunkinCrew/bugfix/judgements-below-notes ... Bugfix/judgements below notes	2024-04-01 22:08:00 -04:00
EliteMasterEric	67e096e443	Bunch of results screen fixes	2024-04-01 21:59:53 -04:00
EliteMasterEric	927b2a7cfc	Put judgements below the notes, and remove COMBO word.	2024-04-01 20:21:27 -04:00
EliteMasterEric	342782c3d3	Fix issue with pink screen when moving from PlayState->Freeplay->Main Menu	2024-03-28 22:33:50 -04:00
Eric	0eddea9bf8	Merge branch 'rewrite/master' into bugfix/combo-fixes	2024-03-28 20:32:34 -04:00
EliteMasterEric	e5a10c6a25	Merge branch 'rewrite/master' into a-bot-bars	2024-03-28 20:26:13 -04:00
EliteMasterEric	35f99b49a4	Merge branch 'rewrite/master' into input-offsets	2024-03-28 20:23:31 -04:00
Jenny Crowe	76885c421d	Cleanup + Focus Camera: Use Tween toggle converted to "Classic" ease type.	2024-03-28 12:34:13 -07:00
Jenny Crowe	d4c9fffe48	Merge branch 'rewrite/master' of https://github.com/FunkinCrew/Funkin-secret into bugfix/quick-camera-fixes	2024-03-28 11:05:51 -07:00
Jenny Crowe	ef2cb4d9fc	Convert zoom modifiers from additive to multiplicative	2024-03-28 11:05:38 -07:00
EliteMasterEric	837fcee983	Fix a bug where 000 would display any time a Bad or Shit is hit (instead of just when a combo break is hit)	2024-03-28 00:19:57 -04:00
EliteMasterEric	c1c2621e1d	Fix bug where Bad and Shit didn't count at Notes Hit in the results screen.	2024-03-28 00:18:39 -04:00
EliteMasterEric	201e018f25	Merge remote-tracking branch 'origin/rewrite/master' into bugfix/buncha-2hot-fixes	2024-03-28 00:03:09 -04:00
Cameron Taylor	53d62c3c12	Merge branch 'rewrite/master' into bugfix/pico-fixes	2024-03-27 22:14:44 -04:00
EliteMasterEric	463e946b17	Merge remote-tracking branch 'origin/rewrite/master' into bugfix/buncha-2hot-fixes	2024-03-27 01:40:22 -04:00
EliteMasterEric	6b35898ed9	Fix some issues with Weekend 1.	2024-03-26 23:24:59 -04:00
EliteMasterEric	e84fdf9fac	Resolve FlxG.sound.music crash	2024-03-26 19:38:42 -04:00
EliteMasterEric	07ad250060	Fix an audio crash when exiting a cutscene	2024-03-25 21:08:39 -04:00
Cameron Taylor	fe6cb8c5a9	Merge pull request #413 from FunkinCrew/bugfix/funkin-sound-overhaul ... Funkin Sound overhaul	2024-03-25 15:59:02 -04:00
Cameron Taylor	6a0672684c	Merge pull request #416 from FunkinCrew/bugfix/camera-zoom-option ... Fix a bug where the Camera Zoom toggle didn't work.	2024-03-25 14:52:24 -04:00
EliteMasterEric	138dfd61e8	Fix a bug where the Camera Zoom toggle didn't work.	2024-03-23 23:52:08 -04:00