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
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
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
