mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-01-04 10:40:09 -06:00
Code Issues Packages Projects Releases Wiki Activity
7,258 Commits 99 Branches 46 Tags
323416b99a37faef9249a0193e4e7b7341a20e39
Commit Graph

1443 Commits

Author SHA1 Message Date
Micah
323416b99a du asset meta update 2020-10-01 17:56:12 -04: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
Micah
2e61a0ba72 start of asset meta update 2020-09-25 17:14:41 -04: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
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
Emma Broman
a57003f272 Fix asteroids profile not running due to whitespace instead of tab 2020-09-09 13:35:41 +02:00
Alexander Bock
e0671700fc Merge pull request #1281 from OpenSpace/issue/1277 
Issue/1277 - Layer assets should add themselves on initialize
 2020-09-07 15:41:12 +02:00
Alexander Bock
af6e15da40 Merge remote-tracking branch 'origin/master' into feature/openglstatecache 
# Conflicts:
#	ext/ghoul
#	modules/digitaluniverse/rendering/renderablebillboardscloud.cpp
#	modules/digitaluniverse/rendering/renderableplanescloud.cpp
#	src/util/screenlog.cpp
 2020-09-04 14:02:17 +02:00
Alexander Bock
00a00c9cc8 Merge branch 'master' into feature/general-performance 
# Conflicts:
#	apps/OpenSpace/main.cpp
#	modules/server/src/topics/timetopic.cpp
 2020-09-04 13:49:00 +02:00
Alexander Bock
2cca451898 Coding style adaptations 
Adapt to changes in Ghoul
 2020-08-25 13:47:03 +02:00
Emma Broman
19c110a4c2 Update gui hash 2020-08-25 13:08:54 +02:00
Jonathas Costa
11ad1df863 Removed personal configuration. 2020-08-24 13:50:36 -04:00
Jonathas Costa
25cd3fdc0b Merged master again. 2020-08-24 13:44:26 -04:00
Alexander Bock
95db615dab Merge branch 'master' into feature/general-performance 2020-08-24 15:09:45 +02:00
Alexander Bock
3b786c0bb8 Merge pull request #1282 from OpenSpace/issue/1174 
Issue/1174 - step between delta time steps using GUI or keybindings
 2020-08-24 14:17:30 +02:00
Alexander Bock
a95b332441 Merge pull request #1280 from OpenSpace/feature/remove-asset-request 
Feature/remove asset request
 2020-08-24 13:54:04 +02:00
Emma Broman
a636faeaac Add option to immediately set delta time step, without interpolation 2020-08-24 11:32:32 +02:00
Emma Broman
457dabe9b7 Add list of delta time steps, stepping functions and keybindings 2020-08-24 11:32:31 +02:00
Gene Payne
0756bcb3c8 Fixed a missing tab in jupiter-family_comet asset entry 2020-08-21 09:20:11 -06:00
Jonathas Costa
f0c397d6be Merged maste. Changed code in multiple places to have the new memory pool working on linux (experimental yet). 2020-08-20 15:34:40 -04:00
Alexander Bock
7603edf906 Add the ability to add multiple ModelGeometry's for a RenderableModel to show models with multiple OBJ files without needing to create multiple scene graph nodes 2020-08-18 16:34:54 +02:00
Alexander Bock
d4291163ba Move ColorTexture from RenderableModel to ModelGeometry 2020-08-18 16:00:32 +02:00
Emma Broman
8cca55019d Remove unused layer helper asset 2020-08-18 11:38:49 +02:00
Emma Broman
2d33a0f554 Add layers to globe on layer asset initialization 2020-08-18 11:38:43 +02:00
Alexander Bock
df803af68a Replace request and requestAll with require and requireAll 2020-08-18 00:19:01 +02:00
Emma Broman
1acd9302b9 Phobos and Deimor radii in meters instead of km 
Solves problems with goToGeo for these moons
 2020-08-05 11:07:49 +02:00
Alexander Bock
92eb92a81b Fix the planet loading asset 2020-08-04 14:17:29 +02:00
Alexander Bock
95763de396 Add missing files for the default layers 2020-08-04 10:14:48 +02:00
Jonathas Costa
393fbdca3d OpenGL State Caching. 2020-07-31 15:59:28 -04:00
Alexander Bock
e5dae26989 Rename layers to remove verb 2020-07-31 15:36:34 +02:00
Alexander Bock
fb58aac2d4 Merge remote-tracking branch 'origin/master' into issue/997 
# Conflicts:
#	data/assets/scene/solarsystem/planets/mercury/mercury.asset
 2020-07-31 15:02:30 +02:00
Alexander Bock
9d269eb668 Merge pull request #1258 from OpenSpace/issue/1238 
Issue/1238
 2020-07-31 14:29:22 +02:00
Alexander Bock
e1fafb4dd3 Fix capitalization of Mercury map files (closes #1260) 2020-07-23 11:30:03 +02:00
Emma Broman
8d5a56e6ef Use vec3 color representation for fixed color in RenderableStars 2020-07-16 09:57:37 +02:00
Lovisa Hassler
9f10814466 Adding bounding sphere to ISS 2020-07-15 20:58:15 +02:00
Emma Broman
3bb47efd81 Assetize globe layers (sun, planets, dwarf planets and moons) 2020-07-14 16:31:53 +02:00
Emma Broman
41d5a6db5f Merge pull request #1240 from OpenSpace/issue/1196 
Issue/1196 - Unify usage of color, transparency/opacity
 2020-07-13 12:23:33 +02:00
Emma Broman
cb19f730df Mixed cleanup 2020-07-10 11:25:26 +02:00
Emma Broman
a9021ac8dc Separate GlobeLabels vec4 color into opacity and vec3 color 
This commit does not change the previous behavior. Note however that the behavior for opacity is a bit weird for this component.
 2020-07-10 11:25:26 +02:00
Emma Broman
ef0eef842d Add opacity for text labels and fix constellation label opacity 2020-07-10 11:25:26 +02:00
Emma Broman
bdb6e626ba Color values specified with vec3 instead of vec4 2020-07-10 11:25:26 +02:00
Alexander Bock
11f537e2e2 Fix issue with constellation art that left merge conflict annotations behind 2020-07-09 13:01:32 +02:00
Emma Broman
b14eba72f8 Change properties and variables to opacity instead of transparency 2020-07-08 15:54:12 +02:00
Emma Broman
a7ea25d311 Merge branch 'master' into issue/733 2020-07-08 15:33:39 +02:00
Emma Broman
9b58782771 Clean up rotation matrices in DU grids 2020-07-08 15:07:31 +02:00
Emma Broman
bdc7f7b637 Add example assets and cleanup code 2020-07-08 09:39:21 +02:00