cowarin/Funkin
1
0
Fork 0
mirror of https://github.com/ninjamuffin99/Funkin.git synced 2024-11-15 19:33:36 +00:00
Code Issues Releases Wiki Activity

Merge branch 'rewrite/master' into ninjamuffin99/funk-195

Browse source
This commit is contained in:
Cameron Taylor 2024-06-25 13:48:06 -04:00 committed by GitHub
parent aa3e3eb9b6 da834dab8d
commit e862963c16
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 11 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
hmm.json
View file

@ -44,7 +44,7 @@
"name": "FlxPartialSound", "name": "FlxPartialSound",
"type": "git", "type": "git",
"dir": null, "dir": null,
"ref": "f986332ba5ab02abd386ce662578baf04904604a", "ref": "a1eab7b9bf507b87200a3341719054fe427f3b15",
"url": "https://github.com/FunkinCrew/FlxPartialSound.git" "url": "https://github.com/FunkinCrew/FlxPartialSound.git"
}, },
{ {

4
source/funkin/ui/freeplay/SongMenuItem.hx
View file

@ -213,6 +213,7 @@ class SongMenuItem extends FlxSpriteGroup
favIconBlurred.frames = Paths.getSparrowAtlas('freeplay/favHeart'); favIconBlurred.frames = Paths.getSparrowAtlas('freeplay/favHeart');
favIconBlurred.animation.addByPrefix('fav', 'favorite heart', 24, false); favIconBlurred.animation.addByPrefix('fav', 'favorite heart', 24, false);
favIconBlurred.animation.play('fav'); favIconBlurred.animation.play('fav');
favIconBlurred.setGraphicSize(50, 50); favIconBlurred.setGraphicSize(50, 50);
favIconBlurred.blend = BlendMode.ADD; favIconBlurred.blend = BlendMode.ADD;
favIconBlurred.shader = new GaussianBlurShader(1.2); favIconBlurred.shader = new GaussianBlurShader(1.2);
@ -516,6 +517,9 @@ class SongMenuItem extends FlxSpriteGroup
updateDifficultyRating(songData?.difficultyRating ?? 0); updateDifficultyRating(songData?.difficultyRating ?? 0);
updateScoringRank(songData?.scoringRank); updateScoringRank(songData?.scoringRank);
newText.visible = songData?.isNew; newText.visible = songData?.isNew;
favIcon.animation.curAnim.curFrame = favIcon.animation.curAnim.numFrames - 1;
favIconBlurred.animation.curAnim.curFrame = favIconBlurred.animation.curAnim.numFrames - 1;
// Update opacity, offsets, etc. // Update opacity, offsets, etc.
updateSelected(); updateSelected();

10
source/funkin/ui/mainmenu/MainMenuState.hx
View file

@ -153,6 +153,9 @@ class MainMenuState extends MusicBeatState
resetCamStuff(); resetCamStuff();
// reset camera when debug menu is closed
subStateClosed.add(_ -> resetCamStuff(false));
subStateOpened.add(sub -> { subStateOpened.add(sub -> {
if (Type.getClass(sub) == FreeplayState) if (Type.getClass(sub) == FreeplayState)
{ {
@ -182,10 +185,11 @@ class MainMenuState extends MusicBeatState
}); });
} }
function resetCamStuff():Void function resetCamStuff(?snap:Bool = true):Void
{ {
FlxG.camera.follow(camFollow, null, 0.06); FlxG.camera.follow(camFollow, null, 0.06);
FlxG.camera.snapToTarget();
if (snap) FlxG.camera.snapToTarget();
} }
function createMenuItem(name:String, atlas:String, callback:Void->Void, fireInstantly:Bool = false):Void function createMenuItem(name:String, atlas:String, callback:Void->Void, fireInstantly:Bool = false):Void
@ -344,8 +348,6 @@ class MainMenuState extends MusicBeatState
persistentUpdate = false; persistentUpdate = false;
FlxG.state.openSubState(new DebugMenuSubState()); FlxG.state.openSubState(new DebugMenuSubState());
// reset camera when debug menu is closed
subStateClosed.addOnce(_ -> resetCamStuff());
} }
#end #end