Parker2991/Funkin
1
0
Fork 0
mirror of https://github.com/FunkinCrew/Funkin.git synced 2024-11-14 19:25:16 -05:00
Code Issues Projects Releases Packages Wiki Activity

Resolve merge issues.

Browse source
This commit is contained in:
EliteMasterEric 2024-09-19 04:22:05 -04:00
parent 7d6fa19ff4
commit 25cafe7550
3 changed files with 1 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
source/funkin/play/PlayState.hx
View file

@ -3046,7 +3046,6 @@ class PlayState extends MusicBeatSubState
GameOverSubState.reset(); GameOverSubState.reset();
PauseSubState.reset(); PauseSubState.reset();
Countdown.reset(); Countdown.reset();
PopUpStuff.reset();
// Clear the static reference to this state. // Clear the static reference to this state.
instance = null; instance = null;

9
source/funkin/play/components/PopUpStuff.hx
View file

@ -125,13 +125,4 @@ class PopUpStuff extends FlxTypedGroup<FunkinSprite>
daLoop++; daLoop++;
} }
} }
/**
* Reset the popup configuration to the default.
*/
public static function reset()
{
noteStyle = NoteStyleRegistry.instance.fetchDefault();
isPixel = false;
}
} }

2
source/funkin/ui/debug/anim/DebugBoundingState.hx
View file

@ -77,7 +77,7 @@ class DebugBoundingState extends FlxState
{ {
// get the screen position, according to the HUD camera, temp default to FlxG.camera juuust in case? // get the screen position, according to the HUD camera, temp default to FlxG.camera juuust in case?
var hudMousePos:FlxPoint = FlxG.mouse.getScreenPosition(hudCam ?? FlxG.camera); var hudMousePos:FlxPoint = FlxG.mouse.getScreenPosition(hudCam ?? FlxG.camera);
return Screen.instance.hasSolidComponentUnderPoint(hudMousePos.x, hudMousePos.y) || FlxG.mouse.overlaps(animDropDownMenu, hudCam); return Screen.instance.hasSolidComponentUnderPoint(hudMousePos.x, hudMousePos.y);
} }
override function create() override function create()