Malin Ejdbo 4fb8a36952 Merge branch 'master' into feature/multitexturing ...

* Resolve conflicts

2021-03-02 15:49:39 +01:00

..

asset_helper.asset

Update assets for new model loading structure

2021-02-03 10:19:35 +01:00

debug_helper.asset

Small grid renderable updates/fixes (#1473)

2021-01-28 09:22:50 +01:00

default_dashboard.asset

…

default_joystick.asset

…

default_keybindings.asset

Merge pull request #1302 from OpenSpace/issue/1285

2020-10-12 08:35:36 +02:00

generate_bookmarks.asset

Small grid renderable updates/fixes (#1473)

2021-01-28 09:22:50 +01:00

ipac.asset

…

launcher_images.asset

launcher label and profile fixes

2020-10-13 12:42:10 -04:00

procedural_globe.asset

update of all profiles to json format, few asset fixes

2020-10-12 04:22:16 -04:00

property_helper.asset

…

renderable_helper.asset

Some more cleanup of empty lines

2020-10-10 12:50:38 +02:00

scene_helper.asset

Remove old delta time keys code

2020-09-21 13:37:31 +02:00

screenshots_endpoint.asset

Some more cleanup of empty lines

2020-10-10 12:50:38 +02:00

script_scheduler_helper.asset

…

slide_deck_helper.asset

Update slide_deck_helper.asset

2020-12-19 21:19:35 +01:00

state_machine_helper.asset

Some more cleanup of empty lines

2020-10-10 12:50:38 +02:00

static_server.asset

Some more cleanup of empty lines

2020-10-10 12:50:38 +02:00

testing_keybindings.asset

Feature/serve screenshots (#1003)

2019-11-01 10:41:59 +01:00

tle_helper.asset

Fixes for Issue #1409 (#1501)

2021-02-17 12:41:05 -07:00

vrt_flipbook_helper.asset

update of all profiles to json format, few asset fixes

2020-10-12 04:22:16 -04:00

webgui.asset

Feature/meta identifier list (#1357)

2020-10-28 14:25:34 +01:00