Merge branch 'Yoshubs:master' into master

Project.xml

@@ -3,7 +3,7 @@
 
 	<!-- _________________________ Application Settings _________________________ -->
 
-	<app title="Friday Night Funkin' Forever Engine" file="FunkinForever" packageName="com.ninjamuffin99.funkin" package="com.ninjamuffin99.funkin" main="Main" version="0.2.7.1" company="ninjamuffin99" />
+	<app title="Friday Night Funkin' Forever Engine" file="Forever Engine" packageName="com.ninjamuffin99.funkin" package="com.ninjamuffin99.funkin" main="Main" version="0.2.7.1" company="ninjamuffin99" />
 
 	<!--The flixel preloader is not accurate in Chrome. You can use it regularly if you embed the swf into a html file
 		or you can set the actual size of your file manually at "FlxPreloaderBase-onUpdate-bytesTotal"-->
@@ -31,6 +31,7 @@
 	<set name="BUILD_DIR" value="export" />
 	<source path="source" />
 	<assets path="assets" />
+	<assets path="FE-CrashDialog.exe" type="template" if="windows release" />
 	<!--<assets path="mods" />-->
 
 	<!-- _______________________________ Libraries ______________________________ -->
@@ -46,6 +47,9 @@
 
 	<!-- ______________________________ Haxedefines _____________________________ -->
 
+	<set name="BUILD_DIR" value="export/debug" if="debug" />
+	<set name="BUILD_DIR" value="export/release" unless="debug" />
+
 	<!--Enable the Flixel core recording system-->
 	<!--<haxedef name="FLX_RECORD" />-->
 
@@ -76,6 +80,10 @@
 	<!--Enable this for Nape release builds for a serious peformance improvement-->
 	<haxedef name="NAPE_RELEASE_BUILD" unless="debug" />
 
+	<!-- Akways enable Null Object Reference check for crash dialog -->
+	<haxedef name="HXCPP_CHECK_POINTER" if="release" />
+	<haxedef name="HXCPP_STACK_LINE" if="release" />
+
 	<!-- _________________________________ Custom _______________________________ -->
 
 	<icon path="art/icon16.png" size='16'/>

source/Init.hx

@@ -99,14 +99,14 @@ class Init extends FlxState
 			"Enables Ghost Tapping, allowing you to press inputs without missing.",
 			NOT_FORCED
 		],
-		'Diagonalscroll' => [false, 0, 'kill me'],
 		'Centered Notefield' => [false, 0, "Center the notes, disables the enemy's notes."],
 		"Custom Titlescreen" => [
-			true,
+			false,
 			0,
 			"Enables the custom Forever Engine titlescreen! (only effective with a restart)",
 			FORCED
-		]
+		],
+		'Camera-fixed Judgements' => [false, 0, ""],
 	];
 
 	public static var trueSettings:Map<String, Dynamic> = [];
@@ -157,7 +157,7 @@ class Init extends FlxState
 
 	override public function create():Void
 	{
-		FlxG.save.bind('forever', 'engine');
+		FlxG.save.bind('foreverengine-options');
 		Highscore.load();
 
 		loadSettings();
@@ -176,7 +176,15 @@ class Init extends FlxState
 		FlxG.mouse.useSystemCursor = true; // Use system cursor because it's prettier
 		FlxG.mouse.visible = false; // Hide mouse on start
 
-		Main.switchState(this, new TitleState());
+		gotoTitleScreen();
+	}
+
+	private function gotoTitleScreen()
+	{
+		if (trueSettings.get("Custom Titlescreen"))
+			Main.switchState(this, new CustomTitlescreen());
+		else
+			Main.switchState(this, new TitleState());
 	}
 
 	public static function loadSettings():Void
@@ -194,12 +202,14 @@ class Init extends FlxState
 		{
 			var settingsMap:Map<String, Dynamic> = FlxG.save.data.settings;
 			for (singularSetting in settingsMap.keys())
-				if (gameSettings.get(singularSetting)[3] != FORCED)
+				if (gameSettings.get(singularSetting) != null && gameSettings.get(singularSetting)[3] != FORCED)
 					trueSettings.set(singularSetting, FlxG.save.data.settings.get(singularSetting));
 		}
 
 		// lemme fix that for you
-		if (!Std.isOfType(trueSettings.get("Framerate Cap"), Int) || trueSettings.get("Framerate Cap") < 30)
+		if (!Std.isOfType(trueSettings.get("Framerate Cap"), Int)
+			|| trueSettings.get("Framerate Cap") < 30
+			|| trueSettings.get("Framerate Cap") > 360)
 			trueSettings.set("Framerate Cap", 30);
 
 		// 'hardcoded' ui skins

source/Main.hx

