Merge branch 'master' into master
This commit is contained in:
commit
9ccf971e58
|
@ -96,7 +96,10 @@
|
|||
<!-- _________________________________ Custom _______________________________ -->
|
||||
|
||||
<!--Place custom nodes like icons here (higher priority to override the HaxeFlixel icon)-->
|
||||
|
||||
<icon path="art/icon.png" />
|
||||
<!-- <haxedef name="SKIP_TO_PLAYSTATE" if="debug" /> -->
|
||||
<haxedef name="NG_LOGIN" />
|
||||
|
||||
|
||||
</project>
|
||||
|
|
BIN
art/icon.png~
BIN
art/icon.png~
Binary file not shown.
Before Width: | Height: | Size: 39 KiB |
File diff suppressed because one or more lines are too long
Binary file not shown.
File diff suppressed because one or more lines are too long
Binary file not shown.
After Width: | Height: | Size: 264 KiB |
Binary file not shown.
Before Width: | Height: | Size: 152 KiB |
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
|
@ -48,6 +48,7 @@ class Alphabet extends FlxSpriteGroup
|
|||
this.text = text;
|
||||
isBold = bold;
|
||||
|
||||
|
||||
if (text != "")
|
||||
{
|
||||
if (typed)
|
||||
|
@ -122,6 +123,7 @@ class Alphabet extends FlxSpriteGroup
|
|||
_finalText = text;
|
||||
doSplitWords();
|
||||
|
||||
|
||||
// trace(arrayShit);
|
||||
|
||||
var loopNum:Int = 0;
|
||||
|
@ -138,6 +140,7 @@ class Alphabet extends FlxSpriteGroup
|
|||
xPosResetted = true;
|
||||
xPos = 0;
|
||||
curRow += 1;
|
||||
|
||||
}
|
||||
|
||||
if (splitWords[loopNum] == " ")
|
||||
|
@ -155,6 +158,7 @@ class Alphabet extends FlxSpriteGroup
|
|||
|
||||
if (AlphaCharacter.alphabet.indexOf(splitWords[loopNum].toLowerCase()) != -1 || isNumber || isSymbol)
|
||||
//if (AlphaCharacter.alphabet.contains(splitWords[loopNum].toLowerCase()) || isNumber || isSymbol)
|
||||
|
||||
{
|
||||
if (lastSprite != null && !xPosResetted)
|
||||
{
|
||||
|
|
|
@ -758,7 +758,7 @@ class ChartingState extends MusicBeatState
|
|||
|
||||
function loadJson(song:String):Void
|
||||
{
|
||||
PlayState.SONG = Song.loadFromJson(song);
|
||||
PlayState.SONG = Song.loadFromJson(song.toLowerCase(), song.toLowerCase());
|
||||
FlxG.resetState();
|
||||
}
|
||||
|
||||
|
|
|
@ -820,10 +820,12 @@ class PlayState extends MusicBeatState
|
|||
{
|
||||
trace('SONG DONE' + isStoryMode);
|
||||
|
||||
|
||||
#if !switch
|
||||
NGio.postScore(songScore, SONG.song);
|
||||
#end
|
||||
|
||||
|
||||
if (isStoryMode)
|
||||
{
|
||||
storyPlaylist.remove(storyPlaylist[0]);
|
||||
|
@ -840,6 +842,7 @@ class PlayState extends MusicBeatState
|
|||
NGio.unlockMedal(60961);
|
||||
#end
|
||||
|
||||
|
||||
FlxG.save.data.weekUnlocked = StoryMenuState.weekUnlocked;
|
||||
FlxG.save.flush();
|
||||
}
|
||||
|
|
|
@ -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("}"))
|
||||
|
|
|
@ -40,6 +40,9 @@ class TitleState extends MusicBeatState
|
|||
|
||||
var curWacky:Array<String> = [];
|
||||
|
||||
var wackyImage:FlxSprite;
|
||||
|
||||
|
||||
override public function create():Void
|
||||
{
|
||||
#if (!web)
|
||||
|
@ -54,12 +57,16 @@ class TitleState extends MusicBeatState
|
|||
|
||||
super.create();
|
||||
|
||||
|
||||
#if (!switch && !debug && NG_LOGIN)
|
||||
|
||||
var ng:NGio = new NGio(APIStuff.API, APIStuff.EncKey);
|
||||
#end
|
||||
|
||||
#if SKIP_TO_PLAYSTATE
|
||||
|
||||
FlxG.switchState(new StoryMenuState());
|
||||
|
||||
#else
|
||||
startIntro();
|
||||
#end
|
||||
|
@ -197,9 +204,11 @@ class TitleState extends MusicBeatState
|
|||
|
||||
if (pressedEnter && !transitioning && skippedIntro)
|
||||
{
|
||||
|
||||
#if !switch
|
||||
NGio.unlockMedal(60960);
|
||||
#end
|
||||
|
||||
titleText.animation.play('press');
|
||||
|
||||
FlxG.camera.flash(FlxColor.WHITE, 1);
|
||||
|
|
Loading…
Reference in New Issue