Mirrors/overte-JulianGro
3
0
Fork 0
mirror of https://github.com/JulianGro/overte.git synced 2025-05-28 06:31:30 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

rename /toys to /toybox, remove non toybox scripts, update master refs

Browse source
This commit is contained in:
James B. Pollack 2015-10-21 11:36:49 -07:00
parent 970d189262
commit 384a6a8154
31 changed files with 23 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
examples/toys/breakdanceCore.js → examples/entityScripts/breakdanceCore.js
View file

@ -1,6 +1,5 @@
// //
// breakdanceCore.js // breakdanceCore.js
// examples/toys
// //
// This is the core breakdance game library, it can be used as part of an entity script, or an omniTool module, or bootstapped on it's own // This is the core breakdance game library, it can be used as part of an entity script, or an omniTool module, or bootstapped on it's own
// Created by Brad Hefta-Gaub on August 24, 2015 // Created by Brad Hefta-Gaub on August 24, 2015

0
examples/toys/breakdanceToy.js → examples/entityScripts/breakdanceToy.js
View file

0
examples/toys/grenade.js → examples/entityScripts/grenade.js
View file

8
examples/toys/magBalls.js → examples/entityScripts/magBalls.js
View file

@ -7,10 +7,10 @@
// //
// FIXME Script paths have to be relative to the caller, in this case libraries/OmniTool.js // FIXME Script paths have to be relative to the caller, in this case libraries/OmniTool.js
Script.include("../toys/magBalls/constants.js"); Script.include("../entityScripts/magBalls/constants.js");
Script.include("../toys/magBalls/graph.js"); Script.include("../entityScripts/magBalls/graph.js");
Script.include("../toys/magBalls/edgeSpring.js"); Script.include("../entityScripts/magBalls/edgeSpring.js");
Script.include("../toys/magBalls/magBalls.js"); Script.include("../entityScripts/magBalls/magBalls.js");
Script.include("avatarRelativeOverlays.js"); Script.include("avatarRelativeOverlays.js");
OmniToolModuleType = "MagBallsController" OmniToolModuleType = "MagBallsController"

0
examples/toys/magBalls/constants.js → examples/entityScripts/magBalls/constants.js
View file

0
examples/toys/magBalls/debugUtils.js → examples/entityScripts/magBalls/debugUtils.js
View file

0
examples/toys/magBalls/edgeSpring.js → examples/entityScripts/magBalls/edgeSpring.js
View file

0
examples/toys/magBalls/graph.js → examples/entityScripts/magBalls/graph.js
View file

0
examples/toys/magBalls/magBalls.js → examples/entityScripts/magBalls/magBalls.js
View file

0
examples/toys/AC_scripts/flickeringLight.js → examples/toybox/AC_scripts/flickeringLight.js
View file

0
examples/toys/AC_scripts/originalPositionResetter.js → examples/toybox/AC_scripts/originalPositionResetter.js
View file

0
examples/toys/AC_scripts/toybox_sounds.js → examples/toybox/AC_scripts/toybox_sounds.js
View file

0
examples/toys/basketball/createHoop.js → examples/toybox/basketball/createHoop.js
View file

0
examples/toys/basketball/createRack.js → examples/toybox/basketball/createRack.js
View file

0
examples/toys/basketball/createSingleBasketball.js → examples/toybox/basketball/createSingleBasketball.js
View file

0
examples/toys/blockers/createTestBlocks.js → examples/toybox/blockers/createTestBlocks.js
View file

0
examples/toys/bubblewand/createWand.js → examples/toybox/bubblewand/createWand.js
View file

0
examples/toys/bubblewand/wand.js → examples/toybox/bubblewand/wand.js
View file

0
examples/toys/cat.js → examples/toybox/cat/cat.js
View file

0
examples/toys/doll/createDoll.js → examples/toybox/doll/createDoll.js
View file

0
examples/toys/doll/doll.js → examples/toybox/doll/doll.js
View file

0
examples/toys/flashlight/createFlashlight.js → examples/toybox/flashlight/createFlashlight.js
View file

0
examples/toys/flashlight/flashlight.js → examples/toybox/flashlight/flashlight.js
View file

2
examples/toys/lightSwitch.js → examples/toybox/lights/lightSwitch.js
View file

