Commit Graph

188 Commits

Author SHA1 Message Date
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
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
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
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
Malin E 5ae9bfcd14 Fix shouldInvert default value for joysticks 2021-11-15 12:56:38 +01:00
Malin E f591ba2195 Fix roll for controllers 2021-11-15 11:25:12 +01:00
Malin E 3fdae48092 Exchange normalisation property for joysticks to JoystickType
* Joysticks can either be "JoystickLike" or "TriggerLike", where the
  triggers are normalized and have the deadzone close to -1 instead to 0

* Solves issue with zoom friction not to turn off for controllers
2021-11-12 11:46:17 +01:00
Malin E 2b4e1ae8fd Update name in PS4 and Xbox assets 2021-11-11 09:26:04 +01:00
Malin E 5ed69aea6b Update joysitck assets
* NOTE: Xbox and PS4 names have not yet been added
2021-11-05 13:03:10 +01:00
ElonOlsson 9d503ff86e Merge branch 'master' into thesis/2020/radiation 2021-09-17 11:06:15 -04:00
Micah fff66c7855 update guihash for keyboard viewer 2021-09-14 12:55:43 -04:00
ElonOlsson 423d854615 Merge branch 'master' into thesis/2020/radiation 2021-09-13 18:23:33 -04:00
ElonOlsson 70424290b7 some edits from PR comments 2021-09-08 09:50:58 -04:00
Micah 19ab24374f update guihash for action cleanup and route 2021-09-02 16:42:04 -04:00
Micah 671894bd0b changes for action panel 2021-09-02 14:56:25 -04:00
Micah faf7a3d315 update guihash for tutorial link 2021-08-27 13:17:52 -04:00
Alexander Bock 34985f64a6 Feature/keybindings (#1708)
* Add action manager to handle actions in replacement of keyboard shortcuts
* Implement new Action concept
* Remove the shortcutscomponent as it is no longer needed
* Update profile version from 1.0 to 1.1
* Add action dialog
* Restructure of key specification in keys.h
* Remove solid field-of-view keybind from the newhorizons profile as the setting no longer exists
2021-08-18 10:58:20 +02:00
ElonOlsson 743e2452f8 merge master to thesis branch 2021-08-16 15:23:49 -04:00
Emma Broman 8d7d8b9ba4 Feature/state machine (#1705)
* Fix script error in old state machine example

* Add a module with a more complex state machine, that can be created and controlled through the Lua API. Useful for interactive installations

* Add an example asset for the new state machine and rename the old linear "state machine" to luastatemachine


Co-authored-by: Malin Ejdbo <malin.ejdbo@gmail.com>
2021-08-16 09:29:45 +02:00
Alexander Bock 309bce2e30 Fix DebugAxis helper; Increase the sensitivity to prevent loss of color in debug axis (closes #1560) 2021-07-28 14:49:29 +02:00
Micah 3069457d67 added new launcher images for v17 2021-07-14 11:48:50 -04:00
Micah Acinapura 4a51eec75a update gui hash 2021-07-05 15:06:53 -04:00
ElonOlsson 7689cf1f65 master merge 2021-06-16 18:22:57 -04:00
Malin Ejdbo 027026a9b3 Change back filename of joystick assets 2021-06-15 09:47:34 +02:00
Malin Ejdbo e1db36f106 Force filename change for non case sensitive git 2021-06-15 09:46:07 +02:00
Malin Ejdbo 8952bb0dad Lower case asset file names 2021-06-15 09:42:34 +02:00
Malin Ejdbo 1daf2b244d Address PR comments 2021-06-11 18:13:44 +02:00
Malin Ejdbo db027f9554 Add empty line at end of file 2021-06-11 17:06:30 +02:00
Malin Ejdbo 8c989cc7bb Make distinction between stick and stick button clearer for controller 2021-06-11 17:04:02 +02:00
Malin Ejdbo d139b38d31 Seperate the different joystick configurations into their own assets 2021-06-11 16:30:16 +02:00
Emma Broman 7fdff09144 Update gui hash (fixes error on empty listproperty input) 2021-06-07 10:14:39 +02:00
Malin Ejdbo 9f7b8aa32b Merge branch 'master' into feature/jwst
* Resolve conflict
2021-05-31 15:45:10 +02:00
Malin Ejdbo 31b834dbb2 Address PR comments 2021-05-31 15:34:54 +02:00
Emma Broman ef35749952 Update GUI hash 2021-05-28 17:17:07 +02:00
Malin Ejdbo 13163066df Add Hubble Ultra Deep Field asset 2021-05-27 16:09:34 +02:00
ElonOlsson d96f12396f merge + codegen doc return 2021-05-26 11:00:50 -04:00
GPayne 0d5909b6a9 Merge master in 2021-05-24 23:49:51 -06:00
GPayne e374eef72d Fixed merge conflicts with master 2021-05-20 19:55:49 -06:00
Malin Ejdbo 80eba3bdd9 Address PR comments 2021-05-20 13:44:45 +02:00
GPayne 413639e9fe Fixed problems with pausing time and time management 2021-05-19 19:47:51 -06:00