 Alexander Bock
|
c9a3c68f19
|
Fix style guide issues
Update Ghoul repository
|
2017-12-29 19:18:06 +01:00 |
|
|
Alexander Bock
|
c4932bcbae
|
Jenkins compile fix
|
2017-12-29 00:05:26 +01:00 |
|
|
Alexander Bock
|
9389e31164
|
Jenkins compile fix
|
2017-12-28 20:16:03 +01:00 |
|
|
Alexander Bock
|
b337c3aa1e
|
Windows compile fix
|
2017-12-28 14:15:06 -05:00 |
|
|
Alexander Bock
|
8c7d220335
|
Some fixes for Jenkins build
|
2017-12-28 16:58:19 +01:00 |
|
|
Alexander Bock
|
fac3780ce9
|
Remove warnings on MacOS
|
2017-12-26 23:06:11 +01:00 |
|
|
Alexander Bock
|
c7c4f01f26
|
Make SyncTask work with globebrowsing scripts
Add additional error information to http request
|
2017-12-24 01:45:22 +01:00 |
|
|
Emil Axelsson
|
fd2568fdab
|
Let http synchronizations overwrite files
|
2017-12-23 17:54:22 +01:00 |
|
|
Alexander Bock
|
4b65e20570
|
Support loading of .asset and .scene files
Fix hardcoded paths to placeholder image add placeholder image to repository
Disable launcher in SyncWidget to keep it compiling until deletion
|
2017-12-23 08:08:12 +01:00 |
|
|
Emil Axelsson
|
09182c9274
|
Cleanup code
|
2017-12-19 11:48:30 +01:00 |
|
|
Emil Axelsson
|
f7dc598f60
|
Small code cleanup
|
2017-12-19 11:17:56 +01:00 |
|
|
Emil Axelsson
|
8230e8d1e5
|
Add preprocessor flag
|
2017-12-18 17:50:07 +01:00 |
|
|
Emil Axelsson
|
ef2633980b
|
Allow sync module to be compiled without libtorrent
|
2017-12-18 17:36:52 +01:00 |
|
|
Emil Axelsson
|
90243cf388
|
Improve loading screen
|
2017-12-18 15:00:57 +01:00 |
|
|
Emil Axelsson
|
d4278f9adc
|
Merge branch 'master' of github.com:OpenSpace/OpenSpace into feature/data-management
|
2017-12-17 18:30:00 +01:00 |
|
|
Emil Axelsson
|
df259f6d02
|
Multithreaded scene initialization
|
2017-12-17 17:34:46 +01:00 |
|
|
Emil Axelsson
|
7cc05ba2e0
|
More code cleanup
|
2017-12-16 15:37:46 +01:00 |
|
|
Emil Axelsson
|
84dfbe7b80
|
Clean up asset related code
|
2017-12-16 12:51:46 +01:00 |
|
|
Emil Axelsson
|
603078af53
|
Add sync task
|
2017-12-15 13:28:24 +01:00 |
|
|
Emil Axelsson
|
75cf6dcf71
|
Asset work in progress
|
2017-12-15 13:21:10 +01:00 |
|
|
Emil Axelsson
|
1926b59f91
|
Thread safety in torrentclient. Add syncfile to torrentsync.
|
2017-12-12 18:36:09 +01:00 |
|
|
Emil Axelsson
|
3968961434
|
Show resource sync progress in gui
|
2017-12-08 14:37:34 +01:00 |
|
|
Emil Axelsson
|
27823e9af6
|
Asset syncing
|
2017-11-15 13:12:10 +01:00 |
|
|
Emil Axelsson
|
62f58a9749
|
Start on asset gui
|
2017-11-14 20:46:03 +01:00 |
|
|
Emil Axelsson
|
ce9b75117e
|
More work on assets (not compiling)
|
2017-11-14 17:23:58 +01:00 |
|
|
Emil Axelsson
|
6a4f938bac
|
Thread safety in http requests
|
2017-11-14 13:47:22 +01:00 |
|
|
Emil Axelsson
|
c032e4a66e
|
Add missing constructors
|
2017-11-14 11:26:23 +01:00 |
|
|
Emil Axelsson
|
81f45aed71
|
Work on http synchronization
|
2017-11-13 23:01:22 +01:00 |
|
|
Emil Axelsson
|
c171e6ae86
|
Work on http download interface
|
2017-11-13 19:03:58 +01:00 |
|
|
Emil Axelsson
|
27f36209fa
|
Improve implementation and interface of http downloads
|
2017-11-13 14:59:39 +01:00 |
|
|
Emil Axelsson
|
2fa42859cd
|
Decentralize resource synchronization. Remove notion of SynchronizationJob.
|
2017-11-12 19:09:16 +01:00 |
|
|
Emil Axelsson
|
a73f2e0d00
|
Work on asset synchronization
|
2017-11-11 18:48:07 +01:00 |
|
|
Emil Axelsson
|
916f94d70e
|
Terminate torrent thread on destruction
|
2017-11-10 16:42:55 +01:00 |
|
|
Emil Axelsson
|
8da01993cd
|
Add support for Magnet Links
|
2017-11-07 00:00:26 +01:00 |
|
|
Emil Axelsson
|
87595812d2
|
Remove BOM
|
2017-11-06 21:22:43 +01:00 |
|
|
Emil Axelsson
|
e201dec907
|
Start work on TorrentSynchronization
|
2017-11-06 19:07:52 +01:00 |
|
|
Emil Axelsson
|
1f33359697
|
Cleanup and better configuration of resource syncs
|
2017-11-05 23:17:51 +01:00 |
|
|
Emil Axelsson
|
88c5733d00
|
Only synchronize http resources if missing
|
2017-11-05 19:34:17 +01:00 |
|
|
Emil Axelsson
|
03aab55a1f
|
Asset synchronization using HTTP
|
2017-11-05 19:02:31 +01:00 |
|
|
Emil Axelsson
|
a7a0715200
|
Restructure sync directories and change sync API
|
2017-11-01 12:31:40 +01:00 |
|
|
Emil Axelsson
|
2313a275d3
|
Resource syncing infrastructure
|
2017-10-31 17:46:48 +01:00 |
|
|
Emil Axelsson
|
81298f10be
|
Work on asset synchronization and initialization
|
2017-10-16 19:08:22 +02:00 |
|
|
Emil Axelsson
|
af8bec1441
|
Prepare for data sync
|
2017-09-14 20:16:51 +02:00 |
|
|
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 |
|