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

..

joysticks

Change back filename of joystick assets

2021-06-15 09:47:34 +02:00

add_marker.asset

Enable Screenspace renderable to have a multiplicative color; Add new asset to show a target marker (closes #85); Fix bug with wrong documentation shown in RenderablePlane

2021-05-08 18:08:56 +02:00

asset_helper.asset

Update assethelper to new version

2021-11-23 15:49:02 -05:00

circle.asset

Address PR comments

2021-05-31 15:34:54 +02:00

debug_helper.asset

Fix DebugAxis helper; Increase the sensitivity to prevent loss of color in debug axis (closes #1560)

2021-07-28 14:49:29 +02:00

default_keybindings.asset

Fix missing keybind for taking screenshots (closes #1786)

2021-11-26 14:50:19 +01:00

generate_bookmarks.asset

Adjust tab width for asset and task files

2021-04-28 19:19:51 +02:00

ipac.asset

Adjust tab width for asset and task files

2021-04-28 19:19:51 +02:00

launcher_images.asset

added new launcher images for v17

2021-07-14 11:48:50 -04:00

lua_state_machine_helper.asset

Feature/state machine (#1705)

2021-08-16 09:29:45 +02:00

procedural_globe.asset

Adjust tab width for asset and task files

2021-04-28 19:19:51 +02:00

property_helper.asset

Adjust tab width for asset and task files

2021-04-28 19:19:51 +02:00

renderable_helper.asset

Adjust tab width for asset and task files

2021-04-28 19:19:51 +02:00

screenshots_endpoint.asset

Adjust tab width for asset and task files

2021-04-28 19:19:51 +02:00

script_scheduler_helper.asset

Adjust tab width for asset and task files

2021-04-28 19:19:51 +02:00

slide_deck_helper.asset

Adjust tab width for asset and task files

2021-04-28 19:19:51 +02:00

static_server.asset

Adjust tab width for asset and task files

2021-04-28 19:19:51 +02:00

streamnodes_textures.asset

some edits from PR comments

2021-09-08 09:50:58 -04:00

testing_keybindings.asset

Feature/keybindings (#1708)

2021-08-18 10:58:20 +02:00

tle_helper.asset

Adjust tab width for asset and task files

2021-04-28 19:19:51 +02:00

vrt_flipbook_helper.asset

Adjust tab width for asset and task files

2021-04-28 19:19:51 +02:00

webgui.asset

Update GUI hash

2021-11-23 11:42:33 +01:00