From 90595949f19e7caa57e85646c5fe5b756a83d57c Mon Sep 17 00:00:00 2001 From: ericrius1 Date: Mon, 30 Nov 2015 18:14:57 -0800 Subject: [PATCH] moved exterminator game out of dry lake --- .../games}/exterminatorGame/gameServer/.gitignore | 0 .../games}/exterminatorGame/gameServer/Procfile | 0 .../games}/exterminatorGame/gameServer/README.txt | 0 .../games}/exterminatorGame/gameServer/app.js | 0 .../games}/exterminatorGame/gameServer/client/app.jsx | 0 .../games}/exterminatorGame/gameServer/gulpfile.js | 0 .../games}/exterminatorGame/gameServer/package.json | 0 .../games}/exterminatorGame/gameServer/public/css/style.css | 0 .../games}/exterminatorGame/gameServer/public/index.html | 0 .../games}/exterminatorGame/gameServer/public/js/app.js | 0 .../{drylake => example/games}/exterminatorGame/pistol.js | 4 ++-- .../games}/exterminatorGame/pistolScriptSpawner.js | 0 .../games}/exterminatorGame/pistolScriptSpawnerSpawner.js | 0 examples/toybox/pistol/{pistolSpawner.js => createPistol.js} | 0 unpublishedScripts/hiddenEntityReset.js | 2 +- unpublishedScripts/masterReset.js | 2 +- 16 files changed, 4 insertions(+), 4 deletions(-) rename examples/{drylake => example/games}/exterminatorGame/gameServer/.gitignore (100%) rename examples/{drylake => example/games}/exterminatorGame/gameServer/Procfile (100%) rename examples/{drylake => example/games}/exterminatorGame/gameServer/README.txt (100%) rename examples/{drylake => example/games}/exterminatorGame/gameServer/app.js (100%) rename examples/{drylake => example/games}/exterminatorGame/gameServer/client/app.jsx (100%) rename examples/{drylake => example/games}/exterminatorGame/gameServer/gulpfile.js (100%) rename examples/{drylake => example/games}/exterminatorGame/gameServer/package.json (100%) rename examples/{drylake => example/games}/exterminatorGame/gameServer/public/css/style.css (100%) rename examples/{drylake => example/games}/exterminatorGame/gameServer/public/index.html (100%) rename examples/{drylake => example/games}/exterminatorGame/gameServer/public/js/app.js (100%) rename examples/{drylake => example/games}/exterminatorGame/pistol.js (99%) rename examples/{drylake => example/games}/exterminatorGame/pistolScriptSpawner.js (100%) rename examples/{drylake => example/games}/exterminatorGame/pistolScriptSpawnerSpawner.js (100%) rename examples/toybox/pistol/{pistolSpawner.js => createPistol.js} (100%) diff --git a/examples/drylake/exterminatorGame/gameServer/.gitignore b/examples/example/games/exterminatorGame/gameServer/.gitignore similarity index 100% rename from examples/drylake/exterminatorGame/gameServer/.gitignore rename to examples/example/games/exterminatorGame/gameServer/.gitignore diff --git a/examples/drylake/exterminatorGame/gameServer/Procfile b/examples/example/games/exterminatorGame/gameServer/Procfile similarity index 100% rename from examples/drylake/exterminatorGame/gameServer/Procfile rename to examples/example/games/exterminatorGame/gameServer/Procfile diff --git a/examples/drylake/exterminatorGame/gameServer/README.txt b/examples/example/games/exterminatorGame/gameServer/README.txt similarity index 100% rename from examples/drylake/exterminatorGame/gameServer/README.txt rename to examples/example/games/exterminatorGame/gameServer/README.txt diff --git a/examples/drylake/exterminatorGame/gameServer/app.js b/examples/example/games/exterminatorGame/gameServer/app.js similarity index 100% rename from examples/drylake/exterminatorGame/gameServer/app.js rename to examples/example/games/exterminatorGame/gameServer/app.js diff --git a/examples/drylake/exterminatorGame/gameServer/client/app.jsx b/examples/example/games/exterminatorGame/gameServer/client/app.jsx similarity index 100% rename from examples/drylake/exterminatorGame/gameServer/client/app.jsx rename to examples/example/games/exterminatorGame/gameServer/client/app.jsx diff --git a/examples/drylake/exterminatorGame/gameServer/gulpfile.js b/examples/example/games/exterminatorGame/gameServer/gulpfile.js similarity index 100% rename from examples/drylake/exterminatorGame/gameServer/gulpfile.js rename to examples/example/games/exterminatorGame/gameServer/gulpfile.js diff --git a/examples/drylake/exterminatorGame/gameServer/package.json b/examples/example/games/exterminatorGame/gameServer/package.json similarity index 100% rename from examples/drylake/exterminatorGame/gameServer/package.json rename to examples/example/games/exterminatorGame/gameServer/package.json diff --git a/examples/drylake/exterminatorGame/gameServer/public/css/style.css b/examples/example/games/exterminatorGame/gameServer/public/css/style.css similarity index 100% rename from examples/drylake/exterminatorGame/gameServer/public/css/style.css rename to examples/example/games/exterminatorGame/gameServer/public/css/style.css diff --git a/examples/drylake/exterminatorGame/gameServer/public/index.html b/examples/example/games/exterminatorGame/gameServer/public/index.html similarity index 100% rename from examples/drylake/exterminatorGame/gameServer/public/index.html rename to examples/example/games/exterminatorGame/gameServer/public/index.html diff --git a/examples/drylake/exterminatorGame/gameServer/public/js/app.js b/examples/example/games/exterminatorGame/gameServer/public/js/app.js similarity index 100% rename from examples/drylake/exterminatorGame/gameServer/public/js/app.js rename to examples/example/games/exterminatorGame/gameServer/public/js/app.js diff --git a/examples/drylake/exterminatorGame/pistol.js b/examples/example/games/exterminatorGame/pistol.js similarity index 99% rename from examples/drylake/exterminatorGame/pistol.js rename to examples/example/games/exterminatorGame/pistol.js index 02750b18e1..365e29fbe5 100644 --- a/examples/drylake/exterminatorGame/pistol.js +++ b/examples/example/games/exterminatorGame/pistol.js @@ -13,8 +13,8 @@ // -Script.include("../../libraries/utils.js"); -Script.include("../../libraries/constants.js"); +Script.include("../../../libraries/utils.js"); +Script.include("../../../libraries/constants.js"); var GUN_FORCE =20; diff --git a/examples/drylake/exterminatorGame/pistolScriptSpawner.js b/examples/example/games/exterminatorGame/pistolScriptSpawner.js similarity index 100% rename from examples/drylake/exterminatorGame/pistolScriptSpawner.js rename to examples/example/games/exterminatorGame/pistolScriptSpawner.js diff --git a/examples/drylake/exterminatorGame/pistolScriptSpawnerSpawner.js b/examples/example/games/exterminatorGame/pistolScriptSpawnerSpawner.js similarity index 100% rename from examples/drylake/exterminatorGame/pistolScriptSpawnerSpawner.js rename to examples/example/games/exterminatorGame/pistolScriptSpawnerSpawner.js diff --git a/examples/toybox/pistol/pistolSpawner.js b/examples/toybox/pistol/createPistol.js similarity index 100% rename from examples/toybox/pistol/pistolSpawner.js rename to examples/toybox/pistol/createPistol.js diff --git a/unpublishedScripts/hiddenEntityReset.js b/unpublishedScripts/hiddenEntityReset.js index 9e20f3f7e8..b06b138811 100644 --- a/unpublishedScripts/hiddenEntityReset.js +++ b/unpublishedScripts/hiddenEntityReset.js @@ -14,7 +14,7 @@ var _this; - var gunScriptURL = Script.resolvePath("../examples/weapons/pistol/pistol.js"); + var gunScriptURL = Script.resolvePath("../examples/toybox/pistol/pistol.js"); var sprayPaintScriptURL = Script.resolvePath("../examples/toybox/spray_paint/sprayPaintCan.js"); var catScriptURL = Script.resolvePath("../examples/toybox/cat/cat.js"); var flashlightScriptURL = Script.resolvePath('../examples/toybox/flashlight/flashlight.js'); diff --git a/unpublishedScripts/masterReset.js b/unpublishedScripts/masterReset.js index ea164823d5..00d9ba83f1 100644 --- a/unpublishedScripts/masterReset.js +++ b/unpublishedScripts/masterReset.js @@ -14,7 +14,7 @@ var utilitiesScript = Script.resolvePath("../examples/libraries/utils.js"); Script.include(utilitiesScript); -var gunScriptURL = Script.resolvePath("../examples/weapons/pistol/pistol.js"); +var gunScriptURL = Script.resolvePath("../examples/toybox/pistol/pistol.js"); var sprayPaintScriptURL = Script.resolvePath("../examples/toybox/spray_paint/sprayPaintCan.js"); var catScriptURL = Script.resolvePath("../examples/toybox/cat/cat.js"); var flashlightScriptURL = Script.resolvePath('../examples/toybox/flashlight/flashlight.js');