@ -17,7 +17,7 @@
(function () { (function () {
var _this; var _this;
var utilitiesScript = Script.resolvePath("../libraries/utils.js"); var utilitiesScript = Script.resolvePath("../../libraries/utils.js");
Script.include(utilitiesScript); Script.include(utilitiesScript);
LightSwitch = function () { LightSwitch = function () {
_this = this; _this = this;

0
examples/toys/ping_pong_gun/createPingPongGun.js → examples/toybox/ping_pong_gun/createPingPongGun.js
View file

0
examples/toys/ping_pong_gun/createTargets.js → examples/toybox/ping_pong_gun/createTargets.js
View file

0
examples/toys/ping_pong_gun/pingPongGun.js → examples/toybox/ping_pong_gun/pingPongGun.js
View file

0
examples/toys/ping_pong_gun/wallTarget.js → examples/toybox/ping_pong_gun/wallTarget.js
View file

2
examples/toys/sprayPaintCan.js → examples/toybox/spray_paint/sprayPaintCan.js
View file

@ -13,7 +13,7 @@
// Script.include("../libraries/utils.js"); // Script.include("../libraries/utils.js");
//Need absolute path for now, for testing before PR merge and s3 cloning. Will change post-merge //Need absolute path for now, for testing before PR merge and s3 cloning. Will change post-merge
Script.include("../libraries/utils.js"); Script.include("../../libraries/utils.js");
this.spraySound = SoundCache.getSound("https://s3.amazonaws.com/hifi-public/sounds/sprayPaintSound.wav"); this.spraySound = SoundCache.getSound("https://s3.amazonaws.com/hifi-public/sounds/sprayPaintSound.wav");

17
unpublishedScripts/hiddenEntityReset.js
View file

@ -14,14 +14,15 @@
var _this; var _this;
var sprayPaintScriptURL = Script.resolvePath("../examples/toys/sprayPaintCan.js"); var sprayPaintScriptURL = Script.resolvePath("../examples/toybox/spray_paint/sprayPaintCan.js");
var catScriptURL = Script.resolvePath("../examples/toys/cat.js"); var catScriptURL = Script.resolvePath("../examples/toybox/cat/cat.js");
var flashlightScriptURL = Script.resolvePath('../examples/toys/flashlight/flashlight.js'); var flashlightScriptURL = Script.resolvePath('../examples/toybox/flashlight/flashlight.js');
var pingPongScriptURL = Script.resolvePath('../examples/toys/ping_pong_gun/pingPongGun.js'); var pingPongScriptURL = Script.resolvePath('../examples/toybox/ping_pong_gun/pingPongGun.js');
var wandScriptURL = Script.resolvePath("../examples/toys/bubblewand/wand.js"); var wandScriptURL = Script.resolvePath("../examples/toybox/bubblewand/wand.js");
var dollScriptURL = Script.resolvePath("../examples/toys/doll/doll.js"); var dollScriptURL = Script.resolvePath("../examples/toybox/doll/doll.js");
var lightsScriptURL = Script.resolvePath("../examples/toys/lightSwitch.js"); var lightsScriptURL = Script.resolvePath("../examples/toybox/lights/lightSwitch.js");
var targetsScriptURL = Script.resolvePath('../examples/toys/ping_pong_gun/wallTarget.js'); var targetsScriptURL = Script.resolvePath('../examples/toybox/ping_pong_gun/wallTarget.js');
ResetSwitch = function() { ResetSwitch = function() {
_this = this; _this = this;

16
unpublishedScripts/masterReset.js
View file

@ -14,14 +14,14 @@
var utilitiesScript = Script.resolvePath("../examples/libraries/utils.js"); var utilitiesScript = Script.resolvePath("../examples/libraries/utils.js");
Script.include(utilitiesScript); Script.include(utilitiesScript);
var sprayPaintScriptURL = Script.resolvePath("../examples/toys/sprayPaintCan.js"); var sprayPaintScriptURL = Script.resolvePath("../examples/toybox/spray_paint/sprayPaintCan.js");
var catScriptURL = Script.resolvePath("../examples/toys/cat.js"); var catScriptURL = Script.resolvePath("../examples/toybox/cat/cat.js");
var flashlightScriptURL = Script.resolvePath('../examples/toys/flashlight/flashlight.js'); var flashlightScriptURL = Script.resolvePath('../examples/toybox/flashlight/flashlight.js');
var pingPongScriptURL = Script.resolvePath('../examples/toys/ping_pong_gun/pingPongGun.js'); var pingPongScriptURL = Script.resolvePath('../examples/toybox/ping_pong_gun/pingPongGun.js');
var wandScriptURL = Script.resolvePath("../examples/toys/bubblewand/wand.js"); var wandScriptURL = Script.resolvePath("../examples/toybox/bubblewand/wand.js");
var dollScriptURL = Script.resolvePath("../examples/toys/doll/doll.js"); var dollScriptURL = Script.resolvePath("../examples/toybox/doll/doll.js");
var lightsScriptURL = Script.resolvePath("../examples/toys/lightSwitch.js"); var lightsScriptURL = Script.resolvePath("../examples/toybox/lights/lightSwitch.js");
var targetsScriptURL = Script.resolvePath('../examples/toys/ping_pong_gun/wallTarget.js'); var targetsScriptURL = Script.resolvePath('../examples/toybox/ping_pong_gun/wallTarget.js');