Commit Graph

7439 Commits

Author SHA1 Message Date
Micah d524ecf803 Merge branch 'master' into feature/profile-gui 2020-10-09 19:40:46 -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
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
Emma Broman 3cc2d2aedf Fix for compile errors in Linux in exoplanets module 2020-10-07 17:12:06 +02:00
Gene Payne a0df1a7045 Fix for asset text summary 2020-10-03 02:54:03 -06:00
Gene Payne 438d07f12c Added error messages in lower-left corner of all windows 2020-10-03 01:27:39 -06:00
Gene Payne 30a74652d6 Fix for loss of camera precision when serializing a profile 2020-10-02 15:57:02 -06:00
Gene Payne a13ff46f8d Improved delta times naming and formatting 2020-10-02 15:56:22 -06:00
Gene Payne b581b47513 Implemented 'duplicate profile' button in profile editor 2020-10-02 15:53:04 -06:00
Gene Payne 5d5bfd340b Added configuration file bypass launcher key option 2020-10-02 15:49:27 -06:00
GPayne fff9a32d97 Merge branch 'master' into feature/profile-gui 2020-10-01 21:07:46 -06:00
Gene Payne c9772071fc Implementing multiple changes to layouts and features based on feedback 2020-10-01 16:59:31 -06: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
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
Gene Payne 5be12a992d Correcting some memory management 2020-09-28 01:46:18 -06:00
Gene Payne 69167edf36 Formatting only: header file comments, enforcing column width 2020-09-28 00:53:24 -06:00
Gene Payne 6a07619fa0 More data entry and formatting improvements 2020-09-27 17:56:27 -06:00
Gene Payne 5e02bcd17c Formatting, layout and keybinding improvements 2020-09-27 15:46:13 -06:00
Gene Payne ea26c18d9d Added feature to make 'standard' profiles read-only 2020-09-27 12:09:25 -06:00
Gene Payne 10c7dd405b Modified summary window header labels to show quantity 2020-09-27 10:52:50 -06:00
Gene Payne c01024132b Formatting changes based on feedback, improved delta times data entry 2020-09-26 20:59:02 -06:00
Gene Payne ff1d84f80b Switch to combined date+time Qt widget for improved data entry 2020-09-26 10:59:12 -06:00
Gene Payne 8329934675 Changed gui element focus and tab behavior 2020-09-26 10:28:15 -06:00
Gene Payne af4767d406 Fix for empty list bug in properties and deltatimes 2020-09-26 09:18:26 -06:00
Gene Payne 68dfbe908b Fixed empty list bug in keybindings section 2020-09-25 16:33:00 -06:00
Gene Payne a369c967a7 Fixed empty list bug in modules section 2020-09-25 15:08:31 -06: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
GPayne 83525a544d Fixed problems with sgct functions vs xml files 2020-09-24 20:32:11 -06:00
Gene Payne caee77881c Launcher works with all types of SGCT/Profile settings plus commandline 2020-09-24 15:07:53 -06: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