mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-01-27 06:29:32 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'solarsystem2' into cleanup

Browse Source 
Conflicts:
	src/util/factorymanager.cpp
This commit is contained in:
Jonas Strandstedt
2014-10-27 19:03:36 +01:00
parent 20137613a8 51c8034fe9
commit 4bb9d8c800
30 changed files with 783 additions and 382 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/engine/openspaceengine.cpp
View File

@@ -403,7 +403,7 @@ void OpenSpaceEngine::preSynchronization() {
_interactionHandler.update(dt);
_interactionHandler.lockControls();
Time::ref().advanceTime(dt);
//Time::ref().advanceTime(dt);
}
}