Commit Graph

48 Commits

Author SHA1 Message Date
Joakim Kilby
2188fc1809 Merge branch 'develop' into feature/remote
* develop: (72 commits)
  Disable blackout on startup
  Fixed path bug
  Remove the rendering method override
  Fix crash that happens when SpiceManager is deinitialized
  Adding convenient scripts for showing 67P and changing coordinate system to 67P
  Adding hybrid read method for Pluto Cleanups + logical changes to parsing and sequencing
  Adding the possibility to project to arbitrary bodies model files
  Adding support for imageplanes for multiple instruments
  Fixing bug in model magnification
  Made destination optional in data specifications
  Renamed OpenSpaceModule's initialize method to create Created new initialize method that gets called in OpenSpaceEngine initialize
  Remove setName function from OpenSpaceModule and move naming into constructor
  Always build libtorrent as a static library
  Set Launcher as default application Don't copy curl.dll on non-windows system
  Correct CURL cmake specification
  Add the FindCurl module from CMake into the support directory
  Fix method renaming error in volume module
  Updated data folder reference
  Make SpiceManager derive from Singleton
  Allow left-aligned and right-aligned messages in Launcher
  ...

Conflicts:
	modules/kameleon/CMakeLists.txt
	openspace.cfg
	src/engine/openspaceengine.cpp
2015-07-01 14:38:33 +02:00
Joakim Kilby
d834603c66 Clearing function bindings to avoid messages being logged from SGCT after OpenSpace engine has been destroyed. 2015-06-30 18:30:29 +02:00
Joakim Kilby
13eb012a04 added a current run time variable for the openspace engine + get/set method.
run time is set in preSync from SGCT runtime at the moment
2015-06-24 17:51:32 +02:00
Alexander Bock
d60846a3ec Made destination optional in data specifications 2015-06-23 00:36:31 +02:00
Alexander Bock
9ed5ee4469 Always build libtorrent as a static library 2015-06-22 21:59:12 +02:00
Alexander Bock
89923f0650 Allow left-aligned and right-aligned messages in Launcher 2015-06-22 15:39:37 +02:00
Alexander Bock
943ab69c69 Fix CMakeLists files for TimelineView and Launcher to fix crosstalk 2015-06-22 14:43:55 +02:00
Alexander Bock
77e668a1b6 Correctly handle path tokens in download destinations 2015-06-19 00:19:31 +02:00
Alexander Bock
cc76be6602 Update infowidgets in Launcher based on FileFutures and torrent_handles 2015-06-18 23:45:08 +02:00
Alexander Bock
4d6663f824 Add a time-remaining counter to Launcher 2015-06-18 22:46:24 +02:00
Alexander Bock
0becba370c Remove qDebug with Ghoul Logmanager in Launcher 2015-06-18 17:27:45 +02:00
Alexander Bock
7628e30e5f Enable to start OpenSpace from Launcher as a detached process 2015-06-18 17:06:48 +02:00
Alexander Bock
4411a4e4b2 Disable postFX for global blackout 2015-06-18 16:19:25 +02:00
Alexander Bock
f58d6d91b5 Enable setting the capabilities verbosity using the configuration file 2015-06-18 14:29:34 +02:00
Alexander Bock
54186e5dcb Fix layout issues 2015-06-17 01:43:01 +02:00
Alexander Bock
850d9d3789 Multithreading the downloadrequests 2015-06-17 01:02:07 +02:00
Alexander Bock
72c520e1d1 Close memory leak 2015-06-17 00:36:54 +02:00
Alexander Bock
613b6b3193 Move Spice kernels to new location
Enable loading of openspace.cfg in Loader
Make save locations based on FileSys tokens
Disable LIBCMT linking of applications that link against libOpenSpace
2015-06-17 00:23:57 +02:00
Alexander Bock
77b3b95830 Keep the Launcher responsible during downloading
Remove duplicate downloads
2015-06-16 20:33:40 +02:00
Alexander Bock
ee85c237e6 Reenable downloading
Correctly clear torrent downloads
2015-06-16 03:05:27 +02:00
Alexander Bock
2122369d92 Enable to abort downloads 2015-06-16 02:58:16 +02:00
Alexander Bock
886c8d2da6 Reenable bootstrapping of torrent DHTs
Enable setting of overwrite settings for download files
2015-06-15 19:58:23 +02:00
Alexander Bock
5967063754 More file cleanups 2015-06-15 19:37:06 +02:00
Alexander Bock
13bee28974 Enable multi-threaded download support for filerequests 2015-06-15 02:41:27 +02:00
Alexander Bock
0a233eb6bc More work on correct displaying status of single download files 2015-06-15 02:25:54 +02:00
Alexander Bock
fb7f49a6bb Making single file download fully (and correctly) multithreaded 2015-06-15 02:05:56 +02:00
Alexander Bock
0a02906d8e More restructuring 2015-06-15 00:37:48 +02:00
Alexander Bock
0459f0472b Some fixes for multithreaded downloads 2015-06-14 21:04:42 +02:00
Alexander Bock
b7412e2e39 Making download multi-threaded 2015-06-14 20:40:44 +02:00
Alexander Bock
e212d0b34f Making SyncWidget and ShortcutWidget modal windows
Enable correct progress callback for DownloadManager
2015-06-14 20:17:09 +02:00
Alexander Bock
f327ba3014 Remove warning in CMakeLists
Enable download and request-download functionality
2015-06-14 18:21:10 +02:00
Alexander Bock
c7b041e98a Fix port to 20285 and list all connected seeds 2015-06-13 18:40:33 +02:00
Alexander Bock
de4a6edc4f Make torrent capabilitiy for Launcher work 2015-06-13 17:06:57 +02:00
Alexander Bock
25911736bf Some more work on Launcher 2015-06-13 01:17:53 +02:00
Alexander Bock
da812f3564 More cleanup of Launcher
Added Infowidget
2015-06-12 23:48:11 +02:00
Alexander Bock
d396c29f89 Making libtorrent work with Launcher application 2015-06-12 14:08:29 +02:00
Alexander Bock
d812d29232 Making request-based downloading work 2015-06-11 02:36:28 +02:00
Alexander Bock
549992b5e3 Work to using the request mechanism for downloading 2015-06-11 02:03:50 +02:00
Alexander Bock
f369d0e1f3 Moved selection of scenes to sync in Launcher into syncwidget 2015-06-10 20:35:11 +02:00
Alexander Bock
56472de07c Include external libraries as system headers to remove warnings
Add libtorrent library to the Launcher application
2015-06-10 20:13:16 +02:00
Alexander Bock
bf58c8ab75 Correctly copy libraries
Combine SyncWidget and openspace::DownloadManager
2015-06-10 02:37:37 +02:00
Alexander Bock
726a8e84ef Adding parsing of scene files to Launcher application 2015-06-10 02:05:52 +02:00
Alexander Bock
4c415ef502 Some more work restructuring the launcher 2015-06-08 01:55:38 +02:00
Alexander Bock
b190695474 Add initial version of launcher 2015-06-08 01:08:58 +02:00
Alexander Bock
e17b39a851 Cleanup string generation 2015-06-07 19:20:56 +02:00
Alexander Bock
94ed72bce7 Update copyright notice 2015-06-07 19:19:20 +02:00
Alexander Bock
e56d58a548 Move timelineview application into app folder 2015-06-07 19:15:45 +02:00
Alexander Bock
d231a5f681 Move openspace-based applications into their own subfolder 2015-06-06 11:48:07 +02:00