mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-01-24 21:19:46 -06:00
Code Issues Packages Projects Releases Wiki Activity
6,813 Commits 83 Branches 46 Tags
addfa65fa66cf33ff55ee32aa7f2d620dfe62798
Commit Graph

474 Commits

Author SHA1 Message Date
GPayne
addfa65fa6 Merge with latest master 2020-02-19 09:25:33 -07:00
Alexander Bock
324f33dbb8 Small cleanups 2020-02-12 10:58:36 +01:00
GPayne
2650f8c6b6 Merged with master before pull request 2020-02-11 22:52:14 -07:00
Micah
838f543b6b updates to planet texture defaults, from carter 2020-02-12 00:33:01 -05:00
GPayne
f0d30724d6 Modified SSSB horizons files (including pha) to use http sync 2020-02-11 22:15:47 -07:00
Micah
f78c85882f update start dates for modis earth layers; fix bookmarks asset 2020-02-11 18:54:16 -05:00
Alexander Bock
0e6f9fef97 Correct set the barycenter-based trail to be no longer offset 2020-02-11 14:55:14 +01:00
Micah Acinapura
cae91a5b7c univeral path for tle/iss 2020-02-10 16:55:48 -05:00
Micah Acinapura
db8a0d16c9 Merge branch 'master' into bug/macosbuild 2020-02-10 15:43:44 -05:00
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
Micah Acinapura
12b04f38bd macos compile and build (still needs ring shader const fix) 2020-01-29 21:43:06 -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
GPayne
2a99bf02fc Corrected SBDB position using SPICE ECLIPJ2000 frame for sun 2020-01-14 13:49:13 -07:00
Alexander Bock
76240c3edd Coding style updates 2020-01-11 21:07:38 +01:00
GPayne
48a65f8b5f Fixed csv telemetry file parsing and copied line fade changes from satellites 2020-01-06 15:35:12 -07: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