Commit Graph

3023 Commits

Author SHA1 Message Date
Emma Broman ec1fbb09f8 Warn if multiple keys are bound to a key on removal 2020-10-09 18:52:38 +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 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
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
Micah 0ccf4dfd1f update for gui meta panel 2020-10-04 16:26:52 -04:00
Gene Payne 30a74652d6 Fix for loss of camera precision when serializing a profile 2020-10-02 15:57:02 -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 ea26c18d9d Added feature to make 'standard' profiles read-only 2020-09-27 12:09:25 -06: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
Gene Payne caee77881c Launcher works with all types of SGCT/Profile settings plus commandline 2020-09-24 15:07:53 -06: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 64a09b50c3 Reset keybindings when delta times are changed 2020-09-21 13:37:31 +02:00
Emma Broman aa42d22e51 Remove extra newlines 2020-09-21 13:37:31 +02:00
Emma Broman 5d895dd266 Add keybindings for delta time steps 2020-09-21 13:37:25 +02:00
Emma Broman b1550d5f8f Fix typo 2020-09-21 10:47:57 +02:00
Gene Payne 180cddfaa3 Fixed parse exceptions and improved assets with path and variable name 2020-09-16 21:06:46 -06:00
GPayne 831bf87d0c Improved exceptions and added error message dialog UI 2020-09-16 07:11:50 -06:00
Alexander Bock 98bfee301d Various Xcode compile fixes 2020-09-14 10:38:46 +02:00
GPayne 0dcf4a5e82 Finished syncing profile editor with openspace lib profile structs 2020-09-13 23:51:16 -06:00
GPayne 23c3603304 Renamed keybindings member 2020-09-11 11:30:08 -06:00
GPayne 7d41cd5a49 Merged master in 2020-09-11 10:29:59 -06:00
Alexander Bock bbef4ea22b Update keybindingmanager.cpp
Fix tiny typo
2020-09-09 11:04:46 +02:00
Alexander Bock 13a62a5f79 Missing commit 2020-09-04 16:19:39 +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 6eb0aea757 Address PR comments 2020-09-04 13:46:20 +02:00
GPayne 1b07268324 Working instantiation of Profile obj from launcher 2020-08-30 19:01:25 -06:00
Alexander Bock d0508be631 First commit 2020-08-30 22:00:13 +02:00
Alexander Bock 2cca451898 Coding style adaptations
Adapt to changes in Ghoul
2020-08-25 13:47:03 +02: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 dad5b8fb10 Merge branch 'master' into issue/1189
# Conflicts:
#	CMakeLists.txt
2020-08-24 13:58:42 +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 08b42f32de Add a couple of test cases for delta time steps in profile 2020-08-24 11:32:32 +02:00
Emma Broman 6475b1154d Update some documentation for interpolating functions 2020-08-24 11:32:32 +02:00
Emma Broman 43a628e321 Add negative versions of the time steps per default and remove duplicates 2020-08-24 11:32:32 +02:00
Emma Broman 7692180bad Verify values on input and save delta times to profile when saving settings 2020-08-24 11:32:32 +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 4293fad3e9 Add server topic for delta times and send data to GUI 2020-08-24 11:32:31 +02:00
Emma Broman 457dabe9b7 Add list of delta time steps, stepping functions and keybindings 2020-08-24 11:32:31 +02:00
Emma Broman 0b34e32ba7 Fix bug with marked interesting nodes not showing up in GUI 2020-08-21 14:30:13 +02:00
Alexander Bock 15e6b5519f Making the documentation generation a bit more performant
Outsource the file writing to a second thread to start the rendering earlier
2020-08-21 14:10:33 +02:00
Alexander Bock 83622ce339 Add some more profilng code
Update Ghoul repository
2020-08-21 11:16:37 +02: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
Jonathas Costa b7886ab463 Updated Ghoul and removed unused code. 2020-08-20 11:53:10 -04:00