mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-01-08 20:50:19 -06:00
Code Issues Packages Projects Releases Wiki Activity
4,823 Commits 93 Branches 46 Tags
e201dec90727e4bbb1d7c2d5cc916f7abfdb4d25
Commit Graph

5 Commits

Author SHA1 Message Date
Emil Axelsson
e201dec907 Start work on TorrentSynchronization 2017-11-06 19:07:52 +01:00
Emil Axelsson
af8bec1441 Prepare for data sync 2017-09-14 20:16:51 +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
9c3ca2228a Add stub for sync module 2017-07-20 17:07:39 +02:00