mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-04-21 10:28:44 -05:00
Code Issues Packages Projects Releases Wiki Activity
9,910 Commits 82 Branches 47 Tags
dbb3b65927397b2e58d35ff1dc359dd70cb40eca
Commit Graph

226 Commits

Author SHA1 Message Date
Micah Acinapura 5c3aef96c1 Remove orion neblua from base; updatedpaths for actions (#2088) 
* Removed Orion nebula from base and added to default_full profile
* Updated paths for actions
* Added debug action for undoing event fading

Co-authored-by: Alexander Bock <mail@alexanderbock.eu>
 2022-05-06 13:33:44 -04:00
Emma Broman ec51ffca05 Update gui hash 
Reverts change that wrecked sky browser performance
 2022-05-06 14:51:26 +02:00
Alexander Bock 96591206ac Update the WebGUI hash 2022-05-05 22:59:23 -07:00
Micah Acinapura 7d480552a9 Issue/1814 (#2077) 
* Added all trail toggle
* Added actions for trails and planets/moons
* Added planet lighting assetd; updated action paths
* Add mars layers actions
* Added new layers from Carter
* Cleaned up trail action names, cleaned up some default keybindings

Co-authored-by: Alexander Bock <mail@alexanderbock.eu>
 2022-05-05 19:08:58 -07:00
Emma Broman 3dce00570f Gui hash (Fi updated URI to toggle ImGui) 2022-05-02 15:05:17 +02:00
Alexander Bock 69c8750921 Feature/imgui (#2060) 
* Some cleanup of the ImGUI code
* Reorder the panels
* Make StringPropertys work without losing value on context loss
* Add a new ImGui compoment that shows the status of the scene graph
 2022-04-30 13:54:36 +02:00
Malin E 84df643b86 Merge pull request #2047 from OpenSpace/issue/1989 
Issue/1989
 2022-04-29 17:35:17 +02:00
Emma Broman 109dd6eec8 Update Gui hash (to only load exoplanet data when enabled) 2022-04-28 14:42:04 +02:00
Malin E 046213dd31 Merge branch 'master' into issue/1989 2022-04-28 10:04:57 +02:00
Malin E 55278574e9 Remove unsupported buttons on the SpaceMouse enterprise joystick 
* GLFW cannot detect the buttons for the enterprise version of the
  SpaceMouse
 2022-04-27 11:21:56 +02:00
Malin E 860d4c30d2 Address PR comments + fix issue with refocus button on joysticks 2022-04-27 10:49:17 +02:00
Emma Broman 8790a531b1 Update GUI hash to get module enabled update 
OpenSpace/OpenSpace-WebGuiFrontend/#80
 2022-04-25 15:28:00 +02:00
Malin E 516be81ecd Simplify setting of deadzone size in assets 2022-04-25 10:45:54 +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 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 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
Alexander Bock fbd05b6125 Update WebGUI frontend hash 2022-04-08 19:39:44 +02: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
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
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
Ylva Selling 3c8aacaa4f Update web gui hash to newest version of the gui 2022-03-25 11:37:47 -04:00
Ylva Selling 3d117652c0 Update hash to new version of gui 2022-03-23 09:30:10 -04:00
Ylva Selling a34beec441 Use the latest commit on the sky browser gui as default 2022-03-21 11:54:58 -04:00
sylvass 21e572149e Fix comments from pull request 2022-03-02 16:39:44 -05:00
Emma Broman 2d3c76f222 Update gui hash to get camera path gui (closes #1854) 2022-03-02 18:58:41 +01:00
Emma Broman 7295a25af3 Gui update 
* Remove linear flight from touch UI
* Fix some weird drag behavior for layers (now only title is daggable, not the entire propertyowner)
 2022-02-27 20:55:57 +01:00
sylvass d96ea9189d Reset files that shouldn't be changed for pull request 2022-02-22 16:20:40 -05:00
sylvass bcf463ad66 Merge remote-tracking branch 'origin/master' into thesis/2021/skybrowser 
# Conflicts:
#	data/assets/util/asset_helper.asset
#	data/assets/util/webgui.asset
 2022-02-22 10:25:46 -05:00
Emma Broman 3406407435 Update gui hash (to get fix for #1775) 2022-02-11 17:10:49 +01:00
Alexander Bock 8b74493d96 Removing the asset_helper file (#1868) 
- Remove the asset_helper file and call the onInitialize and onDeinitialize functions directly
 - Small compile fix on Windows
 - Removes the need for the registerIdentifierWithMeta function by automatically doing that for all asset.export statements
 - Allow the passing of either identifiers (as before) or entire tables to the removeSceneGraphNode, removeScreenSpaceRenderable, deleteLayer, removeAction, and export methods. In that case, the Identifier key from the table is extracted and used instead
 2022-02-01 23:44:36 +01:00
Micah Acinapura 56460f818e Feature/asset meta update part2 (#1855) 
* changes to asset/loader/meta to support adding nodes created at runtime

* update assets meta.

* update tle helper and gui to work with changes

* fixes #1840

* group titan trail and atmosphere with globe

* license for magnetosphere

Co-authored-by: ElonOlsson <olssonelon@gmail.com>
 2022-01-31 15:58:41 -05:00
Emma Broman 26f5ce4c78 Update gui hash to get layer reordering feature 2022-01-18 19:14:16 +01:00
Alexander Bock 064a483b81 Cleanup and unifying coding style for asset files 2021-12-28 23:40:09 +01:00
Alexander Bock fdd995ba01 No longer require the filenames from a synced resource to start with a / 2021-12-28 00:10:01 +01:00
Malin E 01e17266b6 Merge pull request #1787 from OpenSpace/feature/multiple-joysticks 
Feature/multiple joysticks
 2021-12-22 13:22:01 +01:00
Alexander Bock debcb43ade Feature/assets (#1784) 
General overhaul of the Asset loading system
 2021-12-19 18:04:01 +01:00
sylvass 0e548b4a1b Merge branch 'master' into thesis/2021/skybrowser 
# Conflicts:
#	data/assets/util/webgui.asset
#	modules/webbrowser/src/screenspacebrowser.cpp
#	src/rendering/renderengine.cpp
 2021-11-30 10:47:46 -05:00
Malin E 2753de1ab9 Merge branch 'master' into feature/multiple-joysticks 2021-11-30 10:14:45 +01:00
Alexander Bock 01a04a6faa Fix missing keybind for taking screenshots (closes #1786) 2021-11-26 14:50:19 +01:00
sylvass 54ed28ce66 Update assethelper to new version 2021-11-23 15:49:02 -05:00
Emma Broman 2c7bbc5dee Update GUI hash 
Includes fix for broken touch gui
 2021-11-23 11:42:33 +01:00
Malin E 78b1f2c6e1 Remove support for sticky axis and sensitivity to Property type 2021-11-17 16:57:05 +01:00