Alexander Bock
96ed6cfb70
Merge branch 'master' into feature/asset-meta-update
2020-10-10 12:01:56 +02:00
Micah
0f667685da
update for modelgeometry; fix for pioneer sync
2020-10-09 16:28:22 -04:00
Alexander Bock
36bff67129
Merge pull request #1315 from OpenSpace/feature/session-recording-improvements
...
Feature/session recording improvements
2020-10-09 22:28:01 +02:00
Alexander Bock
d89c1e5c36
Some small code cleanups
2020-10-09 22:27:28 +02: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
Micah
102454089a
update DU assets for gui.description
2020-10-09 14:24:46 -04:00
Alexander Bock
c6a0f07567
Reintroduce second update function ( closes #1296 )
2020-10-09 19:26:26 +02:00
Alexander Bock
e33498f8a6
Linux fixes clang ( #1313 )
...
* Changes to work on Linux.
* Bring back AA Trail Lines on Linux.
* Included new branch with correction in cfitsio library linking.
* Updated SGCT
* Changes to compile in Clang on Linux.
Authored-by: Jonathas <jon.costa@gmail.com >
Authored-by: Tom Schober <tom@tomschober.com >
2020-10-09 18:43: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
Emma Broman
660d2b6311
Merge pull request #1309 from OpenSpace/issue/1308
...
Fix for compile errors for Linux in exoplanets module
2020-10-09 15:37:31 +02:00
Micah
7ed673e773
cleanup fixes
2020-10-08 23:41:50 -04:00
Micah
f617331c33
update to solarsystem for description on scene graph node. added earth observing trails for planets
2020-10-08 23:39:30 -04:00
Emma Broman
3cc2d2aedf
Fix for compile errors in Linux in exoplanets module
2020-10-07 17:12:06 +02:00
Micah
0ccf4dfd1f
update for gui meta panel
2020-10-04 16:26:52 -04:00
Micah
d800876879
mars layers
2020-10-02 17:20:21 -04:00
Micah
323416b99a
du asset meta update
2020-10-01 17:56:12 -04:00
Emma Broman
3310d954b3
Fix typo
2020-09-28 16:14:55 +02:00
Lovisa Hassler
ceb5c85e5c
Removed duplicated documentation for vec4 color
2020-09-28 16:02:39 +02: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
Emma Broman
83a8d7f018
Merge pull request #1300 from OpenSpace/thesis/2018/exoplanets
...
Thesis/2018/exoplanets
2020-09-28 11:39:08 +02:00
Emma Broman
754128a9e7
Some final cleanup
2020-09-28 11:37:28 +02:00
Micah
2e61a0ba72
start of asset meta update
2020-09-25 17:14:41 -04:00
Emma Broman
fdf25f18a2
Merge branch 'master' into thesis/2018/exoplanets
2020-09-25 08:56:30 +02:00
Emma Broman
eb330fed8f
Don't bind texture if nullptr
...
Lead to an exception when enabling the exoplanets renderablebillboardclouds during runtime. Should probably investigate why the renderBillboard function is called with a nullptr texture in the first place...
2020-09-25 08:55:41 +02:00
Emma Broman
0b2ba8d13a
Merge branch 'master' into thesis/2018/exoplanets
2020-09-24 16:34:15 +02:00
Emma Broman
5860f6fcbf
Fix problem with extra symbol when returning string_view from format conversion
2020-09-23 10:43:37 +02:00
Emma Broman
193923e33b
Merge branch 'master' into thesis/2018/exoplanets
2020-09-23 09:56:41 +02:00
Emma Broman
c32de00bd8
Remvoe trailing whitespaces
2020-09-23 08:41:33 +02:00
Emma Broman
78996bb9d9
Cleanup and avoid using variable that might not have been defined
2020-09-22 11:13:26 +02:00
Emma Broman
5d9f6ec5a0
Increase trail resolution for highly eccentric orbits
2020-09-22 10:53:05 +02:00
Emma Broman
e74433b3f0
Add function to print a list of available exoplanet systems to the log
2020-09-22 08:21:57 +02:00
Emma Broman
7bd0e0bc00
Tiny refactor
2020-09-21 14:46:42 +02:00
Emma Broman
1a5c0d3672
More cleanup
...
string_view and avoid warnings from implicit conversions
2020-09-18 14:34:06 +02:00
Emma Broman
938fc49f82
Fix spelling mistake
2020-09-18 11:14:07 +02:00
Emma Broman
32c2e59330
Change uppercase struct variables to camelcase
2020-09-18 11:10:15 +02:00
Emma Broman
fe4bb00108
Even more cleanup
2020-09-18 10:23:47 +02:00
Emma Broman
614c523c69
Cleanup data reading in csvtobintask
2020-09-18 10:11:32 +02:00
Emma Broman
d0806e0136
Cleanup
2020-09-18 09:33:04 +02:00
Emma Broman
f2b4909a32
Some cleanup of helper functions
2020-09-18 08:50:06 +02:00
Emma Broman
5671ea1463
Update copyright end year (woops)
2020-09-17 16:36:02 +02: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
Alexander Bock
1a13a5a763
Merge pull request #1293 from OpenSpace/feature/cfitsio-update
...
Feature/cfitsio update
2020-09-16 21:51:55 +02:00
Jonathas Costa
e84437345f
Fixed layer name on Linux.
2020-09-16 11:30:11 -04:00
Emma Broman
0d1e464a64
Documentation cleanup and capitalize first letter in "Disc" in renderable
2020-09-16 15:16:15 +02:00
Emma Broman
57e25050e1
Abort if trying to add the same system twice
2020-09-16 14:34:37 +02:00
Emma Broman
e0333553cb
Some final cleanup
2020-09-16 14:33:55 +02:00