mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-02-12 22:50:36 -06:00
Code Issues Packages Projects Releases Wiki Activity
7,068 Commits 85 Branches 46 Tags
ad5907f602ef60c9b05ae7fc7f14566cd8d0d16e
Commit Graph

1392 Commits

Author SHA1 Message Date
Alexander Bock
96b775d939 Merge branch 'master' into feature/profiles 
# Conflicts:
#	data/assets/asteroids.scene
 2020-07-07 12:59:52 +02:00
Alexander Bock
cae025f530 Merge pull request #1230 from OpenSpace/issue/1217 
Issue/1217
 2020-06-30 21:16:04 +02:00
Jonathas Costa
8c15767d53 updated Radio Sphere's orientation. 2020-06-30 13:17:28 -04: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
Jonathas Costa
e64f557bb4 Proposed solution. 2020-06-29 15:58:04 -04: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
Micah Acinapura
6db7d503a3 Linux fixes clang (#1216) 
* Changes to work on Linux.

* Multiple small fixes for Linux.

* Changes to have trails working on Linux again.

* Bring back AA Trail Lines on Linux.

* Included new branch with correction in cfitsio library linking.

* Updated SGCT.

* Changes to work on Linux.

* Remove extra #endif

* Changes to compile in Clang on Linux.

* Other fixes.

* Bring back some of the changes lost and updated clang building commands.

* requiring 10.15 for sgct, upadating sgct

Co-authored-by: Jonathas <jon.costa@gmail.com>
Co-authored-by: Tom Schober <tom@tomschober.com>
Co-authored-by: Alexander Bock <mail@alexanderbock.eu>
 2020-06-25 18:55:20 -04:00
GPayne
7e143cec31 Adding C/2019 Y4 comet to asteroids scene (issue #1201) 2020-06-25 14:45:59 -06:00
Micah
841b7f1543 du size updates with carter 2020-06-23 16:46:27 -04:00
Alexander Bock
89f1835994 Add the option to add vertical offset to the on-screen log 
Set the default vertical offset when using the user interface
 2020-06-22 22:15:34 +02:00
Alexander Bock
f0b74fe799 Adding the GHRSST L4 MUR Sea Surface temperature as a replacement for the L4 G1SST that is no longer serving data (closes #1204) 2020-06-22 21:40:45 +02:00
Micah
aefb5fd48e updated asteroid colors with carter 2020-06-22 13:10:15 -04:00
Alexander Bock
09555ede1c Cleaning up the profile files 
Removing the old scene files
 2020-06-22 18:47:28 +02:00
Alexander Bock
b12b28f454 Merge branch 'master' into feature/profiles 
# Conflicts:
#	data/assets/scene/milkyway/constellations/constellation_art.asset
 2020-06-22 12:57:07 +02:00
Alexander Bock
4ebd7c66c7 Update the constellation art 2020-06-22 10:56:41 +02:00
Alexander Bock
96940bac86 * Fixed GUI labeling of Uranus label 
* Fixed spelling error in CTX blended label on Mars
 * Removed now-unused debug layers on RenderableGlobes
 2020-06-22 10:32:48 +02:00
Alexander Bock
b51b0898fc Remove 'require'/'request' parameters from asset inclusion in profiles 2020-06-22 10:05:19 +02:00
Alexander Bock
fbd903b4ff Move profiles to their own folder 2020-06-22 09:33:00 +02: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
52ca39fc22 Replace 'required' with 'require' and 'requested' with 'request' 
Continue the work of factoring out the serialization and deserialization of the profile files
 2020-06-17 09:33:41 +02:00
Alexander Bock
e5719952b1 Add the ability to load images lazily for RenderablePlanes 
Add ability to purge textures from RAM if they are read-only
Make use of both for constellation images to reduce the memory footprint

(cherry picked from commit 7f0c92430f)
 2020-06-15 16:08:28 +02:00
Alexander Bock
7f0c92430f Add the ability to load images lazily for RenderablePlanes 
Add ability to purge textures from RAM if they are read-only
Make use of both for constellation images to reduce the memory footprint
 2020-06-15 16:07:16 +02:00
Alexander Bock
fbf8dc76a0 Merge branch 'master' into feature/profiles-cleanup 2020-06-15 10:30:10 +02:00
Alexander Bock
1e9df1cb4b Merge branch 'master' into feature/profiles 
# Conflicts:
#	include/openspace/scene/assetloader.h
#	src/scene/assetloader.cpp
 2020-06-14 17:54:25 +02:00
GPayne
b3ee03b8db Merge remote-tracking branch 'origin/master' 2020-06-13 18:26:29 -06:00
GPayne
4c6e94b9f8 Added meta tags to all asteroid/comet asset files 2020-06-13 18:26:05 -06:00
Micah
1ed043716e added constellation art to base asset 2020-06-13 13:18:27 -04:00
Micah
673ab10253 webgui fix for base profile 2020-06-13 12:54:26 -04:00
Micah
65a3b0d801 asteroid colors with marina 2020-06-13 12:40:56 -04:00
Alexander Bock
5c5d9f36eb Merge pull request #1195 from OpenSpace/issue/1102 
Fixes for spherical grids were flickering.
Although they are not flickering anymore, a better correction is needed in the future
 2020-06-13 16:47:56 +02:00
Alexander Bock
92f0a57cf6 Tiny cleanup 2020-06-13 16:47:35 +02:00
Alexander Bock
2ac4cac01c Update meta information 2020-06-13 16:41:31 +02:00
Alexander Bock
789372bf40 Merge pull request #1191 from OpenSpace/issue/1165-iss-update 
New ISS texture model

Closes #1165
 2020-06-13 16:38:40 +02:00
Alexander Bock
976bf3f79b Small cleanup 2020-06-13 16:38:06 +02:00
Jonathas Costa
8195c24d79 Merge branch 'master' into issue/1102 2020-06-13 10:34:25 -04:00
Jonathas Costa
19c65047f8 Changed colors. 2020-06-13 10:24:54 -04:00
Alexander Bock
2719d257dd Merge pull request #1192 from OpenSpace/feature/mars-2020 
Feature/mars 2020

Added Perseverance model and trajectory
 2020-06-13 16:12:12 +02:00
Alexander Bock
e2ead0f567 Some small cleanup 2020-06-13 16:11:27 +02:00
Jonathas Costa
b83d41026f Merge branch 'master' into issue/1102 2020-06-13 09:50:37 -04:00
Alexander Bock
358246dceb Merge pull request #1193 from OpenSpace/issue/1159-deep-sky-fix 
Issue/1159 deep sky fix
 2020-06-13 15:10:38 +02:00
Alexander Bock
1d4da396f3 Tiny Lua syntax fix 2020-06-13 15:05:02 +02:00
Alexander Bock
8ec436acce Merge pull request #1194 from OpenSpace/issue/165-constellation-images 
added constellation asset from ccny
 2020-06-13 14:47:27 +02:00
Alexander Bock
a763ffd102 Add meta information for the constellation art 2020-06-13 14:45:49 +02:00
Alexander Bock
dba93380df Move keybinds to a separate asset file 2020-06-13 14:41:42 +02:00
Alexander Bock
da955a6c29 General cleanup of Apollo scenes 2020-06-13 13:08:47 +02:00
Micah
b76cc949f8 added constellation asset from ccny 2020-06-12 23:46:22 -04:00
Micah Acinapura
57cfa0a3d4 removing test node 2020-06-12 21:42:08 -04:00
Micah Acinapura
ca4fb75eb4 added rotation to correct deepsky objects 2020-06-12 21:41:07 -04:00
Micah Acinapura
b43c234541 mars2020 landed 2020-06-12 21:08:20 -04:00