diff --git a/compile-js-rel.hxml b/compile-js-rel.hxml index 49a4cfa0..515446b3 100644 --- a/compile-js-rel.hxml +++ b/compile-js-rel.hxml @@ -2,6 +2,8 @@ -lib heaps -lib stb_ogg_sound -lib zip +-lib datachannel +-lib colyseus-websocket -lib uglifyjs --js marblegame.js -D windowSize=1280x720 diff --git a/src/MarbleWorld.hx b/src/MarbleWorld.hx index e623f7af..69b640e1 100644 --- a/src/MarbleWorld.hx +++ b/src/MarbleWorld.hx @@ -2083,7 +2083,7 @@ class MarbleWorld extends Scheduler { #if js lock = true; - var loadPerTick = 500; // Stack limits??? + var loadPerTick = 100; // Stack limits??? var loadedFuncs = 0; var func = this.resourceLoadFuncs.shift(); diff --git a/src/net/MasterServerClient.hx b/src/net/MasterServerClient.hx index 2b277714..c1870e6f 100644 --- a/src/net/MasterServerClient.hx +++ b/src/net/MasterServerClient.hx @@ -22,11 +22,11 @@ typedef RemoteServerInfo = { } class MasterServerClient { - // #if js - // static var serverIp = "wss://mbomaster.randomityguy.me:8443"; - // #else + #if js + static var serverIp = "wss://mbpmaster.randomityguy.me:8443"; + #else static var serverIp = "ws://89.58.58.191:8084"; - // #end + #end public static var instance:MasterServerClient; var ws:WebSocket;