From 5160fd02d4c21de10f40e3b6817d3ddf405c82f4 Mon Sep 17 00:00:00 2001 From: TheGalo X <88469278+TheGaloXx@users.noreply.github.com> Date: Tue, 7 May 2024 23:17:49 -0300 Subject: [PATCH 1/9] fix window tween --- source/funkin/ui/title/TitleState.hx | 1 + 1 file changed, 1 insertion(+) diff --git a/source/funkin/ui/title/TitleState.hx b/source/funkin/ui/title/TitleState.hx index 964e0eeca..49bef5e4a 100644 --- a/source/funkin/ui/title/TitleState.hx +++ b/source/funkin/ui/title/TitleState.hx @@ -283,6 +283,7 @@ class TitleState extends MusicBeatState if (FlxG.keys.justPressed.Y) { + FlxTween.cancelTweensOf(FlxG.stage.window, ['x', 'y']); FlxTween.tween(FlxG.stage.window, {x: FlxG.stage.window.x + 300}, 1.4, {ease: FlxEase.quadInOut, type: PINGPONG, startDelay: 0.35}); FlxTween.tween(FlxG.stage.window, {y: FlxG.stage.window.y + 100}, 0.7, {ease: FlxEase.quadInOut, type: PINGPONG}); } From e2613fa8fb4d3ab9b7f4cf110893cbb9e25ba632 Mon Sep 17 00:00:00 2001 From: EliteMasterEric Date: Tue, 7 May 2024 23:45:35 -0400 Subject: [PATCH 2/9] Fix an issue with an improper version of funkVis --- hmm.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hmm.json b/hmm.json index c359d7a51..a6e4467a9 100644 --- a/hmm.json +++ b/hmm.json @@ -49,7 +49,7 @@ "name": "funkin.vis", "type": "git", "dir": null, - "ref": "98c9db09f0bbfedfe67a84538a5814aaef80bdea", + "ref": "2aa654b974507ab51ab1724d2d97e75726fd7d78", "url": "https://github.com/FunkinCrew/funkVis" }, { From 2743a853bcaf87e0ecc908ca232ce748e12deabc Mon Sep 17 00:00:00 2001 From: Burgerballs <107233412+Burgerballs@users.noreply.github.com> Date: Wed, 8 May 2024 06:03:12 +0100 Subject: [PATCH 3/9] Fix some spaghetti on PlayAnimationSongEvent --- .../play/event/PlayAnimationSongEvent.hx | 18 +++--------------- 1 file changed, 3 insertions(+), 15 deletions(-) diff --git a/source/funkin/play/event/PlayAnimationSongEvent.hx b/source/funkin/play/event/PlayAnimationSongEvent.hx index 4e6669479..4ced26b2d 100644 --- a/source/funkin/play/event/PlayAnimationSongEvent.hx +++ b/source/funkin/play/event/PlayAnimationSongEvent.hx @@ -31,25 +31,13 @@ class PlayAnimationSongEvent extends SongEvent switch (targetName) { - case 'boyfriend': + case 'boyfriend' || 'bf' || 'player': trace('Playing animation $anim on boyfriend.'); target = PlayState.instance.currentStage.getBoyfriend(); - case 'bf': - trace('Playing animation $anim on boyfriend.'); - target = PlayState.instance.currentStage.getBoyfriend(); - case 'player': - trace('Playing animation $anim on boyfriend.'); - target = PlayState.instance.currentStage.getBoyfriend(); - case 'dad': + case 'dad' || 'opponent': trace('Playing animation $anim on dad.'); target = PlayState.instance.currentStage.getDad(); - case 'opponent': - trace('Playing animation $anim on dad.'); - target = PlayState.instance.currentStage.getDad(); - case 'girlfriend': - trace('Playing animation $anim on girlfriend.'); - target = PlayState.instance.currentStage.getGirlfriend(); - case 'gf': + case 'girlfriend' || 'gf': trace('Playing animation $anim on girlfriend.'); target = PlayState.instance.currentStage.getGirlfriend(); default: From 000e256b0e6e5d65d96f84fc7a18bfaba507d5d2 Mon Sep 17 00:00:00 2001 From: codist <50346006+ImCodist@users.noreply.github.com> Date: Wed, 8 May 2024 01:20:39 -0400 Subject: [PATCH 4/9] Fixed an issue where hold note would be invisible for a single frame. --- source/funkin/play/notes/Strumline.hx | 2 ++ 1 file changed, 2 insertions(+) diff --git a/source/funkin/play/notes/Strumline.hx b/source/funkin/play/notes/Strumline.hx index 6a18f17d5..95e0668be 100644 --- a/source/funkin/play/notes/Strumline.hx +++ b/source/funkin/play/notes/Strumline.hx @@ -576,6 +576,8 @@ class Strumline extends FlxSpriteGroup note.holdNoteSprite.hitNote = true; note.holdNoteSprite.missedNote = false; note.holdNoteSprite.alpha = 1.0; + + note.holdNoteSprite.sustainLength = (note.holdNoteSprite.strumTime + note.holdNoteSprite.fullSustainLength) - conductorInUse.songPosition; } } From 4e5531744a1e7ee2023725badfabc2219e3ac4a0 Mon Sep 17 00:00:00 2001 From: EliteMasterEric Date: Wed, 8 May 2024 03:23:00 -0400 Subject: [PATCH 5/9] Curse you burgerballs --- source/funkin/play/event/PlayAnimationSongEvent.hx | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/source/funkin/play/event/PlayAnimationSongEvent.hx b/source/funkin/play/event/PlayAnimationSongEvent.hx index 4ced26b2d..57240d399 100644 --- a/source/funkin/play/event/PlayAnimationSongEvent.hx +++ b/source/funkin/play/event/PlayAnimationSongEvent.hx @@ -31,13 +31,13 @@ class PlayAnimationSongEvent extends SongEvent switch (targetName) { - case 'boyfriend' || 'bf' || 'player': + case 'boyfriend' | 'bf' | 'player': trace('Playing animation $anim on boyfriend.'); target = PlayState.instance.currentStage.getBoyfriend(); - case 'dad' || 'opponent': + case 'dad' | 'opponent': trace('Playing animation $anim on dad.'); target = PlayState.instance.currentStage.getDad(); - case 'girlfriend' || 'gf': + case 'girlfriend' | 'gf': trace('Playing animation $anim on girlfriend.'); target = PlayState.instance.currentStage.getGirlfriend(); default: From b49fac742f0ce72386ed3dedec6efad0385de164 Mon Sep 17 00:00:00 2001 From: codist <50346006+ImCodist@users.noreply.github.com> Date: Wed, 8 May 2024 04:21:30 -0400 Subject: [PATCH 6/9] Fixed stutter once a transition to the main menu completes. --- source/funkin/ui/mainmenu/MainMenuState.hx | 4 ---- 1 file changed, 4 deletions(-) diff --git a/source/funkin/ui/mainmenu/MainMenuState.hx b/source/funkin/ui/mainmenu/MainMenuState.hx index 466dbbb90..7a21a6e8f 100644 --- a/source/funkin/ui/mainmenu/MainMenuState.hx +++ b/source/funkin/ui/mainmenu/MainMenuState.hx @@ -139,10 +139,6 @@ class MainMenuState extends MusicBeatState resetCamStuff(); - subStateClosed.add(_ -> { - resetCamStuff(); - }); - subStateOpened.add(sub -> { if (Type.getClass(sub) == FreeplayState) { From 6fdc090eccdeab76503918b4810c42114bbbaab5 Mon Sep 17 00:00:00 2001 From: nebulazorua Date: Wed, 8 May 2024 19:53:47 +0800 Subject: [PATCH 7/9] i have accidentally done this and wiped out my chart many times --- source/funkin/play/PlayState.hx | 20 ++++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) diff --git a/source/funkin/play/PlayState.hx b/source/funkin/play/PlayState.hx index 44ad819c4..c5f76710e 100644 --- a/source/funkin/play/PlayState.hx +++ b/source/funkin/play/PlayState.hx @@ -2549,12 +2549,20 @@ class PlayState extends MusicBeatSubState // Redirect to the chart editor playing the current song. if (controls.DEBUG_CHART) { - disableKeys = true; - persistentUpdate = false; - FlxG.switchState(() -> new ChartEditorState( - { - targetSongId: currentSong.id, - })); + if (isChartingMode) + { + if (FlxG.sound.music != null) FlxG.sound.music.pause(); // Don't reset song position! + PlayState.instance.close(); // This only works because PlayState is a substate! + } + else + { + disableKeys = true; + persistentUpdate = false; + FlxG.switchState(() -> new ChartEditorState( + { + targetSongId: currentSong.id, + })); + } } #end From f5143c2d7859ef51912155243b7411f1ad6d8c1d Mon Sep 17 00:00:00 2001 From: nebulazorua Date: Wed, 8 May 2024 19:56:13 +0800 Subject: [PATCH 8/9] this is better --- source/funkin/play/PlayState.hx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/source/funkin/play/PlayState.hx b/source/funkin/play/PlayState.hx index c5f76710e..0ba4e17ec 100644 --- a/source/funkin/play/PlayState.hx +++ b/source/funkin/play/PlayState.hx @@ -2552,7 +2552,7 @@ class PlayState extends MusicBeatSubState if (isChartingMode) { if (FlxG.sound.music != null) FlxG.sound.music.pause(); // Don't reset song position! - PlayState.instance.close(); // This only works because PlayState is a substate! + this.close(); // This only works because PlayState is a substate! } else { From 4d1c2c1b8841bdf95ea6107298b3632be86334c1 Mon Sep 17 00:00:00 2001 From: MadBear422 Date: Wed, 8 May 2024 15:30:40 -0700 Subject: [PATCH 9/9] Character selection fix for chart editor. --- .../charting/dialogs/ChartEditorCharacterIconSelectorMenu.hx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/source/funkin/ui/debug/charting/dialogs/ChartEditorCharacterIconSelectorMenu.hx b/source/funkin/ui/debug/charting/dialogs/ChartEditorCharacterIconSelectorMenu.hx index eb60cb6db..1edbb6c00 100644 --- a/source/funkin/ui/debug/charting/dialogs/ChartEditorCharacterIconSelectorMenu.hx +++ b/source/funkin/ui/debug/charting/dialogs/ChartEditorCharacterIconSelectorMenu.hx @@ -67,7 +67,7 @@ class ChartEditorCharacterIconSelectorMenu extends ChartEditorBaseMenu var charGrid = new Grid(); charGrid.columns = 5; - charGrid.width = 100; + charGrid.width = this.width; charSelectScroll.addComponent(charGrid); var charIds:Array = CharacterDataParser.listCharacterIds();