Commit Graph

927 Commits

Author SHA1 Message Date
Alexander Bock 50fd9309ba Merge branch 'master' into feature/NewAtmosphere
# Conflicts:
#	src/rendering/renderengine.cpp
2017-10-24 15:30:22 -04:00
Alexander Bock eaca6c7487 Add SceneLicense information to the Scene
Add documentation generator to SceneLicense
2017-10-23 18:11:09 -07:00
Alexander Bock 97445f4f9f Add Scaling, Rotation, and Translation that is based on evaluation of Lua scripts 2017-10-23 14:43:25 -07:00
Alexander Bock a5bcae6d67 Merge branch 'master' into feature/NewAtmosphere 2017-10-20 11:53:34 -04:00
Alexander Bock fc4ff258b0 Make log file links work again (thank Emil) (closes #378) 2017-10-20 11:47:48 -04:00
Alexander Bock 518abc5f87 Merge branch 'master' into feature/NewAtmosphere
# Conflicts:
#	data/scene/default.scene
#	data/scene/digitaluniverse/tully/tully.data
2017-10-20 10:42:18 -04:00
Alexander Bock ca968f805c Fix Bennu mod file 2017-10-20 10:33:18 -04:00
Alexander Bock 28cb52e900 Fix Osiris-Rex scene file 2017-10-20 10:20:51 -04:00
Alexander Bock 2bfbf82403 Fix Tully download
Guard against stray .data files
2017-10-19 23:56:16 -04:00
Alexander Bock ae51be09fd Fix download links for Digital Universe 2017-10-19 23:22:54 -04:00
Alexander Bock b26db7548b Allow setting the default enabled state for renderables 2017-10-19 23:20:43 -04:00
Alexander Bock a554580723 Fix Tully download file 2017-10-19 22:53:36 -04:00
Alexander Bock 4dacba868b Fix featured property display
Set correct blend mode for Themis on Mars
2017-10-19 22:52:25 -04:00
Alexander Bock dc0dbde93d Merge branch 'master' into feature/NewAtmosphere 2017-10-19 15:14:35 -04:00
Alexander Bock 78aa164ccf Reset moon.mod 2017-10-19 15:14:04 -04:00
Jonathas Costa f3bea7455d Fixed Tully wrong scale for galaxies pics. 2017-10-19 14:49:01 -04:00
Jonathas Costa 637e74a9dc Merged master into NewAtmosphere. 2017-10-19 14:23:06 -04:00
Jonathas Costa ccb76b91da Fixed transformation matrix in DU. 2017-10-19 14:18:04 -04:00
Jonathas Costa 1f5eb36c48 Change shadow group name. 2017-10-19 11:44:38 -04:00
Jonathas Costa a925d0646a Added lunar eclipses back. 2017-10-19 11:41:36 -04:00
Emil Axelsson 97f78a09df Merge branch 'master' of github.com:OpenSpace/OpenSpace into feature/data-management 2017-10-19 10:27:34 +02:00
Jonathas Costa 6638fb52d0 Merge branch 'master' of https://github.com/OpenSpace/OpenSpace 2017-10-18 20:31:40 -04:00
Jonathas Costa 6fdb587cca Fixed precision issue in eclipses. Removed unused code for atm with renderableplanets. 2017-10-18 20:29:52 -04:00
Alexander Bock 4fc6f82e40 Add data files for digitaluniverse
Add files to gitignore file
2017-10-18 18:11:15 -04:00
Alexander Bock 1c61f56043 Various Mac related fixes 2017-10-18 09:58:12 -04:00
Jonathas Costa b91a826d70 Added Eclipses for NewAtmosphere (Missing change spaces for precision). 2017-10-18 02:09:14 -04:00
Alexander Bock 7377d63794 Clean up digitaluniverse data folder
Add mod files
Add Moon WAC wms file
2017-10-17 21:36:54 -04:00
Jonathas Costa d36e32e560 Merged master into NewAtmosphere. 2017-10-17 20:14:41 -04:00
Jonathas Costa db12d67055 Merge branch 'master' of https://github.com/OpenSpace/OpenSpace 2017-10-17 18:26:57 -04:00
Alexander Bock d628c1a667 Merge branch 'master' into feature/DU
# Conflicts:
#	data/scene/grids/grids.mod
#	ext/sgct
2017-10-17 17:09:37 -04:00
Alexander Bock 9a81b311f0 Generalize blending layer specification in default.scene
Make Utah server the default for WAC on Moon
2017-10-17 17:03:45 -04:00
Alexander Bock f8754115eb Various cleanup 2017-10-16 17:11:28 -04:00
Alexander Bock b3a2cebaa6 Fix more GuiPaths 2017-10-16 16:51:35 -04:00
Alexander Bock a303bf3aa8 Fix for mission visualization
Change default monospaced font
2017-10-16 16:27:32 -04:00
Alexander Bock 7520edab83 Added first version of mission visualization 2017-10-16 10:23:00 -04:00
Emil Axelsson 2623912ec9 Merge branch 'master' of github.com:OpenSpace/OpenSpace into feature/data-management 2017-10-16 11:07:24 +02:00
Alexander Bock 89cdd6103d Update Juno mission 2017-10-13 16:51:26 -04:00
Alexander Bock bb5f4d4381 Rename GuiGrouping to GuiPath
Add GuiPath to existing scenegraph nodes
Add option to toggle tree representation
Add caption font to UI
2017-10-13 13:08:59 -04:00
Alexander Bock ebd506975c Added initial scenegraph node grouping support 2017-10-13 00:17:28 -04:00
Alexander Bock f1fd2b1960 Add window to show featured scenegraph nodes 2017-10-12 12:13:55 -04:00
Alexander Bock d97cfbe829 Change ImGUI look and feel
Add Arimo font to be used in UI
2017-10-11 10:54:19 -04:00
Oskar Carlbaum 1a00d8a34f Add default colortable to data folder 2017-10-09 23:58:32 +02:00
Jonathas Costa f1135afdea Fixed bug in DU mesh rendering. 2017-10-09 11:32:19 -04:00
Jonathas Costa 00757ec692 Added missing files. Fixed color in renderable du meshes. 2017-10-09 08:38:21 -04:00
Jonathas Costa 4ab735b883 Adding DU meshes. 2017-10-08 16:42:09 -04:00
Jonathas Costa cc66165731 Disabled cache. Added initial coded for RenderablePlanesCloud. 2017-10-04 14:05:35 -04:00
Jonathas Costa 600536e7f8 Added colormap range defined. Added VectorListVerifier. Added Text rendering. Added other datavar types for Tully. Added transformantion matrix. 2017-10-04 09:23:49 -04:00
Jonathas Costa 74f0da9033 Added new data, new RenderableBillboardsCloud renderable, added and fixed multiple shaders. 2017-09-22 08:12:45 -04:00
Jonathas Costa 653001f8a4 Added more data from DU. 2017-09-12 16:27:08 -04:00
Jonathas Costa e7f2f22f3d DU branch Quasar and WMAP. 2017-09-12 12:58:42 -04:00