mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-04-21 10:28:44 -05:00
Code Issues Packages Projects Releases Wiki Activity
4,717 Commits 82 Branches 47 Tags
2623912ec9e2cdcf659025e5a5ddeca7d9a41ef3
Commit Graph

4 Commits

Author SHA1 Message Date
Emil Axelsson 8a30251fcb Work on asset management 2017-09-18 12:56:55 +02:00
Emil Axelsson bf45937619 Compile fix in asset and assetloader 2017-09-15 11:13:46 +02:00
Emil Axelsson 2426545a05 Merge branch 'master' of github.com:OpenSpace/OpenSpace into feature/data-management 
Conflicts:
	src/rendering/renderengine.cpp
	src/scene/scene.cpp
	src/scene/sceneloader.cpp
	tests/test_concurrentjobmanager.inl
	tests/test_concurrentqueue.inl
	tests/test_sceneloader.inl
 2017-08-15 11:43:18 +02:00
Alexander Bock c275b2f833 Feature/cmake cleanup (#381) 
* Rename OnScreenGui module to ImGui
* Support multiple external module folders (closes #31)
* Cleaning up CMake files
  * Restructure application specification
  * Add parameter for library mode to all modules
  * Add functions to handle global variable state
* Misc/remove warnings (#383)
* Increase build timeout and do a clean rebuild every commit
 2017-08-14 09:38:32 -04:00