Commit Graph

1289 Commits

Author SHA1 Message Date
Alexander Bock
8f81360628 Move the OpenSpace unit tests from GTest to Catch2
Fix for default.scene
2020-02-10 21:10:35 +01: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
Lovisa Hassler
4cb9587522 Removed unused satellite image 2020-02-04 09:13:22 +01:00
liuloppan
d07a41a7b6 Remove satImages
We do not use this
2020-02-03 17:07:38 +01:00
Your Name
f8330d18b9 Applying rotations facing Earth 2020-01-31 16:55:39 -05:00
Your Name
b076a6f3c6 Removed unnecessary scale 2020-01-31 16:11:42 -05:00
Your Name
b61efaf965 Updated trail fade property 2020-01-31 11:42:34 -05:00
Your Name
30dada1fcc Replaced duplicated code with tle_helper 2020-01-31 10:16:26 -05:00
ElonOlsson
11aa87bd36 fix for mercury magnetosphere (#1064)
- updated transfer function
- removed extra text files
2020-01-30 19:39:48 -05:00
Your Name
99137de797 Added commment 2020-01-30 18:19:44 -05:00
Your Name
b05df8778e Iss asset with model added 2020-01-30 18:15:38 -05:00
Lovisa Hassler
826caf6954 Adding iss asset as a renderablesatellite 2020-01-27 18:38:18 -05:00
Gene Payne
199ddb6292 Added missing sun marker asset to osiris-rex asset 2020-01-27 16:26:55 -07:00
Your Name
55ecf2f6ef Changing conflicting keybindings in rosetta scene 2020-01-27 18:18:58 -05:00
Jonathas Costa
bfa64a6aae Merge branch 'master' of https://github.com/OpenSpace/OpenSpace 2020-01-27 17:23:13 -05:00
Jonathas Costa
607451e04b Changes to fix Dawn scene. 2020-01-27 17:23:05 -05:00
Your Name
f560224143 GetProperty filter on groupname and update in base.asset 2020-01-27 16:49:36 -05:00
Alexander Bock
6a94b2267e Merge pull request #1053 from OpenSpace/feature/profile
Feature/profile
2020-01-27 16:18:01 -05:00
Alexander Bock
160790c03b Merge pull request #1051 from OpenSpace/feature/csv-bookmarks
Feature/csv bookmarks
2020-01-27 18:20:37 +01:00
Alexander Bock
975e46e4b2 Move local bookmarks file to new global asset folder 2020-01-27 18:20:17 +01:00
Alexander Bock
bba51efd70 Cleanup of asset files 2020-01-27 18:01:01 +01:00
GPayne
f682352b53 Merging with master 2020-01-27 09:14:35 -07:00
Micah
2332d6199e update local and fix openspace 2020-01-26 12:24:43 -05:00
Micah
0bc8bd5593 fix spaces and url 2020-01-26 09:18:10 -05:00
Micah
ad29ea53f5 csv bookmark files 2020-01-26 09:13:48 -05:00
Alexander Bock
76240c3edd Coding style updates 2020-01-11 21:07:38 +01:00
Jonathas Costa
e8f2fa56f3 Merge branch 'master' into feature/RingShadows 2020-01-06 08:47:54 -05:00
Alexander Bock
a430883c1e Merge pull request #1034 from OpenSpace/issue/990
Issue/990
2019-12-17 11:05:41 +01:00
liuloppan
04bd649bfe Update to use pluto_globelabels
Update to use the renamed filename
2019-12-16 13:50:44 +01:00
Alexander Bock
f90fe90aae Also include Pluto in the change of labels to globelabels 2019-12-16 11:34:41 +01:00
Alexander Bock
d6bdc2519e Merge remote-tracking branch 'origin/master' into feature/RingShadows
# Conflicts:
#	data/assets/scene/solarsystem/planets/saturn/saturn.asset
2019-12-16 11:09:47 +01:00
Alexander Bock
d58df51cc5 Merge pull request #1025 from OpenSpace/feature/planetlabels
Feature/planetlabels
2019-12-16 11:04:21 +01:00
Alexander Bock
4f2883034b Rename labels assets to globe_labels 2019-12-16 10:51:38 +01:00
Alexander Bock
bfc2da3475 Make a defaut keybind for toggling the labels 2019-12-16 10:38:10 +01:00
Alexander Bock
dfa25b28e6 Disable labels on default
Some small code cleanup
2019-12-16 10:26:42 +01:00
Alexander Bock
92517d4316 Merge pull request #1012 from OpenSpace/feature/FastVolume
Feature/fast volume
2019-12-16 09:52:00 +01:00
Alexander Bock
cf3a641103 Some small cleanup
Remove virtual attribute from some of the raycaster functions
2019-12-16 09:50:34 +01:00
Gene Payne
99c995565b Fix for issue 1023: prevents crash when using satellites and changing segments property, and fixes rendering errors. (#1028) 2019-12-13 07:47:05 -07:00
Jonathas Costa
cca438262b Merge branch 'feature/venusatm' 2019-12-11 16:35:11 -05:00
Jonathas Costa
fba204a51f Added Venus atm. 2019-12-11 15:59:26 -05:00
Jonathas Costa
6e4c7c0329 Merge branch 'master' into feature/RingShadows 2019-12-11 15:46:07 -05:00
Jonathas Costa
016d314cf9 Merge branch 'master' into feature/FastVolume 2019-12-11 15:44:58 -05:00
Jonathas Costa
87b79c1d8c Merge branch 'master' into feature/planetlabels 2019-12-11 15:38:28 -05:00
Jonathas Costa
5509fb0a6b Added more units to refine fading controls. Updated Sun fading values. 2019-12-11 15:38:11 -05:00
Gene Payne
3e23e4323c Feature/venus magellan (#1020)
* Updated Venus asset and added wms for Magellan mosaic imagery

* Adding Magellan height layer
2019-12-11 13:30:52 -07:00
Jonathas Costa
140de3d808 Added automatic documentation and Sun's label. 2019-12-10 12:55:58 -05:00
liuloppan
9a50b27b27 Update frontend hash
Updated to latest frontend hash
2019-12-09 18:01:59 +01:00
Jonathas Costa
6432f484c4 Changed to accpet text label updating. Added super-fine controls for fading effects. 2019-12-08 18:44:08 -05:00
Jonathas Costa
63470f03ec Merge branch 'master' into feature/planetlabels 2019-12-08 14:51:39 -05:00
Jonathas Costa
cce620a663 Merge branch 'master' into feature/FastVolume 2019-12-08 14:51:00 -05:00