Commit Graph

7434 Commits

Author SHA1 Message Date
Emma Broman 6a97c3862a Avoid errors for exoplanet host stars without color data 2020-10-12 20:48:14 +02:00
Emma Broman e1b02b3c5a Add option to add several exoplanet systems at once 2020-10-12 20:31:49 +02:00
Emma Broman 1c36582cdd Merge pull request #1311 from OpenSpace/issue/1303
Update to a snapshot of the new exoplanets data
2020-10-12 09:34:44 +02:00
Emma Broman 7e34e1b1d8 Resolve merge conflict 2020-10-12 09:30:51 +02:00
Emma Broman bf49ad76f2 Cleanup 2020-10-12 09:15:07 +02:00
Emma Broman 887fe5572d Merge pull request #1302 from OpenSpace/issue/1285
Issue/1285 - Add delta time steps to profiles and generate keybindings for number keys
2020-10-12 08:35:36 +02:00
Alexander Bock 0cd38217d4 Prevent crash when removing a globebrowsing layer 2020-10-10 17:32:15 +02:00
Alexander Bock 9a030bd7db Update GLFW to 3.03
Remove some warnings
2020-10-10 16:29:12 +02:00
Alexander Bock 5b7679bab1 Feature/jenkins (#1317)
* Update Jenkinsfile
* Update submodules
2020-10-10 16:22:43 +02:00
Alexander Bock 01257d2fb2 Compile fix for Debug mode 2020-10-10 15:59:56 +02:00
Alexander Bock b694633728 Merge pull request #1316 from OpenSpace/feature/asset-meta-update
Feature/asset meta update
2020-10-10 15:40:24 +02:00
Alexander Bock 2a122f9751 Some more cleanup of empty lines 2020-10-10 12:50:38 +02:00
Alexander Bock 607d008cbf Fixing newlines at the end of files 2020-10-10 12:20:45 +02:00
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
Emma Broman d40f3ffc8b Whitespace cleanup 2020-10-09 19:12:20 +02:00
Emma Broman f168e97796 Add delta times to new defualt profile (json) 2020-10-09 19:02:49 +02:00
Emma Broman ec1fbb09f8 Warn if multiple keys are bound to a key on removal 2020-10-09 18:52:38 +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
Emma Broman 37c45a10b6 Cleanup 2020-10-09 18:16:48 +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 9616782ab7 Remove the old data preparation task 2020-10-09 15:52:41 +02:00
Emma Broman e11a8f80a4 Merge branch 'master' into issue/1303 2020-10-09 15:41:47 +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
Emma Broman fd04af5156 Add the new data preparation task file 2020-10-09 12:48:16 +02:00
Emma Broman 4d6fb59ea5 Add helper function to convert from ICRS to galactic coords
Also includes creating a util file for coordinate conversions
2020-10-09 12:48:16 +02:00
Emma Broman 04ea70365a Compute star position from data if not found in speck file 2020-10-09 12:48:16 +02:00
Emma Broman 518bcdeeba Add fix for std::from_chars not working on Linux 2020-10-09 12:48:16 +02:00
Emma Broman 250dbcc3f1 Add task for reading the new exoplanet data in csv format
Also cleanup old exoplanet code a bit based on that new data
2020-10-09 12:47:02 +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 c45cdadfa7 Remove trailing whitespaces 2020-09-25 09:25:15 +02:00