 Emil Axelsson
|
6c36fa7bfd
|
Merge branch 'feature/data-management' of github.com:OpenSpace/OpenSpace into feature/data-management
Conflicts:
include/openspace/util/concurrentjobmanager.h
include/openspace/util/concurrentjobmanager.inl
include/openspace/util/concurrentqueue.h
include/openspace/util/concurrentqueue.inl
include/openspace/util/threadpool.h
modules/globebrowsing/tile/tileloadjob.h
modules/sync/syncmodule.cpp
src/util/threadpool.cpp
|
2017-08-15 11:34:54 +02:00 |
|
|
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 |
|