Merge pull request #743 from KadeDev/stable

add em

assets/preload/data/freeplaySonglist.txt

@@ -6,7 +6,7 @@ Spookeez:spooky:2
 South:spooky:2
 Monster:monster:2
 Pico:pico:3
-Philly Nice:pico:3
+Philly:pico:3
 Blammed:pico:3
 Satin Panties:mom:4
 High:mom:4

docs/changelogs/changelog-1.5.0.md

@@ -20,7 +20,6 @@ Changes marked with 💖 will be listed in the short version of the changelog in
 - [PR #431](https://github.com/KadeDev/Kade-Engine/pull/431): Add Max NPS counter
 - [PR #447](https://github.com/KadeDev/Kade-Engine/pull/447): New outdated version screen with small patch notes
 - (maybe 💖) [PR #490](https://github.com/KadeDev/Kade-Engine/pull/490): Bring back `R` to reset, but now you can toggle it in the options
-- [PR #513](https://github.com/KadeDev/Kade-Engine/pull/513): Alt animations can now have idles
 - [PR #551](https://github.com/KadeDev/Kade-Engine/pull/551): Add setActorScaleXY, setActorFlipX, setActorFlipY, setStrumlineY to lua modcharts
 - [PR #582](https://github.com/KadeDev/Kade-Engine/pull/582): Add changeDadCharacter, changeBoyfriendCharacter, keyPressed to lua modcharts
 - [PR #603](https://github.com/KadeDev/Kade-Engine/pull/603) and [PR #604](https://github.com/KadeDev/Kade-Engine/pull/604): Add note shifting to the chart editor

docs/changelogs/changelog-1.5.1.md

@@ -0,0 +1,14 @@
+# Latest changelog
+
+Changes marked with 💖 will be listed in the short version of the changelog in `version.downloadMe`.
+
+### Changes
+- Changed package from `com.ninjamuffin99.funkin` to `com.kadedev.kadeengine`
+
+### Bugfixes
+- You can no longer bind keys like enter or escape (fixes crash that happened when you did)
+- Fixed score display
+- Fixed bug with spooky kids' dance
+- Fixed week 4 and 6 sprite issues
+- Made web builds work again
+- Game Play Customiziation works now.

docs/changelogs/latest.md

@@ -1,3 +1 @@
 # Latest changelog
-
-Changes marked with 💖 will be listed in the short version of the changelog in `version.downloadMe`.

source/Controls.hx

@@ -571,6 +571,7 @@ class Controls extends FlxActionSet
 		//trace(FlxKey.fromString(FlxG.save.data.upBind));
 
 		removeKeyboard();
+		KeyBinds.keyCheck();
 	
 		inline bindKeys(Control.UP, [FlxKey.fromString(FlxG.save.data.upBind), FlxKey.UP]);
 		inline bindKeys(Control.DOWN, [FlxKey.fromString(FlxG.save.data.downBind), FlxKey.DOWN]);

source/FreeplayState.hx

@@ -202,6 +202,8 @@ class FreeplayState extends MusicBeatState
 
 		if (accepted)
 		{
+			trace(StringTools.replace(songs[curSelected].songName," ", "-").toLowerCase());
+
 			var poop:String = Highscore.formatSong(StringTools.replace(songs[curSelected].songName," ", "-").toLowerCase(), curDifficulty);
 
 			trace(poop);

source/MainMenuState.hx

@@ -37,9 +37,9 @@ class MainMenuState extends MusicBeatState
 	var newGaming2:FlxText;
 	public static var firstStart:Bool = true;
 
-	public static var nightly:String = "-nightly-development";
+	public static var nightly:String = "";
 
-	public static var kadeEngineVer:String = "1.5" + nightly;
+	public static var kadeEngineVer:String = "1.5.1" + nightly;
 	public static var gameVer:String = "0.2.7.1";
 
 	var magenta:FlxSprite;

source/PlayState.hx

@@ -859,8 +859,15 @@ class PlayState extends MusicBeatState
 
 		// startCountdown();
 
+		if (SONG.song == null)
+			trace('song is null???');
+		else
+			trace('song looks gucci');
+
 		generateSong(SONG.song);
 
+		trace('generated');
+
 		// add(strumLine);
 
 		camFollow = new FlxObject(0, 0, 1, 1);
@@ -987,6 +994,8 @@ class PlayState extends MusicBeatState
 		// cameras = [FlxG.cameras.list[1]];
 		startingSong = true;
 		
+		trace('starting');
+
 		if (isStoryMode)
 		{
 			switch (curSong.toLowerCase())
@@ -1345,6 +1354,8 @@ class PlayState extends MusicBeatState
 		else
 			vocals = new FlxSound();
 
+		trace('loaded vocals');
+
 		FlxG.sound.list.add(vocals);
 
 		notes = new FlxTypedGroup<Note>();
@@ -1359,7 +1370,7 @@ class PlayState extends MusicBeatState
 
 		// Per song offset check
 		#if windows
-			var songPath = 'assets/data/' + PlayState.SONG.song.toLowerCase() + '/';
+			var songPath = 'assets/data/' + StringTools.replace(PlayState.SONG.song," ", "-").toLowerCase() + '/';
 			for(file in sys.FileSystem.readDirectory(songPath))
 			{
 				var path = haxe.io.Path.join([songPath, file]);

source/Song.hx

@@ -46,6 +46,8 @@ class Song
 
 	public static function loadFromJson(jsonInput:String, ?folder:String):SwagSong
 	{
+		trace('loading ' + folder.toLowerCase() + '/' + jsonInput.toLowerCase());
+
 		var rawJson = Assets.getText(Paths.json(folder.toLowerCase() + '/' + jsonInput.toLowerCase())).trim();
 
 		while (!rawJson.endsWith("}"))