mirror of
https://github.com/lubosz/overte.git
synced 2025-08-07 17:41:12 +02:00
add untracked changes
This commit is contained in:
parent
7bd9e2653c
commit
7834a18bcf
1 changed files with 5 additions and 6 deletions
|
@ -21,7 +21,7 @@
|
||||||
CreateSimulation = function() {
|
CreateSimulation = function() {
|
||||||
Script.include("https://hifi-public.s3.amazonaws.com/eric/scripts/tween.js");
|
Script.include("https://hifi-public.s3.amazonaws.com/eric/scripts/tween.js");
|
||||||
Script.include('games/satellite.js');
|
Script.include('games/satellite.js');
|
||||||
|
|
||||||
var trailsEnabled = this.trailsEnabled = true;
|
var trailsEnabled = this.trailsEnabled = true;
|
||||||
|
|
||||||
var DAMPING = this.DAMPING = 0.0;
|
var DAMPING = this.DAMPING = 0.0;
|
||||||
|
@ -126,7 +126,7 @@ CreateSimulation = function() {
|
||||||
}
|
}
|
||||||
|
|
||||||
this.pause = function() {
|
this.pause = function() {
|
||||||
if(paused) {
|
if (paused) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
for (var i = 0; i < planets.length; ++i) {
|
for (var i = 0; i < planets.length; ++i) {
|
||||||
|
@ -144,7 +144,7 @@ CreateSimulation = function() {
|
||||||
}
|
}
|
||||||
|
|
||||||
this.resume = function() {
|
this.resume = function() {
|
||||||
if(!paused) {
|
if (!paused) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
for (var i = 0; i < planets.length; ++i) {
|
for (var i = 0; i < planets.length; ++i) {
|
||||||
|
@ -490,7 +490,7 @@ CreateSimulation = function() {
|
||||||
elapsed = 0.0;
|
elapsed = 0.0;
|
||||||
planets.length = 0;
|
planets.length = 0;
|
||||||
initPlanets();
|
initPlanets();
|
||||||
|
|
||||||
|
|
||||||
MyAvatar.position = startingPosition;
|
MyAvatar.position = startingPosition;
|
||||||
Camera.setPosition(cameraStart);
|
Camera.setPosition(cameraStart);
|
||||||
|
@ -500,5 +500,4 @@ CreateSimulation = function() {
|
||||||
CreateSimulation();
|
CreateSimulation();
|
||||||
|
|
||||||
Script.update.connect(update);
|
Script.update.connect(update);
|
||||||
Script.scriptEnding.connect(scriptEnding);
|
Script.scriptEnding.connect(scriptEnding);
|
||||||
|
|
Loading…
Reference in a new issue