Merge branch 'master' into some-options

This commit is contained in:
CyndaquilDAC
2021-07-19 23:22:43 -05:00
committed by GitHub
25 changed files with 2044 additions and 355 deletions

View File

@ -84,9 +84,6 @@ class TitleState extends MusicBeatState
trace('NEWGROUNDS LOL');
#end
// var file:SMFile = SMFile.loadFile("file.sm");
// this was testing things
#if FREEPLAY
FlxG.switchState(new FreeplayState());
#elseif CHARTING
@ -303,7 +300,7 @@ class TitleState extends MusicBeatState
{
returnedData[0] = data.substring(0, data.indexOf(';'));
returnedData[1] = data.substring(data.indexOf('-'), data.length);
if (!MainMenuState.kadeEngineVer.contains(returnedData[0].trim()) && !OutdatedSubState.leftState && MainMenuState.nightly == "")
if (!MainMenuState.kadeEngineVer.contains(returnedData[0].trim()) && !OutdatedSubState.leftState)
{
trace('outdated lmao! ' + returnedData[0] + ' != ' + MainMenuState.kadeEngineVer);
OutdatedSubState.needVer = returnedData[0];