mirror of
https://github.com/ninjamuffin99/Funkin.git
synced 2024-11-19 21:33:06 +00:00
Merge branch 'rewrite/master' into input-offsets
This commit is contained in:
commit
6ac24141f4
2
hmm.json
2
hmm.json
|
@ -149,7 +149,7 @@
|
|||
"name": "polymod",
|
||||
"type": "git",
|
||||
"dir": null,
|
||||
"ref": "6cec79e4f322fbb262170594ed67ab72b4714810",
|
||||
"ref": "0b53e478bc375ec51b760b650201ac7a965d2ef4",
|
||||
"url": "https://github.com/larsiusprime/polymod"
|
||||
},
|
||||
{
|
||||
|
|
|
@ -33,8 +33,10 @@ class Main extends Sprite
|
|||
|
||||
public static function main():Void
|
||||
{
|
||||
haxe.Log.trace = funkin.util.logging.AnsiTrace.trace;
|
||||
funkin.util.logging.AnsiTrace.traceBF();
|
||||
// We need to make the crash handler LITERALLY FIRST so nothing EVER gets past it.
|
||||
CrashHandler.initialize();
|
||||
CrashHandler.queryStatus();
|
||||
|
||||
Lib.current.addChild(new Main());
|
||||
}
|
||||
|
||||
|
@ -42,7 +44,12 @@ class Main extends Sprite
|
|||
{
|
||||
super();
|
||||
|
||||
// TODO: Replace this with loadEnabledMods().
|
||||
// Initialize custom logging.
|
||||
haxe.Log.trace = funkin.util.logging.AnsiTrace.trace;
|
||||
funkin.util.logging.AnsiTrace.traceBF();
|
||||
|
||||
// Load mods to override assets.
|
||||
// TODO: Replace with loadEnabledMods() once the user can configure the mod list.
|
||||
funkin.modding.PolymodHandler.loadAllMods();
|
||||
|
||||
if (stage != null)
|
||||
|
@ -82,10 +89,6 @@ class Main extends Sprite
|
|||
* -Eric
|
||||
*/
|
||||
|
||||
CrashHandler.initialize();
|
||||
|
||||
CrashHandler.queryStatus();
|
||||
|
||||
initHaxeUI();
|
||||
|
||||
fpsCounter = new FPS(10, 3, 0xFFFFFF);
|
||||
|
|
Loading…
Reference in a new issue