GamesMirror/adarkroom
1
0
Fork 0
mirror of https://github.com/doublespeakgames/adarkroom.git synced 2026-05-30 09:11:54 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #222 from anubisthejackle/issue80

Browse Source
This commit is contained in:
Blake Grotewold
2015-02-09 19:37:10 -05:00
parent 5d921d9464 6e044292ae
commit c87541b8b9
7 changed files with 58 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files
script/space.js
+5 -5
View File
@@ -166,7 +166,7 @@ var Space = {
}
if(!Space.done) {
setTimeout(Space.createAsteroid, 1000 - (Space.altitude * 10));
Engine.setTimeout(Space.createAsteroid, 1000 - (Space.altitude * 10));
}
}
},
@@ -261,7 +261,7 @@ var Space = {
}
}, 1000);
Space._panelTimeout = setTimeout(function() {
Space._panelTimeout = Engine.setTimeout(function() {
if (Engine.isLightsOff())
$('#spacePanel, .menu, select.menuBtn').animate({color: '#272823'}, 500, 'linear');
else
@@ -315,7 +315,7 @@ var Space = {
left: left
}).appendTo(el2);
if(num < Space.NUM_STARS) {
setTimeout(function() { Space.drawStarAsync(el, el2, num + 1); }, 100);
Engine.setTimeout(function() { Space.drawStarAsync(el, el2, num + 1); }, 100);
}
},
@@ -385,7 +385,7 @@ var Space = {
top: '350px',
left: '240px'
}, 3000, 'linear', function() {
setTimeout(function() {
Engine.setTimeout(function() {
Space.ship.animate({
top: '-100px'
}, 200, 'linear', function() {
@@ -393,7 +393,7 @@ var Space = {
$('#outerSlider').css({'left': '0px', 'top': '0px'});
$('#locationSlider, #worldPanel, #spacePanel, #notifications').remove();
$('#header').empty();
setTimeout(function() {
Engine.setTimeout(function() {
$('body').stop();
var container_color;
if (Engine.isLightsOff())