mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-01-05 19:19:39 -06:00
Code Issues Packages Projects Releases Wiki Activity
7,643 Commits 99 Branches 46 Tags
e2da38747388878927b4cff71785b050cb2e96cf
Commit Graph

1899 Commits

Author SHA1 Message Date
Micah Acinapura
e2da387473 added spice frame info functions to spice manager (#1427) 
* Added spice frame info functions to spice manager
 2020-12-08 16:19:07 +01:00
Alexander Bock
86bb19d81c Feature/warnings (#1425) 
* Remove MSVC, GCC, Clang compiler warnings
* Remove cppcheck warnings
 2020-12-07 23:43:05 +01:00
Alexander Bock
51470c0a0d Issue/1355 (#1424) 
* Move glfw init after macOS window is ready
* MacOS fixes for BigSur
* Compile fixs
* Rename hirise.asset since linux filenames are case-sensitive
* Modified globals DataStorage method to make Linux and Mac happy
* Switched to unsecure http URLs for satellites due to httprequest problem
* Keep the QApplication around on Mac because of some reason otherwise the keyboard handler crashes
* Add comment explaining the madness
* Apply same techniques to the globalscallback file

Co-authored-by: Micah Acinapura <micahnyc@gmail.com>
Co-authored-by: Gene Payne <payne.gene@gmail.com>
 2020-12-07 23:41:20 +01:00
Emma Broman
9a683bb29a Rename ScreenSpaceRenderable alpha to opacity (closes #1416) (#1421) 2020-12-05 23:22:24 +01:00
Gene Payne
876493c6dd Comment-only changes with instructions for bumping SessionRecording version 2020-11-30 21:38:54 -07:00
Alexander Bock
60e3ed2170 General pass for coding style 2020-11-28 22:31:06 +01:00
GPayne
4de671e673 Fix for ascii files with windows line endings, or missing file extension 2020-11-25 13:34:50 -07:00
GPayne
0939c14639 Switched to stringstream of conversion input file, fixed binary read bug 2020-11-24 17:48:30 -07:00
GPayne
2c91c21be5 Temporarily block legacy versions, switched to using class member buffer 2020-11-23 00:14:15 -07:00
GPayne
3ba3d25a6b Changes to accept both unix and windows style path delimiters 2020-11-21 00:40:02 -07:00
GPayne
251c4d2317 Merging master into session recording changes for issue 1366 2020-11-20 10:32:58 -07:00
GPayne
763fb110d1 Removed a few obsolete functions 2020-11-19 20:23:59 -07:00
Gene Payne
822c3a2d26 Working session record conversions in tasks and OS application 2020-11-19 15:04:00 -07:00
Gene Payne
9c9f547a10 Some bug fixes for recursion problems 2020-11-18 10:20:38 -07:00
Gene Payne
76e82f273a Updates to header for sess rec legacy inherited class 2020-11-17 20:55:31 -07:00
Gene Payne
ff433fd404 Added convert file format version sess rec task for taskrunner 2020-11-17 20:54:46 -07:00
Alexander Bock
8d7300a242 Add the ability to change the screenshot folder at runtime (#1172) 2020-11-16 14:22:56 +01:00
Alexander Bock
73d920d40d Make the linear speed dependent on the current framerate (closes #1369) 2020-11-16 14:00:18 +01:00
Alexander Bock
88f546ca7d Add property to disable joystickinput 
Set that property to false by default to disable stray joystick input (closes #1370)
 2020-11-16 11:36:16 +01:00
Gene Payne
86140d753e First draft of file format conversion ready for testing 2020-11-15 18:41:18 -07:00
Gene Payne
e23e5cf16f First steps on session recording conversion 2020-11-13 22:40:35 -07:00
Alexander Bock
b4951d6607 Add some rudimentary soft FPS cap 2020-11-13 17:12:12 +01:00
Micah Acinapura
cc7c0092a3 Feature/meta identifier list (#1357) 
Updating asset.meta.identifiers to be dictionary/list instead of string
 2020-10-28 14:25:34 +01:00
Alexander Bock
efffc25ce0 Feature/globals handling (#1352) 
* Cleaner handling of global state
* Prevent Lua memory corruption (closes #982)
* Initialize glfw first thing to prevent weird joystick loading bug during startup
 2020-10-21 22:30:05 +02:00
Alexander Bock
8cf5f96392 Better handle interpolation when setting interpolation time to 0 
Prevent NaNs from appearing when selecting a linear flight distance of 0 (closes #1329)
 2020-10-21 00:53:12 +02:00
Alexander Bock
811a84df0f Fix issue where Wormhole server's script messages could not be decoded 
Fix issue where dashboard item for parallel peer would not report line number correctly
Closes #1011
 2020-10-19 17:48:16 +02:00
Alexander Bock
d0aaaeb090 Merge remote-tracking branch 'origin/master' into feature/profile-gui 
# Conflicts:
#	data/profiles/apollo8.profile
#	data/profiles/apollo_sites.profile
#	data/profiles/asteroids.profile
#	data/profiles/dawn.profile
#	data/profiles/default.profile
#	data/profiles/default_full.profile
#	data/profiles/gaia.profile
#	data/profiles/insight.profile
#	data/profiles/juno.profile
#	data/profiles/mars.profile
#	data/profiles/messenger.profile
#	data/profiles/newhorizons.profile
#	data/profiles/osirisrex.profile
#	data/profiles/rosetta.profile
#	data/profiles/touch.profile
#	data/profiles/voyager.profile
 2020-10-13 16:32:58 +02:00
Alexander Bock
77907fc7df Rename ProfilesReadOnly -> ReadOnlyProfiles 2020-10-13 16:22:05 +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
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