Merge branch 'rewrite/master' into kade-github/pico-mix-bugfix

Author: EliteMasterEric

docs/CONTRIBUTING.md

@@ -60,7 +60,7 @@ This section provides guidelines to follow when [opening an issue](https://githu
 
 ## Requirements
 Make sure you're playing:
-- the latest version of the game (currently v0.6.2)
+- the latest version of the game (currently v0.6.3)
 - without any mods
 - on [Newgrounds](https://www.newgrounds.com/portal/view/770371) or downloaded from [itch.io](https://ninja-muffin24.itch.io/funkin)
 
@@ -412,4 +412,4 @@ If your PR is accepted, you will be credited as a GitHub contributor (but not as
 # Closing
 Thank you for reading the Contributing Guide.
 
-We look forward to seeing your contributions to the game!
+We look forward to seeing your contributions to the game!

hmm.json

@@ -143,7 +143,7 @@
       "name": "lime",
       "type": "git",
       "dir": null,
-      "ref": "1e79c20a6ee13fa168535f9f76a368e3284ddc3a",
+      "ref": "be81ad7e4e1a92c3482bcc009648a4ac892cfa35",
       "url": "https://github.com/FunkinCrew/lime"
     },
     {

project.hxp

@@ -25,7 +25,7 @@ class Project extends HXProject {
 	 * REMEMBER TO CHANGE THIS WHEN THE GAME UPDATES!
 	 * You only have to change it here, the rest of the game will query this value.
 	 */
-	static final VERSION:String = "0.6.2";
+	static final VERSION:String = "0.6.3";
 
 	/**
 	 * The game's name. Used as the default window title.

source/funkin/play/PlayState.hx

@@ -875,6 +875,10 @@ class PlayState extends MusicBeatSubState
       // Delete all notes and reset the arrays.
       regenNoteData();
 
+      // so the song doesn't start too early :D
+      Conductor.instance.update(-5000, false);
+
+
       // Reset camera zooming
       cameraBopIntensity = Constants.DEFAULT_BOP_INTENSITY;
       hudCameraZoomIntensity = (cameraBopIntensity - 1.0) * 2.0;
@@ -883,11 +887,27 @@ class PlayState extends MusicBeatSubState
       health = Constants.HEALTH_STARTING;
       songScore = 0;
       Highscore.tallies.combo = 0;
-      Countdown.performCountdown();
+      // timer for vwoosh
+      var vwooshTimer = new FlxTimer();
+      vwooshTimer.start(0.5, function(t:FlxTimer) {
+        Conductor.instance.update(startTimestamp - Conductor.instance.combinedOffset, false);
+        if (playerStrumline.notes.length == 0) playerStrumline.updateNotes();
+        if (opponentStrumline.notes.length == 0) opponentStrumline.updateNotes();
+        playerStrumline.vwooshInNotes();
+        opponentStrumline.vwooshInNotes();
+        Countdown.performCountdown();
+      });
+
 
       // Reset the health icons.
+      if (currentStage.getBoyfriend() != null)
+      {
       currentStage.getBoyfriend().initHealthIcon(false);
+      }
+      if (currentStage.getDad() != null)
+      {
       currentStage.getDad().initHealthIcon(true);
+      }
 
       needsReset = false;
     }

source/funkin/play/notes/NoteSprite.hx

@@ -104,6 +104,11 @@ class NoteSprite extends FunkinSprite
     return noteData.length > 0;
   }
 
+  /**
+   * The Y Offset of the note.
+   */
+  public var yOffset:Float = 0.0;
+
   /**
    * Set this flag to true when hitting the note to avoid scoring it multiple times.
    */