Mirrors/overte-JulianGro
3
0
Fork 0
mirror of https://github.com/JulianGro/overte.git synced 2025-04-16 01:40:33 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

merged

Browse source
This commit is contained in:
ericrius1 2016-03-21 10:23:51 -07:00
parent a0d9c24365
commit 795747f408
1 changed files with 1 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
unpublishedScripts/DomainContent/Home/reset.js
View file

@ -118,18 +118,6 @@
createDynamicEntities: function() {
<<<<<<< HEAD
var fishTank = new FishTank({
x: 1098.9254,
y: 460.5814,
z: -79.1103
}, {
x: 0,
y: 152,
z: 0
});
=======
// var fishTank = new FishTank({
// x: 1098.9254,
// y: 460.5814,
@ -139,7 +127,7 @@
// y: 0,
// z: 0
// });
>>>>>>> james/homereset
var tiltMaze = new TiltMaze({
x: 1105.5768,