mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-04-22 02:48:25 -05:00
Code Issues Packages Projects Releases Wiki Activity
7,776 Commits 83 Branches 47 Tags
8eadcafce38095464b6f22752ea2363ce8effd21
Commit Graph

104 Commits

Author SHA1 Message Date
Emil Axelsson eed7041f1c Compile fixes after merge 2017-08-15 11:25:52 +02:00
Emil Axelsson cb7319d5f2 Merge branch 'master' of github.com:OpenSpace/OpenSpace into feature/data-management 
Conflicts:
	data/scene/default.scene
	modules/sync/syncmodule.h
	openspace.cfg
	src/engine/openspaceengine.cpp
	src/scene/scene.cpp
	src/scene/scene_doc.inl
	src/scene/scenegraphnode.cpp
	src/scene/scenegraphnode_doc.inl
	src/scene/sceneloader.cpp
	src/scripting/scriptengine.cpp
 2017-08-14 11:17:25 +02:00
Emil Axelsson 9491e920ad Work on asset loader and synchronization module 2017-07-21 15:36:09 +02:00
Emil Axelsson 9c3ca2228a Add stub for sync module 2017-07-20 17:07:39 +02:00