 elon
|
92529fa6d4
|
merging master, conflicts
|
2021-02-10 11:33:01 -05:00 |
|
|
elon
|
0c005c05d1
|
an ok working state
|
2021-02-09 09:24:02 -05: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 |
|
|
Micah
|
b2f655ee75
|
fix for saturn sync issue
|
2020-10-26 13:32:30 -04:00 |
|
|
Micah
|
95393ad6c2
|
resetting color map for du sdss
|
2020-10-19 15:09:32 -04: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 |
|
|
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
|
d88f6eda6b
|
update of all profiles to json format, few asset fixes
|
2020-10-12 04:22:16 -04: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 |
|
|
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 |
|
|
Christian Adamsson
|
b032eda63c
|
Magnetosphere added and keybindings updated
|
2020-09-29 15:11:04 +02: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 |
|
|
Christian Adamsson
|
98b6e20f80
|
Flipped density visualisation fix
|
2020-09-28 12:06:26 +02:00 |
|
|
Christian Adamsson
|
97336ab7ff
|
Keybind fix and default read emin03 data
|
2020-09-28 12:06:00 +02:00 |
|
|
Micah
|
2e61a0ba72
|
start of asset meta update
|
2020-09-25 17:14:41 -04:00 |
|
|
Christian Adamsson
|
da1ce709d5
|
New keybinding and change the loading of asset to fit fieldtrip show
|
2020-09-24 14:04:57 +02:00 |
|
|
Emma Broman
|
193923e33b
|
Merge branch 'master' into thesis/2018/exoplanets
|
2020-09-23 09:56:41 +02:00 |
|
|
Christian Adamsson
|
f5f287cb3f
|
New texture versions and default asset settings
|
2020-09-21 11:56:34 +02:00 |
|
|
Emilie
|
8a57f89e37
|
New scene graph node for camera focus on flux rope
|
2020-09-21 11:26:33 +02:00 |
|
|
Emilie
|
7a9cb03879
|
New legend + New hotkeys
Also changed the flux and uniform colortable
|
2020-09-17 15:15:12 +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 |
|
|
Christian Adamsson
|
9775b34451
|
Colortable update to remove bug with black nodes close to Earth
|
2020-09-15 15:01:51 +02:00 |
|
|
Christian Adamsson
|
76ef7d5023
|
Added back functionality after merge
|
2020-09-15 14:19:41 +02:00 |
|
|
Christian Adamsson
|
ec452584b9
|
merge conflict solved
|
2020-09-15 13:50:01 +02:00 |
|
|
Christian Adamsson
|
e3e471124c
|
New asset fixes with transforms/versions. Colortable changed
|
2020-09-15 13:35:36 +02:00 |
|
|
Emilie
|
3f7e35a6f0
|
Small changes to be able to show different visualizations on nodes close to the Earth
|
2020-09-14 16:07:56 +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 |
|
|
Emilie
|
b0928405eb
|
Added functions for illuminance filtering (enhance method) + color tables for illuminance
|
2020-09-10 19:58:32 +02:00 |
|