From 532093242afe5c0ec3f0608f13e183235e2c0765 Mon Sep 17 00:00:00 2001 From: Kade M Date: Thu, 24 Jun 2021 20:05:57 -0700 Subject: [PATCH 1/4] fix disappering notes on gp --- source/PlayState.hx | 33 ++++++++++++++++++++++++++------- 1 file changed, 26 insertions(+), 7 deletions(-) diff --git a/source/PlayState.hx b/source/PlayState.hx index 738b7bc9c8..ae2fda0db7 100644 --- a/source/PlayState.hx +++ b/source/PlayState.hx @@ -3184,18 +3184,37 @@ class PlayState extends MusicBeatState var directionsAccounted:Array = [false,false,false,false]; // we don't want to do judgments for more than one presses notes.forEachAlive(function(daNote:Note) - { - if (daNote.canBeHit && daNote.mustPress && !daNote.tooLate && !daNote.wasGoodHit) { - if (!directionsAccounted[daNote.noteData]) + if (daNote.canBeHit && daNote.mustPress && !daNote.tooLate && !daNote.wasGoodHit && !directionsAccounted[daNote.noteData]) { directionsAccounted[daNote.noteData] = true; - possibleNotes.push(daNote); - directionList.push(daNote.noteData); + if (directionList.contains(daNote.noteData)) + { + directionsAccounted[daNote.noteData] = true; + for (coolNote in possibleNotes) + { + if (coolNote.noteData == daNote.noteData && Math.abs(daNote.strumTime - coolNote.strumTime) < 10) + { // if it's the same note twice at < 10ms distance, just delete it + // EXCEPT u cant delete it in this loop cuz it fucks with the collection lol + dumbNotes.push(daNote); + break; + } + else if (coolNote.noteData == daNote.noteData && daNote.strumTime < coolNote.strumTime) + { // if daNote is earlier than existing note (coolNote), replace + possibleNotes.remove(coolNote); + possibleNotes.push(daNote); + break; + } + } + } + else + { + possibleNotes.push(daNote); + directionList.push(daNote.noteData); + } } - } }); - trace('notes that can be hit: ' + possibleNotes.length); + for (note in dumbNotes) { FlxG.log.add("killing dumb ass note at " + note.strumTime); From 58266f02a44bca755032f7470e077b89f3c1c472 Mon Sep 17 00:00:00 2001 From: Kade M Date: Thu, 24 Jun 2021 20:10:16 -0700 Subject: [PATCH 2/4] fix pause and disappearing notes --- source/PlayState.hx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/source/PlayState.hx b/source/PlayState.hx index ae2fda0db7..a3e3faa201 100644 --- a/source/PlayState.hx +++ b/source/PlayState.hx @@ -2007,7 +2007,7 @@ class PlayState extends MusicBeatState scoreTxt.x = (originalX - (lengthInPx / 2)) + 335; - if (FlxG.keys.justPressed.ENTER && startedCountdown && canPause) + if (controls.PAUSE && startedCountdown && canPause) { persistentUpdate = false; persistentDraw = true; @@ -2023,6 +2023,7 @@ class PlayState extends MusicBeatState openSubState(new PauseSubState(boyfriend.getScreenPosition().x, boyfriend.getScreenPosition().y)); } + if (FlxG.keys.justPressed.SEVEN) { if (useVideo) @@ -3187,7 +3188,6 @@ class PlayState extends MusicBeatState { if (daNote.canBeHit && daNote.mustPress && !daNote.tooLate && !daNote.wasGoodHit && !directionsAccounted[daNote.noteData]) { - directionsAccounted[daNote.noteData] = true; if (directionList.contains(daNote.noteData)) { directionsAccounted[daNote.noteData] = true; From 34ada16c8b178f1d2d5bbb1b47ee52e903f02652 Mon Sep 17 00:00:00 2001 From: Kade M Date: Thu, 24 Jun 2021 20:16:45 -0700 Subject: [PATCH 3/4] bump update --- docs/changelogs/changelog-1.5.4.md | 16 ++++++++++++++++ source/MainMenuState.hx | 2 +- version.downloadMe | 9 +++------ 3 files changed, 20 insertions(+), 7 deletions(-) create mode 100644 docs/changelogs/changelog-1.5.4.md diff --git a/docs/changelogs/changelog-1.5.4.md b/docs/changelogs/changelog-1.5.4.md new file mode 100644 index 0000000000..3993607f08 --- /dev/null +++ b/docs/changelogs/changelog-1.5.4.md @@ -0,0 +1,16 @@ +# Latest (master) changelog + +Changes marked with 💖 will be listed in the short version of the changelog in `version.downloadMe`. + +### Additions +- Controller Support (💖) + +### Changes +- KeyBinds don't effect menu screen options anymore. +- Updated some image assets +- Fixed spookeez audio sync + +### Bugfixes +- Fixed Input Drops/Disappering Notes (💖) +- Fixed HitGraph/Result Screen bugs +- Fixed the chart editor \ No newline at end of file diff --git a/source/MainMenuState.hx b/source/MainMenuState.hx index 18933f5e2e..ab5f444425 100644 --- a/source/MainMenuState.hx +++ b/source/MainMenuState.hx @@ -40,7 +40,7 @@ class MainMenuState extends MusicBeatState public static var nightly:String = ""; - public static var kadeEngineVer:String = "1.5.3" + nightly; + public static var kadeEngineVer:String = "1.5.4" + nightly; public static var gameVer:String = "0.2.7.1"; var magenta:FlxSprite; diff --git a/version.downloadMe b/version.downloadMe index b03f579f88..869b3f9211 100644 --- a/version.downloadMe +++ b/version.downloadMe @@ -1,6 +1,3 @@ -1.5.3; -- Score Screen -- Rewrote the entire hit ranking system -- Fixed song names so they don't crash -- New asset loading system -- New Logo \ No newline at end of file +1.5.4; +- Controller Support +- Fixed Input Drops/Disappering Notes \ No newline at end of file From 1093d7aee36ec4ef4d51b155ef84f4f931a0fd0a Mon Sep 17 00:00:00 2001 From: Kade M Date: Thu, 24 Jun 2021 20:17:43 -0700 Subject: [PATCH 4/4] forgot dis --- docs/changelogs/changelog-1.5.4.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/docs/changelogs/changelog-1.5.4.md b/docs/changelogs/changelog-1.5.4.md index 3993607f08..0c4e1e9c09 100644 --- a/docs/changelogs/changelog-1.5.4.md +++ b/docs/changelogs/changelog-1.5.4.md @@ -13,4 +13,5 @@ Changes marked with 💖 will be listed in the short version of the changelog in ### Bugfixes - Fixed Input Drops/Disappering Notes (💖) - Fixed HitGraph/Result Screen bugs -- Fixed the chart editor \ No newline at end of file +- Fixed the chart editor +- Fixed HTML5 Build issues \ No newline at end of file