Commit Graph

92 Commits

Author SHA1 Message Date
Michael Nilsson
0d0f761d6e downloadmanager return shared_ptr to FileFutures instead of bare pointers 2016-04-05 11:33:58 -04:00
Alexander Bock
5181d812cd Update Ghoul repository 2016-03-20 23:30:54 +01:00
Sebastian Piwell
fd5f26f757 Linux/Mac Launcher fix 2016-03-08 16:44:43 -05:00
Michael Nilsson
ec9261e1da fix function call to logmanager 2016-03-07 09:37:45 -05:00
Alexander Bock
66fdf4b6a4 Increasing required Visual Studio version to 2015
Moving external library handling from OpenSpace to Ghoul
2016-02-07 20:35:25 +01:00
Alexander Bock
312d52c038 Minor changes 2016-02-07 14:05:59 +01:00
Alexander Bock
877a4d1ba6 Updated copyright header 2016-02-05 17:43:21 +01:00
Alexander Bock
b43f622a9f Fixes for libtorrent version to be compiled with VS 2015 2016-01-14 16:04:40 +01:00
Jonathas Costa
1ec01d9fea Updating launcher to Ghoul API. 2016-01-07 17:11:33 -05:00
Alexander Bock
2fce471743 Started cleanup of module structure 2015-12-14 10:50:38 -08:00
Alexander Bock
f7f5f2e262 Started cleanup of SpiceManager
Clean boost message output
Update to new Ghoul with cppformat library
2015-11-17 23:54:54 -05:00
Alexander Bock
5ce55c1ba4 Remove unnecessary Boost libraries from libtorrent compilation 2015-11-16 19:21:49 -05:00
Alexander Bock
f3fd055db8 Rename WindowHandler to WindowWrapper 2015-10-26 15:00:46 -05:00
Alexander Bock
49dbb1ce20 More work on converting to SGCT window handler
Adapting to change in SGCT key callback handling
2015-10-26 09:19:28 -05:00
Alexander Bock
d84edc4090 More work on transitioning to windowwrapper for keyboard and mouse interaction 2015-10-25 17:34:03 -05:00
Alexander Bock
5456b5ee85 Started change moving from explicit SGCT functions to wrapper class 2015-10-25 13:50:39 -05:00
Alexander Bock
f8f48acb98 Implementation of the windowhandler interface 2015-10-20 23:30:40 +02:00
Alexander Bock
d4da374c23 Reenable colored font rendering 2015-10-08 22:59:36 +02:00
Alexander Bock
410e0137eb Updated single_fisheye configuration file to use new SGCT format
Correctly set clear color for nonlinear projections
2015-10-05 00:36:09 +02:00
Alexander Bock
35e95b94e7 First version to update OpenSpace to the new SGCT version 2015-10-05 00:07:38 +02:00
Alexander Bock
8a573a7cb8 Added an icon to the OpenSpace executable 2015-07-17 14:03:38 +02:00
Alexander Bock
72ba616414 Merge branch 'develop' into feature/remote_redesign
Conflicts:
	modules/base/shaders/path_fs.glsl
2015-07-07 20:31:01 +02:00
Alexander Bock
52146a79a6 Remove old script messages for changing the origin and the coordinate system
Adapt the onscreen-gui to use the new property mechanism
Adapt the Timeline GUI to use the new property mechanism
2015-07-07 18:52:09 +02:00
Alexander Bock
405aa70352 Refix Devil vs FreeImage
Fix the downloading detection of filenames in Launcher
2015-07-07 14:48:20 +02:00
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