@@ -9,11 +9,19 @@ import flixel.util.FlxColor;
 import gameFolder.meta.*;
 import gameFolder.meta.data.PlayerSettings;
 import gameFolder.meta.data.dependency.Discord;
+import haxe.CallStack.StackItem;
+import haxe.CallStack;
+import haxe.io.Path;
+import lime.app.Application;
 import openfl.Assets;
 import openfl.Lib;
 import openfl.display.FPS;
 import openfl.display.Sprite;
 import openfl.events.Event;
+import openfl.events.UncaughtErrorEvent;
+import sys.FileSystem;
+import sys.io.File;
+import sys.io.Process;
 
 // Here we actually import the states and metadata, and just the metadata.
 // It's nice to have modularity so that we don't have ALL elements loaded at the same time.
@@ -60,7 +68,7 @@ class Main extends Sprite
 	public static var mainClassState:Class<FlxState> = Init; // Determine the main class state of the game
 	public static var framerate:Int = 120; // How many frames per second the game should run at.
 
-	public static var gameVersion:String = '0.2.3';
+	public static var gameVersion:String = '0.2.3.1';
 
 	public static var loadedAssets:Array<FlxBasic> = [];
 
@@ -137,6 +145,8 @@ class Main extends Sprite
 			note studders and shit its weird.
 		**/
 
+		Lib.current.loaderInfo.uncaughtErrorEvents.addEventListener(UncaughtErrorEvent.UNCAUGHT_ERROR, onCrash);
+
 		#if html5
 		framerate = 60;
 		#end
@@ -230,4 +240,61 @@ class Main extends Sprite
 			}
 			// */
 	}
+
+	function onCrash(e:UncaughtErrorEvent):Void
+	{
+		var errMsg:String = "";
+		var path:String;
+		var callStack:Array<StackItem> = CallStack.exceptionStack(true);
+		var dateNow:String = Date.now().toString();
+
+		dateNow = StringTools.replace(dateNow, " ", "_");
+		dateNow = StringTools.replace(dateNow, ":", "'");
+
+		path = "./crash/" + "FE_" + dateNow + ".txt";
+
+		for (stackItem in callStack)
+		{
+			switch (stackItem)
+			{
+				case FilePos(s, file, line, column):
+					errMsg += file + " (line " + line + ")\n";
+				default:
+					Sys.println(stackItem);
+			}
+		}
+
+		errMsg += "\nUncaught Error: " + e.error + "\nPlease report this error to the GitHub page: https://github.com/Yoshubs/Forever-Engine";
+
+		if (!FileSystem.exists("./crash/"))
+			FileSystem.createDirectory("./crash/");
+
+		File.saveContent(path, errMsg + "\n");
+
+		Sys.println(errMsg);
+		Sys.println("Crash dump saved in " + Path.normalize(path));
+
+		var crashDialoguePath:String = "FE-CrashDialog";
+
+		#if windows
+		crashDialoguePath += ".exe";
+		#end
+
+		if (FileSystem.exists("./" + crashDialoguePath))
+		{
+			Sys.println("Found crash dialog: " + crashDialoguePath);
+
+			#if linux
+			crashDialoguePath = "./" + crashDialoguePath;
+			#end
+			new Process(crashDialoguePath, [path]);
+		}
+		else
+		{
+			Sys.println("No crash dialog found! Making a simple alert instead...");
+			Application.current.window.alert(errMsg, "Error!");
+		}
+
+		Sys.exit(1);
+	}
 }

source/Paths.hx

@@ -14,7 +14,6 @@ class Paths
 {
 	// Here we set up the paths class. This will be used to
 	// Return the paths of assets and call on those assets as well.
-	// set the current song extension to either OGG or MP3 depending on the client
 	inline public static var SOUND_EXT = "ogg";
 
 	// level we're loading

source/gameFolder/gameObjects/userInterface/menu/DebugUI.hx

@@ -0,0 +1,12 @@
+package gameFolder.gameObjects.userInterface.menu;
+
+import flixel.FlxSprite;
+
+/**
+	HEAVILY BASED ON FLIXEL UI SHIT
+	check that out lol its in the same library youre using rn
+**/
+class DebugCheckmark extends FlxSprite
+{
+	//
+}

source/gameFolder/meta/data/Timings.hx

@@ -16,10 +16,10 @@ class Timings
 	// from left to right
 	// max milliseconds, score from it and percentage
 	public static var ratingsMap:Map<String, Array<Dynamic>> = [
-		"sick" => [50, 350, 100],
-		"good" => [90, 150, 50],
-		"bad" => [145, 0, -25],
-		"shit" => [180, -20, -50],
+		"sick" => [30, 350, 100],
+		"good" => [100, 150, 50],
+		"bad" => [145, 0, -75],
+		"shit" => [180, -20, -90],
 		"miss" => [200, -50, -100],
 	];