Commit Graph

68 Commits

Author SHA1 Message Date
Alexander Bock 174129be5e Merge commit '5c45815b9c509cbf98d1f3c7ad1e6035c4962a81' into feature/remote_redesign 2015-07-06 16:50:35 +02:00
Alexander Bock f60dfac1cf Update OpenSpace version to 0.1.1 prerelease-6
Do not print the SGCT . waiting message
rename libtorrent.config to Launcher.config
2015-07-06 13:44:23 +02:00
Joakim Kilby 47b40e23d0 Merge branch 'develop' into feature/remote_redesign
* develop:
  Renamed getLua, setLua, getString, and setString methods to add "Value" to the end of the method name Added documentation for getString/setString methods
  Enable Properties to be set by strings
  Add a button to the SyncWidget to allow it to be closed
  Updated to new Ghoul version
  Make multithreaded download a toggle
  Correctly Set the CMAKE_PREFIX_PATH for Qt on Mac
  Add commandline argument to OpenSpaceEngine to override scene file Make scene file selectable in Launcher, using the configurationfile value as default
  Non-Windows compile fix
  Include stylesheet in main file
  Add stylesheets and general improvements
2015-07-05 16:43:38 +02:00
Alexander Bock e66e815683 Add a button to the SyncWidget to allow it to be closed 2015-07-04 23:06:23 +02:00
Alexander Bock c375f18dac Add commandline argument to OpenSpaceEngine to override scene file
Make scene file selectable in Launcher, using the configurationfile value as default
2015-07-04 21:21:27 +02:00
Alexander Bock b8db167647 Include stylesheet in main file 2015-07-04 20:26:38 +02:00
Joakim Kilby d4e9d833a8 Merge branch 'develop' into feature/remote
* develop:
  Set the libtorrent settings correctly
  Store libtorrent dht settings between executions of Launcher
  Fix libtorrent CMakeLists to always enable DHT mode Close torrents when SyncWidget is closed
2015-07-04 16:25:11 +02:00
Alexander Bock 1510aca448 Add stylesheets and general improvements 2015-07-04 13:22:03 +02:00
Alexander Bock 16ccd7550f Set the libtorrent settings correctly 2015-07-03 19:54:14 +02:00
Alexander Bock af81447558 Store libtorrent dht settings between executions of Launcher 2015-07-03 19:26:04 +02:00
Alexander Bock 4e1d4d6820 Fix libtorrent CMakeLists to always enable DHT mode
Close torrents when SyncWidget is closed
2015-07-03 18:55:39 +02:00
Joakim Kilby a9824dabc1 Merge branch 'develop' into feature/remote 2015-07-03 16:18:59 +02:00
Joakim Kilby 3d17e6bcf2 moved setting of master. (before it was set after init so some scripts could fail from startup.lua if they required one to be master) 2015-07-03 14:42:20 +02:00
Alexander Bock 2397a28d49 Set Launcher's information widget to readonly 2015-07-03 00:40:49 +02:00
Alexander Bock 304a328cde Let TimelineView handle multiple instances of Labelparser and HongkangParsers 2015-07-03 00:00:48 +02:00
Alexander Bock e8ab67ca91 Merge branch 'develop' into feature/timeline 2015-07-02 22:13:44 +02:00
Alexander Bock 0e4dbbb1cc Some work on the Launcher 2015-07-02 15:53:25 +02:00
Alexander Bock bae990babb Some work on making the TimelineGui work with the new hybrid parsers 2015-07-01 23:40:38 +02:00
Alexander Bock d6b2928018 Merge branch 'develop' into feature/remote 2015-07-01 18:40:41 +02:00
Alexander Bock 84ba9b1503 Set correct default scene file 2015-07-01 17:55:06 +02:00
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