mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-04-22 19:29:04 -05:00
Code Issues Packages Projects Releases Wiki Activity
7,793 Commits 85 Branches 47 Tags
0be1f8d48d67d3219f030fdef655efd6bc3bc73e
Commit Graph

1920 Commits

Author SHA1 Message Date
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 4b26305340 Merge branch 'master' into feature/profile-gui 
# Conflicts:
#	openspace.cfg
 2020-10-11 11:18:45 +02:00
Alexander Bock 96ed6cfb70 Merge branch 'master' into feature/asset-meta-update 2020-10-10 12:01:56 +02:00
Micah d524ecf803 Merge branch 'master' into feature/profile-gui 2020-10-09 19:40:46 -04: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
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
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 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 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 5e02bcd17c Formatting, layout and keybinding improvements 2020-09-27 15:46:13 -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 193923e33b Merge branch 'master' into thesis/2018/exoplanets 2020-09-23 09:56:41 +02:00
Emma Broman 07520cd270 Clean up includes 2020-09-21 13:49:36 +02:00
Emma Broman 64a09b50c3 Reset keybindings when delta times are changed 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
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 3a25ae79bc Changes to replace temp structs with openspace lib structs 2020-09-11 15:06:12 -06: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
Jonathas Costa 9b8f2a8efc Added missing header to fix compilation on Linux. 2020-09-08 11:07:51 -04: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 7e06f310eb Update submodules 
Remove warnings and MSVC analyzer information messages
 2020-09-01 01:18:17 +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
Emma Broman 99720d95ca Helper file for exoplanet data structure and replace magic numbers with constants 2020-08-28 16:31:48 +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
Emma Broman f8a31d11cc Cleanup 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
Alexander Bock f1b05c23e7 Prevent Stack corruption 2020-08-21 15:40:52 +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
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 1547609dad Remove dynamic memory allocations from the quantize function 2020-08-20 14:15:13 +02:00
Alexander Bock dc63946fef Expose the const char* functionality for Spice to prevent unnecessary string creation 2020-08-20 11:08:49 +02:00