Merge branch 'master' into master

2020-11-02 15:37:55 -08:00
parent 2fcc73e387 589db1f26b
commit 9ccf971e58
25 changed files with 24 additions and 2 deletions
--- a/source/Song.hx
+++ b/source/Song.hx
@ -49,6 +49,7 @@ class Song

 	public static function loadFromJson(jsonInput:String, ?folder:String):SwagSong
 	{
+
 		var rawJson = Assets.getText('assets/data/' + folder.toLowerCase() + '/' + jsonInput.toLowerCase() + '.json').trim();

 		while (!rawJson.endsWith("}"))