Commit Graph

611 Commits

Author SHA1 Message Date
Jonathas Costa 6dcaa9e299 Merged master. 2020-01-27 14:26:21 -05:00
Alexander Bock 182857cfb8 Update Ghoul and SGCT repositories 2020-01-24 19:38:27 +01:00
Alexander Bock c3510948fd Add script function to easily add GIBS image layers to Earth 2019-11-10 13:52:45 +01:00
Alexander Bock 675812d35b Update Ghoul
Update Credits
2019-09-17 19:39:24 +02:00
Alexander Bock 8ce9fde91b Enable the user to specify a custom temporary folder to keep the OS's temp folder clean
Change the configuration file to point the temp folder into the OpenSpace folder
Update Ghoul to not overwrite default font files (closes #944)
2019-08-22 15:37:08 +02:00
Alexander Bock d32b4d9f1f Update Ghoul to fix the commandline parsing (closes #950) 2019-08-22 14:34:45 +02:00
Alexander Bock f2a0cb18b0 Feature/websocketnavigation (#882)
* Upgrade JSON Library
* Added support for navigation based on websocket communication
2019-07-31 11:07:25 +02:00
Alexander Bock c45e5de33a Update copyright header
Update Ghoul
2019-07-22 14:19:11 +02:00
Alexander Bock 66cd0413dd Cleanup of Wormhole application
Updated Ghoul to fix commandline argument extraction bug
2019-07-18 11:52:09 +02:00
Alexander Bock d0c04cfc6b Various code cleanup 2019-06-18 10:47:15 +02:00
Alexander Bock 33ca5d3a22 Warn if keybinds are defined twice (closes #899)
Update Ghoul
2019-06-04 17:11:53 +02:00
Alexander Bock c13152a9a0 Set window icon for all windows (#864) 2019-05-17 15:33:12 -06:00
Jonathas Costa 2b183b721b Feature/new globe labels (#783)
Adding globe labels for planets

https://github.com/OpenSpace/OpenSpace/issues/213
2019-05-16 21:34:07 +02:00
Alexander Bock 595cbc4bcf Feature/cleanup (#837)
* Style guide fixes
* Various cleanups
* Update SGCT
2019-05-03 13:27:43 +02:00
Emil Axelsson c4ab03ad3d Update ghoul 2019-03-27 15:32:47 +01:00
Alexander Bock bb3db7ada7 Feature/jenkins fix (#816)
* Cleanup
* CMake cleanups
* Update current year
* Update copyright header
* Use script to return list of all modules
* Update credits, license and ghoul
2019-03-24 11:19:39 +01:00
Emil Axelsson 87e2dcd788 Update Ghoul 2019-03-11 13:15:13 +01:00
Alexander Bock b65b8b3f42 Update SGCT and Ghoul 2019-03-08 11:52:57 +01:00
Emil Axelsson 075625c223 Prevent file handles to leak into nodejs server application 2019-02-13 17:08:29 +01:00
Alexander Bock 7fefaca345 Feature/jenkins (#788)
* Update Jenkinsfile
* Fix compilation for OSX
* Update SGCT to fix Jenkins compile issue on Ubuntu
* Make OSX Jenkins build not quiet
* Only build OpenSpace target on Mac
2019-01-23 10:17:15 -05:00
Alexander Bock c7639adb15 Remove warnings in Clang 2019-01-19 14:49:31 +01:00
Emil Axelsson 0c6b5e95c6 Introduce ability to configure ports etc for external applications. (#785)
Introduce ability to configure ports etc for external applications, including webgui
2019-01-04 10:23:28 +01:00
Alexander Bock ecdb05e98e Correctly compile if the sync module is compiled without libtorrent support 2018-12-04 09:02:54 -05:00
Alexander Bock 21775d07ea Update ghoul respository
Remove warning
2018-12-03 10:17:40 -05:00
Alexander Bock c7a96a6b59 Address clang tidy complaints
Update Ghoul repository
Update SGCT repository
2018-11-30 15:34:09 -05:00
Alexander Bock 65195975bb Add display showing the number of active layers
Automatically disable last layer if number of texture units is exhausted
Closes #427
2018-11-21 17:32:51 -05:00
Alexander Bock 1d12c82cf9 Update Ghoul 2018-11-13 08:03:38 -05:00
Alexander Bock cba6201b67 Minor coding style changes 2018-11-07 13:49:33 -05:00
Alexander Bock 7a3a8a5cf6 Misc coding style cleanups 2018-11-06 12:02:56 -05:00
Alexander Bock 1742ed032d Updated ghoul repository 2018-11-05 20:52:51 -05:00
Alexander Bock 267879878b Beta-3 Release Candidate branch (#753)
* Merge experimental session recording branch
 * Merge new CEF-based webgui branch
2018-11-05 20:51:48 -05:00
Alexander Bock cf593bd060 Adapt to removal of Singleton 2018-11-05 14:17:42 -05:00
Alexander Bock 45359516f1 Update libCurl to 7.63.0
Update GDAL to 2.3.2
2018-11-01 14:38:32 -04:00
Alexander Bock 920ae7c374 ImGui cleanup
Update Ghoul
2018-10-31 11:12:20 -04:00
Alexander Bock f630944fd8 Feature/minvr (#744)
* Move SGCT external library from ext/sgct to apps/OpenSpace/ext/sgct
 * Remove all GLFW dependencies from openspace-core
 * Add MinVR dependency
 * Add new executable OpenSpace-MinVR that uses MinVR instead of SGCT
2018-10-29 22:10:35 -04:00
Alexander Bock b48812a339 Add workaround for MacOS Mojave 10.14 dark mode OpenGL bug 2018-10-28 19:37:17 +01:00
Alexander Bock 4cfedf0f65 Update Ghoul repository
Prevent reference after delete of the scene when deinitializing the OpenSpaceEngine
2018-10-20 13:34:34 +02:00
Alexander Bock 700fd60295 Update coding style to correctly ignore SGCT inline files in apps folder
Update ghoul repository
2018-10-17 08:30:55 +00:00
Alexander Bock 428ab56d99 Update ghoul and adapt to ghoul change by moving std::to_string to ghoul::to_string 2018-10-08 17:54:32 -06:00
Alexander Bock 53eebb05ba Update ghoul repository 2018-10-08 00:43:49 -06:00
Alexander Bock 4ed9fec9f9 Remove Clang warnings 2018-09-25 12:23:55 -04:00
Alexander Bock 0ca84d91f1 Feature/cmake cleanup (#727)
* Sweeping CMake cleanup
* Cleaning up message log in CMake
2018-09-21 14:25:51 -04:00
Alexander Bock 9ac41c6586 Fix for taking screenshots
Update Ghoul version
2018-09-17 14:57:40 -04:00
Alexander Bock 583c5b1866 MacOS fixes
Update Milkyway textures to use png instead of pbm
Update Exoplanets to use png instead of pbm
2018-09-05 16:08:11 -04:00
Alexander Bock 9f57d80541 Check_style fixes 2018-09-01 21:57:36 -04:00
Alexander Bock 9f1c4e847d Feature/globals (#690)
* Move global objects out of OpenSpaceEngine
 * General cleanup of main.cpp
 * Add default_joystick asset to all scenes
 * No longer suppress mouse interaction on slave nodes
 * Window delegate uses function pointers rather than subclassing
 * Fix for false overwriting of ImGUI configuration file
 * Change default color and tilt angle of fisheye rendering
 * Restructured performance manager
 * Simplify screenshot handling
2018-08-30 11:38:47 -04:00
Alexander Bock c287c03fe8 Update Ghoul
Adapt to glbindings changes
2018-08-29 17:32:53 -04:00
Alexander Bock aa85c2afb2 Update Ghoul 2018-08-29 15:23:08 -04:00
Alexander Bock 46c26b9b00 Update Ghoul and sgct repository 2018-08-24 13:37:54 -04:00
Alexander Bock 5ad69b841b Remove extra opacity value from renderablebillboardscloud and make text labels listen to the opacity (closes #693) 2018-08-24 02:09:01 -06:00