Malin Ejdbo
4fb8a36952
Merge branch 'master' into feature/multitexturing
...
* Resolve conflicts
2021-03-02 15:49:39 +01:00
Gene Payne
f4e7d01aa7
Fixes for Issue #1409 ( #1501 )
...
* Fixed renderablesmallbody selective rendering props to accept asset file settings
* Set to only show selective rendering log info msg if render size is 1
* Mirrored selective rendering behavior from smallbody to satellites
* Added property coupling of values to satellite/asteroid render settings for size, start index, upperlimit
* Fix for selective rendering with synced render settings
* Removed redundant property definitions for codegen compliance
* Improvements to documentation and handling values spec'd in asset file
* Fix for satellites: selective rendering settings specified from assets
2021-02-17 12:41:05 -07:00
Malin Ejdbo
c6b3b409ff
Update assets for new model loading structure
...
* Update Ghoul
2021-02-03 10:19:35 +01:00
Emma Broman
19e5960020
Small grid renderable updates/fixes ( #1473 )
...
* Make sure we have examples for all grid types
* Fix problems with blending when rendering transparent grids
* Rename 'GridColor' to 'Color' for better consistenty among renderables
* Fix issue with resizing box grid
* Avoid problems with line width on Mac
2021-01-28 09:22:50 +01:00
Alexander Bock
feb3078641
Update slide_deck_helper.asset
...
Rename `Alpha` to `Opacity` (closes #1441 )
2020-12-19 21:19:35 +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
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
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
26565cf270
launcher label and profile fixes
2020-10-13 12:42:10 -04: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
Micah
21774b937b
sending exoplanet names for gui panel
2020-10-13 05:24:26 -04: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
Micah
0f667685da
update for modelgeometry; fix for pioneer sync
2020-10-09 16:28:22 -04:00
Micah
102454089a
update DU assets for gui.description
2020-10-09 14:24:46 -04:00
Micah
d800876879
mars layers
2020-10-02 17:20:21 -04:00
Micah
2e61a0ba72
start of asset meta update
2020-09-25 17:14:41 -04:00
Emma Broman
8c87246e43
Remove old delta time keys code
2020-09-21 13:37:31 +02:00
Alexander Bock
e0671700fc
Merge pull request #1281 from OpenSpace/issue/1277
...
Issue/1277 - Layer assets should add themselves on initialize
2020-09-07 15:41:12 +02:00
Alexander Bock
00a00c9cc8
Merge branch 'master' into feature/general-performance
...
# Conflicts:
# apps/OpenSpace/main.cpp
# modules/server/src/topics/timetopic.cpp
2020-09-04 13:49:00 +02:00
Emma Broman
19c110a4c2
Update gui hash
2020-08-25 13:08:54 +02:00
Alexander Bock
95db615dab
Merge branch 'master' into feature/general-performance
2020-08-24 15:09:45 +02:00
Alexander Bock
3b786c0bb8
Merge pull request #1282 from OpenSpace/issue/1174
...
Issue/1174 - step between delta time steps using GUI or keybindings
2020-08-24 14:17:30 +02:00
Emma Broman
a636faeaac
Add option to immediately set delta time step, without interpolation
2020-08-24 11:32:32 +02:00
Emma Broman
457dabe9b7
Add list of delta time steps, stepping functions and keybindings
2020-08-24 11:32:31 +02:00
Alexander Bock
d4291163ba
Move ColorTexture from RenderableModel to ModelGeometry
2020-08-18 16:00:32 +02:00
Emma Broman
8cca55019d
Remove unused layer helper asset
2020-08-18 11:38:49 +02:00
Alexander Bock
df803af68a
Replace request and requestAll with require and requireAll
2020-08-18 00:19:01 +02:00
Emma Broman
3bb47efd81
Assetize globe layers (sun, planets, dwarf planets and moons)
2020-07-14 16:31:53 +02:00
Emma Broman
cb19f730df
Mixed cleanup
2020-07-10 11:25:26 +02:00
Emma Broman
bdb6e626ba
Color values specified with vec3 instead of vec4
2020-07-10 11:25:26 +02:00
Emma Broman
a7ea25d311
Merge branch 'master' into issue/733
2020-07-08 15:33:39 +02:00
Alexander Bock
96b775d939
Merge branch 'master' into feature/profiles
...
# Conflicts:
# data/assets/asteroids.scene
2020-07-07 12:59:52 +02:00
Jonathas Costa
607a13da31
Added new Renderbin PostDeferredTransparency and PreDeferredTransparency. Fixed trails definitions when needed and satellites too.
2020-06-30 12:05:07 -04:00
Emma Broman
f7b8061601
Cleanup: remove gridMatrix property from sphericalgrid
...
It is sufficient to use a Transform
2020-06-30 15:06:54 +02:00
Emma Broman
6c57e395e7
Call correct function when adding cartesian axes
2020-06-26 11:06:50 +02:00
Micah
076a96e651
updated assets and guihash to hide hidden items
2020-06-26 00:05:51 -04:00
Alexander Bock
d2fd3b8f1f
Include helper assets and base assets explicitly
...
Add a new function to export profile struct to module text
2020-06-17 11:12:01 +02:00
Alexander Bock
e2ead0f567
Some small cleanup
2020-06-13 16:11:27 +02:00
Micah Acinapura
0049a2db38
mars2020 first commit
2020-06-12 19:50:43 -04:00
Alexander Bock
5a41084027
Add loading of meta information from assets
2020-05-05 00:29:46 +02:00
GPayne
29d68897d6
Added to satellites: group selection feature, segments fix
2020-04-13 16:43:27 -06:00
Gene Payne
9884d7e25d
Fix tabs vs spaces
2020-03-29 17:25:54 -06:00
GPayne
545a1314a5
Fix for issue #1122 forcing satellite files to download at each startup
2020-03-29 17:23:25 -06:00
GPayne
addfa65fa6
Merge with latest master
2020-02-19 09:25:33 -07:00
Micah
f78c85882f
update start dates for modis earth layers; fix bookmarks asset
2020-02-11 18:54:16 -05:00
Micah Acinapura
cae91a5b7c
univeral path for tle/iss
2020-02-10 16:55:48 -05:00
Alexander Bock
a37a64d691
Merge branch 'master' into feature/iss-asset
...
Fix the rotation used for TLE elements by removing a factor of 2
Add interesting satellites to the default scene/profile
2020-02-10 18:05:45 +01:00