Commit Graph

7626 Commits

Author SHA1 Message Date
aniisaaden
e109c64081 Fixed issue with pointscloud asset. Changed pointData to be a dictionary in pointsCloudRenderable. Changed name of message type "DATA" to "PDAT" 2020-10-19 13:52:47 +02:00
aniisaaden
12ad26d51e Changed LERROR-messages to LINFO-messages 2020-10-16 14:42:45 +02:00
aniisaaden
b66fcb6f0a Removed unistd.h 2020-10-16 11:36:47 +02:00
aniisaaden
43c8588f59 Merge branch 'master' of https://github.com/OpenSpace/OpenSpace into thesis/2020/software-integration 2020-10-16 09:45:48 +02:00
GPayne
71a76c33d5 Fix for segfault after OpenSpace run if launcher was bypassed 2020-10-15 17:31:16 -06:00
corrieroe
df125042bc Updated slack support link in README
Slack link had expired
2020-10-15 10:30:37 -04:00
aniisaaden
6ee0d1337f Merge branch 'master' of https://github.com/OpenSpace/OpenSpace into thesis/2020/software-integration
# Conflicts:
#	data/assets/base.asset
2020-10-15 15:18:51 +02:00
aniisaaden
b6b16df51c Remove scenegraphnode works again 2020-10-15 15:14:25 +02:00
aniisaaden
cf8888485b Changes focus-node to the sun in case the focus-node is a sgn being removed 2020-10-15 14:59:10 +02:00
GPayne
df22eeb657 Fix for logging of asteroids data file error (downgrade to 'info') 2020-10-14 20:19:13 -06:00
GPayne
1eb8c9dbfd Fix for forcing profile GUI text entry to plain text only 2020-10-14 15:43:54 -06:00
Micah
364dafbde5 qss fix for launcher labels 2020-10-14 14:52:01 -04:00
aniisaaden
273b3bca0c Camera retargets and focuses on pointdatas sgn - resets the camera state when removing sgn 2020-10-14 18:04:39 +02:00
Johanna Granström
58261ece73 Merge branch 'thesis/2020/software-integration' of https://github.com/OpenSpace/OpenSpace into thesis/2020/software-integration
# Conflicts:
#	modules/softwareintegration/softwareintegrationmodule.cpp
2020-10-14 13:36:43 +02:00
Johanna Granström
ba683f980e Fixed: Exception error 2020-10-14 11:48:20 +02:00
Micah
1b1bcdee98 fix Kerberos trail name 2020-10-13 22:04:54 -04:00
Micah
5c64d74dbb adding back default times to profiles 2020-10-13 22:03:26 -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
a6bc4cb576 Reduce the default sensitivity for websocket navigation to 5 2020-10-13 16:56:00 +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
d5122b2855 Merge pull request #1307 from OpenSpace/feature/profile-gui
Launcher and Profile Editor GUI
2020-10-13 16:33:30 +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
Alexander Bock
bf8d164c5b Tiny cleanup 2020-10-13 16:24:17 +02:00
Alexander Bock
77907fc7df Rename ProfilesReadOnly -> ReadOnlyProfiles 2020-10-13 16:22:05 +02:00
aniisaaden
6f6f526423 Merge branch 'master' of https://github.com/OpenSpace/OpenSpace into thesis/2020/software-integration 2020-10-13 15:35:37 +02:00
Alexander Bock
fc574ee531 More cleanup
Update QSS
2020-10-13 15:35:20 +02:00
aniisaaden
b2e837dc5f Camera retargets and focuses on pointdatas sgn - does not reset the camera state when removing sgn 2020-10-13 15:33:43 +02:00
Emma Broman
f136dc6a6d Update documentation string 2020-10-13 14:14:25 +02:00
Alexander Bock
38e0e1e250 Fix crash when trying to add new keybinding 2020-10-13 14:10:55 +02:00
Alexander Bock
b5531c652f Merge branch 'feature/profile-gui' of https://github.com/OpenSpace/OpenSpace into feature/profile-gui 2020-10-13 14:10:38 +02:00
Emma Broman
6907678f32 Slight cleanup of reading exoplanet system names 2020-10-13 14:03:53 +02:00
Johanna Granström
42889906cc wip 2020-10-13 13:50:55 +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 Acinapura
b7c566089b fixes to cmake for macos 2020-10-13 06:06:26 -04:00
aniisaaden
07ad1ddb00 Expanded the module to include luminosity and velocity data 2020-10-13 11:41:13 +02:00
Alexander Bock
ba8eac51dd Fix simulation time specification for gaia scene 2020-10-13 11:38:02 +02:00
Micah
21774b937b sending exoplanet names for gui panel 2020-10-13 05:24:26 -04:00
aniisaaden
04b0cb9ba6 Merge branch 'master' of https://github.com/OpenSpace/OpenSpace into thesis/2020/software-integration
# Conflicts:
#	openspace.cfg
2020-10-13 10:23:10 +02:00
aniisaaden
c428f097ea Started expanding the module and renderable to include luminosity and velocity 2020-10-13 10:15:09 +02:00
Alexander Bock
f2a1173dc1 Visually signal correctly if a dropdown menu in the launcher is disabled 2020-10-13 09:56:05 +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 Acinapura
4935ae8814 Update keys for slidedeck example (#1320) 2020-10-13 09:20:25 +02:00
GPayne
26b9db81e6 Merge branch 'feature/profile-gui' of https://github.com/OpenSpace/OpenSpace into feature/profile-gui 2020-10-13 00:32:33 -06:00
Gene Payne
23af34de83 Fixes to prevent segfault when OpenSpace app closes 2020-10-13 00:31:42 -06:00
GPayne
769cb4bf38 Added keybinding warning for number keys 2020-10-12 22:27:43 -06:00
GPayne
f2a03ed70e Fix for linux X11 linking 2020-10-12 19:13:21 -06:00
Alexander Bock
76b0b781a9 Passing around Profile as a reference instead of a pointer 2020-10-12 20:56:11 +02:00