Commit Graph

661 Commits

Author SHA1 Message Date
Emma Broman c860e0ce49 Merge branch 'master' into thesis/2019/camera-paths 2020-11-05 11:27:36 +01:00
Micah a673ed9fbf fix to grids asset; issue/1371 2020-11-04 18:55:49 -05:00
Jonathas Costa 3fbefa5324 Feature/orion changes (#1359)
* Changed RenderableModel to allow user-control depth and blending.
* Updated RenderableModel to correctly handle the Orion Nebula model.
Co-authored-by: Alexander Bock <mail@alexanderbock.eu>
2020-11-04 13:11:25 +01:00
Emma Broman a3df46417d Merge branch 'master' into thesis/2019/camera-paths 2020-10-28 14:55:59 +01:00
Micah Acinapura cc7c0092a3 Feature/meta identifier list (#1357)
Updating asset.meta.identifiers to be dictionary/list instead of string
2020-10-28 14:25:34 +01:00
Emma Broman 4fc3a01177 Solve merge conflict 2020-10-26 19:06:24 +01:00
Micah b2f655ee75 fix for saturn sync issue 2020-10-26 13:32:30 -04:00
Alexander Bock a93b5fdf10 No long show extra interpolation warning when a slide deck image does not exist (closes #936) 2020-10-20 23:57:10 +02:00
Micah 5fc0a151c3 updating webgui hash 2020-10-19 16:00:12 -04:00
Micah 95393ad6c2 resetting color map for du sdss 2020-10-19 15:09:32 -04:00
Alexander Bock 0779c54a07 Provide correct error message if the ProfileName is empty
Don't include Voyager and Pioneer in the base asset as it takes too long to load
Ensure that the webgui asset can load without the dashboard
Fix scripting issue in Rosetta scene with trails
Fix issue with Dashboards that would actually render one line too far down causing trouble with multiline text
Set the render option for renderablebillboards to view direction by default as the normal mode has some issues (see #1342)
Set more sensible maximum value for RenderablePlanesCloud
Correctly show the number of significant digits in the altitude
Replace setPropertyValue with setPropertyValueSingle when clicking on the friction "buttons" on screen
Add a new script function hasProperty to check whether a property exits
2020-10-17 20:10:15 +02:00
Micah bf79414263 adding color range as runtime property for billboards 2020-10-14 16:31:21 -04:00
Micah 1b1bcdee98 fix Kerberos trail name 2020-10-13 22:04:54 -04:00
Micah 6355da37be fix for globebrowing order, adding new mars hirise layer 2020-10-13 21:53:49 -04:00
Micah 26565cf270 launcher label and profile fixes 2020-10-13 12:42:10 -04:00
Alexander Bock 4069d944bc Disable V-Sync again
Set the line fade for Voyager and Pioneer more properly
2020-10-13 17:09:53 +02:00
Alexander Bock f28c855202 Remove duplication from the base module
Add trail-only asset for Voyager and Pioneer
2020-10-13 16:51:54 +02:00
Alexander Bock d0aaaeb090 Merge remote-tracking branch 'origin/master' into feature/profile-gui
# Conflicts:
#	data/profiles/apollo8.profile
#	data/profiles/apollo_sites.profile
#	data/profiles/asteroids.profile
#	data/profiles/dawn.profile
#	data/profiles/default.profile
#	data/profiles/default_full.profile
#	data/profiles/gaia.profile
#	data/profiles/insight.profile
#	data/profiles/juno.profile
#	data/profiles/mars.profile
#	data/profiles/messenger.profile
#	data/profiles/newhorizons.profile
#	data/profiles/osirisrex.profile
#	data/profiles/rosetta.profile
#	data/profiles/touch.profile
#	data/profiles/voyager.profile
2020-10-13 16:32:58 +02:00
Emma Broman 4f3e930ce7 Merge pull request #1321 from OpenSpace/feature/exoplanets-panel
sending exoplanet names for gui panel
2020-10-13 13:27:24 +02:00
Micah 21774b937b sending exoplanet names for gui panel 2020-10-13 05:24:26 -04:00
Micah Acinapura 08dacfd703 Cleaning up iss on removal (#1318) 2020-10-13 09:21:18 +02:00
Micah Acinapura ee1b1cd165 Added tags to pluto system (#1319) 2020-10-13 09:20:52 +02:00
Micah Acinapura 4935ae8814 Update keys for slidedeck example (#1320) 2020-10-13 09:20:25 +02:00
Micah d88f6eda6b update of all profiles to json format, few asset fixes 2020-10-12 04:22:16 -04:00
Emma Broman 887fe5572d Merge pull request #1302 from OpenSpace/issue/1285
Issue/1285 - Add delta time steps to profiles and generate keybindings for number keys
2020-10-12 08:35:36 +02:00
Alexander Bock 2a122f9751 Some more cleanup of empty lines 2020-10-10 12:50:38 +02:00
Alexander Bock 607d008cbf Fixing newlines at the end of files 2020-10-10 12:20:45 +02:00
Alexander Bock 96ed6cfb70 Merge branch 'master' into feature/asset-meta-update 2020-10-10 12:01:56 +02:00
Micah 0f667685da update for modelgeometry; fix for pioneer sync 2020-10-09 16:28:22 -04:00
Alexander Bock e43fa248bd Remove spaces from constellation images (closes #1219) 2020-10-09 21:52:55 +02:00
Alexander Bock 2dabe1f9d4 Update James Hedberg's constellation images (closes #1263) 2020-10-09 21:38:10 +02:00
Micah 102454089a update DU assets for gui.description 2020-10-09 14:24:46 -04:00
Emma Broman f168e97796 Add delta times to new defualt profile (json) 2020-10-09 19:02:49 +02:00
Alexander Bock 50a456b87f Issue/1299 (#1312)
Change profile file format from a custom one to JSON
2020-10-09 17:32:30 +02:00
Micah f617331c33 update to solarsystem for description on scene graph node. added earth observing trails for planets 2020-10-08 23:39:30 -04:00
Micah 0ccf4dfd1f update for gui meta panel 2020-10-04 16:26:52 -04:00
Micah d800876879 mars layers 2020-10-02 17:20:21 -04:00
Micah 323416b99a du asset meta update 2020-10-01 17:56:12 -04:00
Micah df06edbba7 add milkyway arm label asset 2020-09-28 09:55:56 -04:00
Micah 4080d70feb solar system update 2020-09-28 08:39:52 -04:00
Micah 2e61a0ba72 start of asset meta update 2020-09-25 17:14:41 -04:00
Emma Broman 840424cc61 Resolve merge conflicts 2020-09-25 15:50:34 +02:00
Emma Broman 193923e33b Merge branch 'master' into thesis/2018/exoplanets 2020-09-23 09:56:41 +02:00
Emma Broman 8c87246e43 Remove old delta time keys code 2020-09-21 13:37:31 +02:00
Alexander Bock 617dadb9d4 Merge pull request #1297 from OpenSpace/feature/orion_nebula
Feature/orion nebula
2020-09-16 23:16:24 +02:00
Alexander Bock dffa7b914a Minor cleaup 2020-09-16 23:07:32 +02:00
Jonathas Costa e84437345f Fixed layer name on Linux. 2020-09-16 11:30:11 -04:00
Emma Broman 0b4593a194 Put exoplanet data files on server and fetch using HttpSynchronization 2020-09-16 09:32:16 +02:00
Micah 2a4ad44740 style cleanup 2020-09-10 17:50:33 -04:00
Micah b55d93ad94 added orion nebula asset from DU, updated licence template to better support whitespace 2020-09-10 17:46:48 -04:00