diff --git a/.gitignore b/.gitignore index 0bd494c..8052c30 100644 --- a/.gitignore +++ b/.gitignore @@ -1,12 +1,11 @@ locales/ -*.dll *.pak *.bin *.php rankurl.txt -OpenFusionClient.exe icudtl.dat version resources/app/files/rankurl.txt node_modules/ -dist/ \ No newline at end of file +dist/ +UnityBugReporter.exe \ No newline at end of file diff --git a/assets/js/serverselector.js b/assets/js/serverselector.js index 77e4f4f..ec5e606 100644 --- a/assets/js/serverselector.js +++ b/assets/js/serverselector.js @@ -4,6 +4,7 @@ var remotefs = remote.require('fs-extra'); var userdir = remote.require('app').getPath('userData'); var versionarray var serverarray +var config function enableServerListButtons() { $('#of-connect-button').removeClass('disabled'); @@ -80,9 +81,9 @@ function loadGameVersions() { } function loadConfig() { - // TODO: actually use these values - var configjson = JSON.parse(remotefs.readFileSync(userdir+"\\config.json")); - } + // load config object globally + config = JSON.parse(remotefs.readFileSync(userdir+"\\config.json")); +} function loadServerList() { var serverjson = JSON.parse(remotefs.readFileSync(userdir+"\\servers.json")); @@ -120,34 +121,36 @@ function setGameInfo(serverUUID) { var result = serverarray.filter(function(obj) {return (obj.uuid === serverUUID);})[0]; var gameversion = versionarray.filter(function(obj) {return (obj.name === result.version);})[0]; - // Cache folder renaming - var cachedir = userdir + '\\..\\..\\LocalLow\\Unity\\Web Player\\Cache'; - var curversion = cachedir + '\\Fusionfall'; - var newversion = cachedir + '\\' + gameversion.name; - var record = userdir + '\\.lastver'; + if(config['cache-swapping']) { // if cache swapping property exists AND is `true`, run cache swapping logic + // Cache folder renaming + var cachedir = userdir + '\\..\\..\\LocalLow\\Unity\\Web Player\\Cache'; + var curversion = cachedir + '\\Fusionfall'; + var newversion = cachedir + '\\' + gameversion.name; + var record = userdir + '\\.lastver'; - if (remotefs.existsSync(curversion)) { - // cache already exists - // find out what version it belongs to - if (remotefs.existsSync(record)) { - var lastversion = remotefs.readFileSync(record); - remotefs.renameSync(curversion, cachedir + '\\' + lastversion); - console.log('Cached version ' + lastversion); - } else { - console.log( - "Couldn't find last version record; cache may get overwritten" - ); + if (remotefs.existsSync(curversion)) { + // cache already exists + // find out what version it belongs to + if (remotefs.existsSync(record)) { + var lastversion = remotefs.readFileSync(record); + remotefs.renameSync(curversion, cachedir + '\\' + lastversion); + console.log('Cached version ' + lastversion); + } else { + console.log( + "Couldn't find last version record; cache may get overwritten" + ); + } } - } - if (remotefs.existsSync(newversion)) { - // rename saved cache to FusionFall - remotefs.renameSync(newversion, curversion); - console.log('Loaded cached ' + gameversion.name); - } + if (remotefs.existsSync(newversion)) { + // rename saved cache to FusionFall + remotefs.renameSync(newversion, curversion); + console.log('Loaded cached ' + gameversion.name); + } - // make note of what version we are launching for next launch - remotefs.writeFileSync(record, gameversion.name); + // make note of what version we are launching for next launch + remotefs.writeFileSync(record, gameversion.name); + } window.asseturl = gameversion.url; // gameclient.js needs to access this diff --git a/build/utils/WebPlayer/loader/_UnityWebPluginAX.ocx b/build/utils/WebPlayer/loader/_UnityWebPluginAX.ocx new file mode 100644 index 0000000..16d2c32 Binary files /dev/null and b/build/utils/WebPlayer/loader/_UnityWebPluginAX.ocx differ diff --git a/build/utils/WebPlayer/loader/npUnity3D32.dll b/build/utils/WebPlayer/loader/npUnity3D32.dll new file mode 100644 index 0000000..e910ef8 Binary files /dev/null and b/build/utils/WebPlayer/loader/npUnity3D32.dll differ diff --git a/build/utils/WebPlayer/mono/fusion-2.x.x/Data/lib/Boo.Lang.dll b/build/utils/WebPlayer/mono/fusion-2.x.x/Data/lib/Boo.Lang.dll new file mode 100644 index 0000000..e377ca6 Binary files /dev/null and b/build/utils/WebPlayer/mono/fusion-2.x.x/Data/lib/Boo.Lang.dll differ diff --git a/build/utils/WebPlayer/mono/fusion-2.x.x/Data/lib/UnityEngine.dll b/build/utils/WebPlayer/mono/fusion-2.x.x/Data/lib/UnityEngine.dll new file mode 100644 index 0000000..e8134f6 Binary files /dev/null and b/build/utils/WebPlayer/mono/fusion-2.x.x/Data/lib/UnityEngine.dll differ diff --git a/build/utils/WebPlayer/mono/fusion-2.x.x/Data/lib/UnityScript.Lang.dll b/build/utils/WebPlayer/mono/fusion-2.x.x/Data/lib/UnityScript.Lang.dll new file mode 100644 index 0000000..9f965d4 Binary files /dev/null and b/build/utils/WebPlayer/mono/fusion-2.x.x/Data/lib/UnityScript.Lang.dll differ diff --git a/build/utils/WebPlayer/mono/fusion-2.x.x/Data/lib/mscorlib.dll b/build/utils/WebPlayer/mono/fusion-2.x.x/Data/lib/mscorlib.dll new file mode 100644 index 0000000..12741c7 Binary files /dev/null and b/build/utils/WebPlayer/mono/fusion-2.x.x/Data/lib/mscorlib.dll differ diff --git a/build/utils/WebPlayer/mono/fusion-2.x.x/UnityWebPlayerUpdate.exe b/build/utils/WebPlayer/mono/fusion-2.x.x/UnityWebPlayerUpdate.exe new file mode 100644 index 0000000..ca02553 Binary files /dev/null and b/build/utils/WebPlayer/mono/fusion-2.x.x/UnityWebPlayerUpdate.exe differ diff --git a/build/utils/WebPlayer/mono/fusion-2.x.x/UnityWebPluginAX.ocx b/build/utils/WebPlayer/mono/fusion-2.x.x/UnityWebPluginAX.ocx new file mode 100644 index 0000000..bd980e6 Binary files /dev/null and b/build/utils/WebPlayer/mono/fusion-2.x.x/UnityWebPluginAX.ocx differ diff --git a/build/utils/WebPlayer/mono/fusion-2.x.x/mono-1-vc.dll b/build/utils/WebPlayer/mono/fusion-2.x.x/mono-1-vc.dll new file mode 100644 index 0000000..01e5aff Binary files /dev/null and b/build/utils/WebPlayer/mono/fusion-2.x.x/mono-1-vc.dll differ diff --git a/build/utils/WebPlayer/mono/fusion-2.x.x/npUnity3D32.dll b/build/utils/WebPlayer/mono/fusion-2.x.x/npUnity3D32.dll new file mode 100644 index 0000000..5a5c0c9 Binary files /dev/null and b/build/utils/WebPlayer/mono/fusion-2.x.x/npUnity3D32.dll differ diff --git a/build/utils/WebPlayer/mono/fusion-2.x.x/webplayer_win.dll b/build/utils/WebPlayer/mono/fusion-2.x.x/webplayer_win.dll new file mode 100644 index 0000000..b66a1c3 Binary files /dev/null and b/build/utils/WebPlayer/mono/fusion-2.x.x/webplayer_win.dll differ diff --git a/build/utils/WebPlayer/mono/fusion-2.x.x/wrap_oal.dll b/build/utils/WebPlayer/mono/fusion-2.x.x/wrap_oal.dll new file mode 100644 index 0000000..838e91e Binary files /dev/null and b/build/utils/WebPlayer/mono/fusion-2.x.x/wrap_oal.dll differ diff --git a/build/utils/WebPlayer/player/fusion-2.x.x/Data/lib/Boo.Lang.dll b/build/utils/WebPlayer/player/fusion-2.x.x/Data/lib/Boo.Lang.dll new file mode 100644 index 0000000..e377ca6 Binary files /dev/null and b/build/utils/WebPlayer/player/fusion-2.x.x/Data/lib/Boo.Lang.dll differ diff --git a/build/utils/WebPlayer/player/fusion-2.x.x/Data/lib/UnityEngine.dll b/build/utils/WebPlayer/player/fusion-2.x.x/Data/lib/UnityEngine.dll new file mode 100644 index 0000000..e8134f6 Binary files /dev/null and b/build/utils/WebPlayer/player/fusion-2.x.x/Data/lib/UnityEngine.dll differ diff --git a/build/utils/WebPlayer/player/fusion-2.x.x/Data/lib/UnityScript.Lang.dll b/build/utils/WebPlayer/player/fusion-2.x.x/Data/lib/UnityScript.Lang.dll new file mode 100644 index 0000000..9f965d4 Binary files /dev/null and b/build/utils/WebPlayer/player/fusion-2.x.x/Data/lib/UnityScript.Lang.dll differ diff --git a/build/utils/WebPlayer/player/fusion-2.x.x/UnityWebPlayerUpdate.exe b/build/utils/WebPlayer/player/fusion-2.x.x/UnityWebPlayerUpdate.exe new file mode 100644 index 0000000..ca02553 Binary files /dev/null and b/build/utils/WebPlayer/player/fusion-2.x.x/UnityWebPlayerUpdate.exe differ diff --git a/build/utils/WebPlayer/player/fusion-2.x.x/UnityWebPluginAX.ocx b/build/utils/WebPlayer/player/fusion-2.x.x/UnityWebPluginAX.ocx new file mode 100644 index 0000000..bd980e6 Binary files /dev/null and b/build/utils/WebPlayer/player/fusion-2.x.x/UnityWebPluginAX.ocx differ diff --git a/build/utils/WebPlayer/player/fusion-2.x.x/npUnity3D32.dll b/build/utils/WebPlayer/player/fusion-2.x.x/npUnity3D32.dll new file mode 100644 index 0000000..5a5c0c9 Binary files /dev/null and b/build/utils/WebPlayer/player/fusion-2.x.x/npUnity3D32.dll differ diff --git a/build/utils/WebPlayer/player/fusion-2.x.x/webplayer_win.dll b/build/utils/WebPlayer/player/fusion-2.x.x/webplayer_win.dll new file mode 100644 index 0000000..c0dc71f Binary files /dev/null and b/build/utils/WebPlayer/player/fusion-2.x.x/webplayer_win.dll differ diff --git a/build/utils/WebPlayer/player/fusion-2.x.x/wrap_oal.dll b/build/utils/WebPlayer/player/fusion-2.x.x/wrap_oal.dll new file mode 100644 index 0000000..838e91e Binary files /dev/null and b/build/utils/WebPlayer/player/fusion-2.x.x/wrap_oal.dll differ diff --git a/defaults/config.json b/defaults/config.json index 72477e6..53e485a 100644 --- a/defaults/config.json +++ b/defaults/config.json @@ -1,5 +1,5 @@ { "autoupdate-check": true, - "cache-swapping": false, - "initial-setup-completed": true + "cache-swapping": true, + "last-version-initialized": "1.4" } \ No newline at end of file diff --git a/defaults/versions.json b/defaults/versions.json index fdfb99e..cf33aa5 100644 --- a/defaults/versions.json +++ b/defaults/versions.json @@ -2,107 +2,107 @@ "versions": [ { "name": "beta-20100104", - "url": "http://ht.cdn.turner.com/ff/big/beta-20100104/" + "url": "http://cdn.dexlabs.systems/ff/big/beta-20100104/" }, { "name": "beta-20100119", - "url": "http://ht.cdn.turner.com/ff/big/beta-20100119/" + "url": "http://cdn.dexlabs.systems/ff/big/beta-20100119/" }, { "name": "beta-20100207", - "url": "http://ht.cdn.turner.com/ff/big/beta-20100207/" + "url": "http://cdn.dexlabs.systems/ff/big/beta-20100207/" }, { "name": "beta-20100307", - "url": "http://ht.cdn.turner.com/ff/big/beta-20100307/" + "url": "http://cdn.dexlabs.systems/ff/big/beta-20100307/" }, { "name": "beta-20100322", - "url": "http://ht.cdn.turner.com/ff/big/beta-20100322/" + "url": "http://cdn.dexlabs.systems/ff/big/beta-20100322/" }, { "name": "beta-20100413", - "url": "http://ht.cdn.turner.com/ff/big/beta-20100413/" + "url": "http://cdn.dexlabs.systems/ff/big/beta-20100413/" }, { "name": "beta-20100502", - "url": "http://ht.cdn.turner.com/ff/big/beta-20100502/" + "url": "http://cdn.dexlabs.systems/ff/big/beta-20100502/" }, { "name": "beta-20100524", - "url": "http://ht.cdn.turner.com/ff/big/beta-20100524/" + "url": "http://cdn.dexlabs.systems/ff/big/beta-20100524/" }, { "name": "beta-20100604", - "url": "http://ht.cdn.turner.com/ff/big/beta-20100604/" + "url": "http://cdn.dexlabs.systems/ff/big/beta-20100604/" }, { "name": "beta-20100616", - "url": "http://ht.cdn.turner.com/ff/big/beta-20100616/" + "url": "http://cdn.dexlabs.systems/ff/big/beta-20100616/" }, { "name": "beta-20100711", - "url": "http://ht.cdn.turner.com/ff/big/beta-20100711/" + "url": "http://cdn.dexlabs.systems/ff/big/beta-20100711/" }, { "name": "beta-20100728", - "url": "http://ht.cdn.turner.com/ff/big/beta-20100728/" + "url": "http://cdn.dexlabs.systems/ff/big/beta-20100728/" }, { "name": "beta-20100909", - "url": "http://ht.cdn.turner.com/ff/big/beta-20100909/" + "url": "http://cdn.dexlabs.systems/ff/big/beta-20100909/" }, { "name": "beta-20101003", - "url": "http://ht.cdn.turner.com/ff/big/beta-20101003/" + "url": "http://cdn.dexlabs.systems/ff/big/beta-20101003/" }, { "name": "beta-20101011", - "url": "http://ht.cdn.turner.com/ff/big/beta-20101011/" + "url": "http://cdn.dexlabs.systems/ff/big/beta-20101011/" }, { "name": "beta-20101028", - "url": "http://ht.cdn.turner.com/ff/big/beta-20101028/" + "url": "http://cdn.dexlabs.systems/ff/big/beta-20101028/" }, { "name": "beta-20101123", - "url": "http://ht.cdn.turner.com/ff/big/beta-20101123/" + "url": "http://cdn.dexlabs.systems/ff/big/beta-20101123/" }, { "name": "beta-20110213", - "url": "http://ht.cdn.turner.com/ff/big/beta-20110213/" + "url": "http://cdn.dexlabs.systems/ff/big/beta-20110213/" }, { "name": "beta-20110314", - "url": "http://ht.cdn.turner.com/ff/big/beta-20110314/" + "url": "http://cdn.dexlabs.systems/ff/big/beta-20110314/" }, { "name": "beta-20110330", - "url": "http://ht.cdn.turner.com/ff/big/beta-20110330/" + "url": "http://cdn.dexlabs.systems/ff/big/beta-20110330/" }, { "name": "beta-20110424", - "url": "http://ht.cdn.turner.com/ff/big/beta-20110424/" + "url": "http://cdn.dexlabs.systems/ff/big/beta-20110424/" }, { "name": "beta-20110523", - "url": "http://ht.cdn.turner.com/ff/big/beta-20110523/" + "url": "http://cdn.dexlabs.systems/ff/big/beta-20110523/" }, { "name": "beta-20110725", - "url": "http://ht.cdn.turner.com/ff/big/beta-20110725/" + "url": "http://cdn.dexlabs.systems/ff/big/beta-20110725/" }, { "name": "beta-20110818", - "url": "http://ht.cdn.turner.com/ff/big/beta-20110818/" + "url": "http://cdn.dexlabs.systems/ff/big/beta-20110818/" }, { "name": "beta-20110912", - "url": "http://ht.cdn.turner.com/ff/big/beta-20110912/" + "url": "http://cdn.dexlabs.systems/ff/big/beta-20110912/" }, { "name": "beta-20111013", - "url": "http://ht.cdn.turner.com/ff/big/beta-20111013/" + "url": "http://cdn.dexlabs.systems/ff/big/beta-20111013/" } ] } diff --git a/index.html b/index.html index 67c4919..1695e1e 100644 --- a/index.html +++ b/index.html @@ -56,7 +56,7 @@