Merge branch 'master' into develop

README.md

@@ -39,7 +39,7 @@ Open your `game.project` file and add the following lines to the dependencies fi
 **[Druid](https://github.com/Insality/druid/)**
 
 ```
-https://github.com/Insality/druid/archive/refs/tags/1.1.5.zip
+https://github.com/Insality/druid/archive/refs/tags/1.1.6.zip
 ```
 
 **[Defold Event](https://github.com/Insality/defold-event)**

druid/ext.properties

@@ -0,0 +1,35 @@
+[druid]
+help = Settings for Druid extension
+group = Runtime
+
+input_text.default = text
+
+input_touch.default = touch
+
+input_marked_text.default = marked_text
+
+input_key_esc.default = key_esc
+
+input_key_back.default = key_back
+
+input_key_enter.default = key_enter
+
+input_key_backspace.default = key_backspace
+
+input_multitouch.default = touch_multi
+
+input_scroll_up.default = mouse_wheel_up
+
+input_scroll_down.default = mouse_wheel_down
+
+input_key_left.default = key_left
+
+input_key_right.default = key_right
+
+input_key_lshift.default = key_lshift
+
+input_key_lctrl.default = key_lctrl
+
+input_key_lsuper.default = key_lsuper
+
+no_auto_input.type = bool

wiki/changelog.md

@@ -719,7 +719,14 @@ Please support me if you like this project! It will help me keep engaged to upda
 #### Druid 1.1.5
 - Update for using `defold-event` library v12
 
+#### Druid 1.1.6
+- [#326] Fix for Editor Scripts corrupt file issue
+
 ### Druid 1.2.0
+- [Image] Add image component
+	- Create with `druid:new_image(node_or_node_id)`
+	- Currently used to load image from resource path, absolute path or URL
+	- Can be fit inside (keeping aspect ratio) stretched to the node area, depends on the GUI adjust mode
 - [Blocker] Fix for internal is_enabled state
 - [Button] expose all click functions for the button
 - [Scroll] Add `scroll_to_make_node_visible` function
@@ -739,4 +746,3 @@ Please support me if you like this project! It will help me keep engaged to upda
 	- Add "Pages" to manage a a big lists of properties with paginations support
 	- Add `properties_panel:render_lua_table` to easily render your lua tables with a various types support (any simple types and vector, functions, events etc)
 	- Add "Refresh" button, which active a 1-sec refresh for current page
-