mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-04-20 01:01:10 -05:00
Code Issues Packages Projects Releases Wiki Activity
7,442 Commits 84 Branches 47 Tags
19b09abd4e208eeba23256e1f4f0316a1556b98f
Commit Graph

1463 Commits

Author SHA1 Message Date
Micah
19b09abd4e rework launcher images from sync 2020-10-10 12:43:43 -04:00
Micah
922718d827 update for launcher style 2020-10-10 06:03:15 -04:00
Micah
d524ecf803 Merge branch 'master' into feature/profile-gui 2020-10-09 19:40:46 -04:00
Alexander Bock
de97a5520a Merge branch 'master' into feature/session-recording-improvements 
# Conflicts:
#	include/openspace/network/messagestructures.h
#	src/interaction/sessionrecording.cpp
 2020-10-09 22:10:40 +02:00
Alexander Bock
e43fa248bd Remove spaces from constellation images (closes #1219) 2020-10-09 21:52:55 +02:00
Alexander Bock
2dabe1f9d4 Update James Hedberg's constellation images (closes #1263) 2020-10-09 21:38:10 +02:00
Alexander Bock
50a456b87f Issue/1299 (#1312) 
Change profile file format from a custom one to JSON
 2020-10-09 17:32:30 +02:00
GPayne
fff9a32d97 Merge branch 'master' into feature/profile-gui 2020-10-01 21:07:46 -06:00
Emma Broman
754128a9e7 Some final cleanup 2020-09-28 11:37:28 +02:00
Emma Broman
193923e33b Merge branch 'master' into thesis/2018/exoplanets 2020-09-23 09:56:41 +02:00
Gene Payne
73e29df7a9 Corrected profiles to strict ISO standard format date/time string 2020-09-17 12:46:41 -06:00
Gene Payne
180cddfaa3 Fixed parse exceptions and improved assets with path and variable name 2020-09-16 21:06:46 -06: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
Emma Broman
0b4593a194 Put exoplanet data files on server and fetch using HttpSynchronization 2020-09-16 09:32:16 +02:00
Emma Broman
4e73a1b2ef Cleanup csvtobin task slightly 2020-09-14 11:27:32 +02:00
GPayne
7d41cd5a49 Merged master in 2020-09-11 10:29:59 -06:00
Emma Broman
2aa31abe45 Merge branch 'master' into thesis/2018/exoplanets 2020-09-11 13:43:01 +02: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
GPayne
8dad4ee9fe Initial working launcher without profile code access yet 2020-08-28 12:00:57 -06:00
Alexander Bock
2cca451898 Coding style adaptations 
Adapt to changes in Ghoul
 2020-08-25 13:47:03 +02:00
Emma Broman
0ebe523bce Merge branch 'master' into thesis/2018/exoplanets 2020-08-25 13:40:33 +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