Merge pull request #1014 from KadeDev/master

Version update

docs/changelogs/changelog-1.5.4.md

@@ -0,0 +1,17 @@
+# 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 
+- Fixed HTML5 Build issues

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;

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)
@@ -3184,18 +3185,36 @@ class PlayState extends MusicBeatState
 						var directionsAccounted:Array<Bool> = [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);

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
+1.5.4;
+- Controller Support
+- Fixed Input Drops/Disappering Notes