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

Merge remote-tracking branch 'origin/master' into state_manager_2

Browse Source 
Conflicts:
	script/events.js
This commit is contained in:
LucidCrux
2013-07-24 21:01:59 -06:00
parent 2018ca3ae8 03867cae60
commit 766d3879c7
5 changed files with 67 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files
script/space.js
+2 -2
View File
@@ -219,7 +219,7 @@ var Space = {
Space.ship.css({
left: x + 'px',
top: y + 'px',
top: y + 'px'
});
Space.lastMove = Date.now();
@@ -453,4 +453,4 @@ var Space = {
handleStateUpdates: function(e){
}
};
};