Commit Graph

2259 Commits

Author SHA1 Message Date
Malin E 6ec1a56c6a Merge branch 'master' into issue/1964 2022-04-21 09:03:28 +02:00
Malin E 71cae1363d Add axis deadzones to enterprise version of SpaceMouse 2022-04-20 17:35:29 +02:00
Malin E 6085c6affc Add variable to add all detected joysticks or not
* And remove the added joystick assets in the deinitialize
2022-04-20 14:57:41 +02:00
Malin E 1d2011e7a2 Small clean up of auto detect asset 2022-04-20 14:27:43 +02:00
Malin E aff89c4d47 Add asset for auto detection of supported joysticks 2022-04-19 12:13:47 +02:00
Malin E 0bf1fa3845 Merge branch 'master' into issue/1989 2022-04-19 11:33:18 +02:00
Malin E 1b25e1b0dc Fix jwst pointing event 2022-04-19 11:26:57 +02:00
Malin E 3e81092c68 Add duration to pointing event 2022-04-19 11:26:16 +02:00
ElonOlsson 89dd91a40a fix opacity issue with volume rendering, opacity changed to brightness in raycaster 2022-04-14 16:11:38 -04:00
Malin E 8e2fd76e7e Add different versions of spacemouse joystick asset 2022-04-14 09:38:48 +02:00
Malin E 9d61fbf980 Add asset file for xbox wireless joystick input 2022-04-13 17:24:01 +02:00
Malin E d70af0221b Add helper function to find joystick with many possible names
* And check connected joystick statuses at start up as well as run time
2022-04-13 17:05:10 +02:00
Alexander Bock bd0de385ba Fix the name of the camera velocity dashboard item 2022-04-13 16:34:02 +02:00
Malin E 092fac0f59 Merge branch 'master' of github.com:OpenSpace/OpenSpace 2022-04-13 10:41:15 +02:00
Malin E 2b244f87fd Fix small JWST target images issue 2022-04-13 10:40:31 +02:00
Alexander Bock f532a352d6 Update WebGui hash (closes #2012, closes #1991) 2022-04-12 20:54:24 +02:00
Emma Broman 8f1845d07e Fix delay on opening ScreenSpaceRenderables Panel 2022-04-11 19:00:53 +02:00
Alexander Bock 244be4cea8 Update Frontend hash 2022-04-08 20:34:49 +02:00
Micah Acinapura 5917ac598a Feature/location measure (#1987)
* wip commit for measuring

* wip;fixing for codegene change

* adding asset file

* clean up comments

* pr comment cleanup
2022-04-08 14:13:23 -04:00
Alexander Bock fbd05b6125 Update WebGUI frontend hash 2022-04-08 19:39:44 +02:00
Micah Acinapura dcf8ff518b fixed identifer for treks layer 2022-04-08 13:30:49 -04:00
Micah Acinapura f1aef3b8a3 adding sample moon treks layers 2022-04-08 13:29:29 -04:00
Micah Acinapura 48b89a08a6 Issue/1824 (#1983)
* update globebrowsing customiztion to use env_var and added earth; closes #1824

* updated globebrowsing.asset
2022-04-08 12:49:17 -04:00
sylvass 15def75dc3 Merge pull request #1894 from OpenSpace/thesis/2021/skybrowser
Thesis/2021/skybrowser
2022-04-08 12:12:01 -04:00
Ylva Selling c9bbb4a533 Merge remote-tracking branch 'origin/master' into thesis/2021/skybrowser
# Conflicts:
#	include/openspace/rendering/screenspacerenderable.h
#	src/rendering/screenspacerenderable.cpp
2022-04-08 11:46:09 -04:00
Malin E 5121495702 Merge branch 'master' into feature/jwst-update 2022-04-08 17:24:16 +02:00
Malin E 5a1e330024 Merge branch 'master' into feature/horizons-framework 2022-04-08 17:16:50 +02:00
Alexander Bock 6eba57730f Dynamic DPI scaling (#1980)
* DPI scaling
 1. Add the ability to query the operating system's DPI scaling values
 2. Expose those values through a new Lua function
 3. Add an asset that sets the CEF gui and the Dashboard font sizes and placements based on the DPI scaling
 4. Add that new asset into the base_blank asset
* Add message when including the dpiscaling
2022-04-08 13:28:18 +02:00
Malin E 7b4ab8f2af Address more PR comments 2022-04-08 10:39:35 +02:00
Alexander Bock 68780a6622 Fix spelling mistake 2022-04-08 09:49:43 +02:00
Micah e2ea4cb918 added asset helper back with deprication warning 2022-04-07 23:44:06 -04:00
Malin E 62f4d39b9c First version of the Point JWST event 2022-04-07 16:47:24 +02:00
Malin E 45c776b7ba Address PR comments 2022-04-07 13:22:06 +02:00
Malin E 940a1d5a98 Update jwst horizons data
* NOTE: Will not work without the new Horizons changes
2022-04-06 14:42:41 +02:00
Malin E df46bcfcc1 Merge branch 'master' into feature/jwst-update 2022-04-06 13:37:17 +02:00
Alexander Bock f4115f9bea Use the new fade property for fading in the example events 2022-04-06 00:16:15 +02:00
Ylva Selling f6763eeeeb Merge branch 'master' into thesis/2021/skybrowser
# Conflicts:
#	modules/webbrowser/CMakeLists.txt
2022-04-04 16:14:50 -04:00
Malin E 12ba9f8bc0 Fix specification error 2022-03-31 14:43:20 +02:00
Malin E e9473103f1 Update location of Voyager and Pioneer data 2022-03-31 14:09:11 +02:00
Malin E e747af5003 Add HD 84406 as JWST target with image 2022-03-31 13:53:00 +02:00
Malin E 0bdf82f156 Merge branch 'master' into feature/jwst-update 2022-03-31 09:37:14 +02:00
GPayne 83561ca09d Added Starlink satellites asset file; closes #1818 2022-03-30 14:36:52 -06:00
GPayne 92b250d860 Added active satellites asset file; closes #1805 2022-03-30 14:35:34 -06:00
Malin E dcf77124c1 Remove old Voyager and Pioneer horizons data 2022-03-30 16:41:36 +02:00
Alexander Bock 3ba3e977eb Add an action to automatically switch the Sun and SunGlare when approaching the Sun (closes #1914) 2022-03-30 15:14:18 +02:00
Malin E e6c56cd6d0 Merge branch 'master' into feature/horizons-framework 2022-03-30 13:52:03 +02:00
Alexander Bock 5ea93cdd7b Prevent crash in DashboardItemInstruments when using dates before 2000 (closes #1878). Remove the padding images from New Horizons that screw up the instruments timing 2022-03-30 10:45:01 +02:00
Micah Acinapura b840ff8ea1 Feature/mars moons (#1963)
* Add Mars moon models

* wip commit

* update size and roations for deimos and phobos

* update asset for pr comments

Co-authored-by: Malin E <malin.ejdbo@gmail.com>
2022-03-29 13:47:12 -04:00
Malin E 7b987d4fea Update HUDF image 2022-03-29 16:53:10 +02:00
Malin E 3a0907129b Add other JWST target images 2022-03-29 11:30:50 +02:00