From c5c74338f88d393ee0724becf206f7d8dde744e0 Mon Sep 17 00:00:00 2001 From: Bastiaan Olij Date: Tue, 28 Nov 2023 13:26:29 +1100 Subject: [PATCH] Prepare release 4.3.0 (#576) --- .../hands/blend/animations/animations_hand_l.blend.import | 3 +++ .../hands/blend/animations/animations_hand_r.blend.import | 3 +++ addons/godot-xr-tools/hands/blend/hand_l.blend.import | 3 +++ addons/godot-xr-tools/hands/blend/hand_r.blend.import | 3 +++ addons/godot-xr-tools/materials/highlight.tres | 2 ++ addons/godot-xr-tools/misc/hold_button_visualshader.tres | 2 +- addons/godot-xr-tools/plugin.cfg | 2 +- .../staging/loading_screen/loading_screen_shader.tres | 2 +- assets/meshes/knife/knife.blend.import | 3 +++ assets/meshes/mound/mound.blend.import | 3 +++ assets/meshes/ramps/ramps.blend.import | 3 +++ assets/meshes/teacup/teacup.blend.import | 3 +++ assets/meshes/teleport/teleport.blend.import | 3 +++ assets/meshes/tube/tube.blend.import | 3 +++ 14 files changed, 35 insertions(+), 3 deletions(-) create mode 100644 addons/godot-xr-tools/hands/blend/animations/animations_hand_l.blend.import create mode 100644 addons/godot-xr-tools/hands/blend/animations/animations_hand_r.blend.import create mode 100644 addons/godot-xr-tools/hands/blend/hand_l.blend.import create mode 100644 addons/godot-xr-tools/hands/blend/hand_r.blend.import create mode 100644 assets/meshes/knife/knife.blend.import create mode 100644 assets/meshes/mound/mound.blend.import create mode 100644 assets/meshes/ramps/ramps.blend.import create mode 100644 assets/meshes/teacup/teacup.blend.import create mode 100644 assets/meshes/teleport/teleport.blend.import create mode 100644 assets/meshes/tube/tube.blend.import diff --git a/addons/godot-xr-tools/hands/blend/animations/animations_hand_l.blend.import b/addons/godot-xr-tools/hands/blend/animations/animations_hand_l.blend.import new file mode 100644 index 00000000..8dd0c09d --- /dev/null +++ b/addons/godot-xr-tools/hands/blend/animations/animations_hand_l.blend.import @@ -0,0 +1,3 @@ +[remap] + +importer="keep" diff --git a/addons/godot-xr-tools/hands/blend/animations/animations_hand_r.blend.import b/addons/godot-xr-tools/hands/blend/animations/animations_hand_r.blend.import new file mode 100644 index 00000000..8dd0c09d --- /dev/null +++ b/addons/godot-xr-tools/hands/blend/animations/animations_hand_r.blend.import @@ -0,0 +1,3 @@ +[remap] + +importer="keep" diff --git a/addons/godot-xr-tools/hands/blend/hand_l.blend.import b/addons/godot-xr-tools/hands/blend/hand_l.blend.import new file mode 100644 index 00000000..8dd0c09d --- /dev/null +++ b/addons/godot-xr-tools/hands/blend/hand_l.blend.import @@ -0,0 +1,3 @@ +[remap] + +importer="keep" diff --git a/addons/godot-xr-tools/hands/blend/hand_r.blend.import b/addons/godot-xr-tools/hands/blend/hand_r.blend.import new file mode 100644 index 00000000..8dd0c09d --- /dev/null +++ b/addons/godot-xr-tools/hands/blend/hand_r.blend.import @@ -0,0 +1,3 @@ +[remap] + +importer="keep" diff --git a/addons/godot-xr-tools/materials/highlight.tres b/addons/godot-xr-tools/materials/highlight.tres index d7367129..0480f11b 100644 --- a/addons/godot-xr-tools/materials/highlight.tres +++ b/addons/godot-xr-tools/materials/highlight.tres @@ -17,6 +17,8 @@ operator = 2 [sub_resource type="VisualShader" id="VisualShader_wb0u4"] code = "shader_type spatial; +render_mode blend_mix, depth_draw_opaque, cull_back, diffuse_lambert, specular_schlick_ggx; + uniform vec4 Color : source_color; diff --git a/addons/godot-xr-tools/misc/hold_button_visualshader.tres b/addons/godot-xr-tools/misc/hold_button_visualshader.tres index bddcbec9..084664c9 100644 --- a/addons/godot-xr-tools/misc/hold_button_visualshader.tres +++ b/addons/godot-xr-tools/misc/hold_button_visualshader.tres @@ -102,7 +102,7 @@ function = 12 [resource] code = "shader_type spatial; -render_mode unshaded; +render_mode blend_mix, depth_draw_opaque, cull_back, diffuse_lambert, specular_schlick_ggx, unshaded; uniform vec4 albedo : source_color; uniform float value; diff --git a/addons/godot-xr-tools/plugin.cfg b/addons/godot-xr-tools/plugin.cfg index 7e182020..d8bf9c4b 100644 --- a/addons/godot-xr-tools/plugin.cfg +++ b/addons/godot-xr-tools/plugin.cfg @@ -3,5 +3,5 @@ name="Godot XR Tools" description="Godot XR Tools plugin" author="Bastiaan Olij and Contributors" -version="4.2.1" +version="4.3.0" script="plugin.gd" diff --git a/addons/godot-xr-tools/staging/loading_screen/loading_screen_shader.tres b/addons/godot-xr-tools/staging/loading_screen/loading_screen_shader.tres index a31535e2..2d83f5ff 100644 --- a/addons/godot-xr-tools/staging/loading_screen/loading_screen_shader.tres +++ b/addons/godot-xr-tools/staging/loading_screen/loading_screen_shader.tres @@ -63,7 +63,7 @@ condition = 1 [resource] code = "shader_type spatial; -render_mode unshaded; +render_mode blend_mix, depth_draw_opaque, cull_back, diffuse_lambert, specular_schlick_ggx, unshaded; uniform vec4 bar_color : source_color; uniform sampler2D bar_texture : source_color; diff --git a/assets/meshes/knife/knife.blend.import b/assets/meshes/knife/knife.blend.import new file mode 100644 index 00000000..8dd0c09d --- /dev/null +++ b/assets/meshes/knife/knife.blend.import @@ -0,0 +1,3 @@ +[remap] + +importer="keep" diff --git a/assets/meshes/mound/mound.blend.import b/assets/meshes/mound/mound.blend.import new file mode 100644 index 00000000..8dd0c09d --- /dev/null +++ b/assets/meshes/mound/mound.blend.import @@ -0,0 +1,3 @@ +[remap] + +importer="keep" diff --git a/assets/meshes/ramps/ramps.blend.import b/assets/meshes/ramps/ramps.blend.import new file mode 100644 index 00000000..8dd0c09d --- /dev/null +++ b/assets/meshes/ramps/ramps.blend.import @@ -0,0 +1,3 @@ +[remap] + +importer="keep" diff --git a/assets/meshes/teacup/teacup.blend.import b/assets/meshes/teacup/teacup.blend.import new file mode 100644 index 00000000..8dd0c09d --- /dev/null +++ b/assets/meshes/teacup/teacup.blend.import @@ -0,0 +1,3 @@ +[remap] + +importer="keep" diff --git a/assets/meshes/teleport/teleport.blend.import b/assets/meshes/teleport/teleport.blend.import new file mode 100644 index 00000000..8dd0c09d --- /dev/null +++ b/assets/meshes/teleport/teleport.blend.import @@ -0,0 +1,3 @@ +[remap] + +importer="keep" diff --git a/assets/meshes/tube/tube.blend.import b/assets/meshes/tube/tube.blend.import new file mode 100644 index 00000000..8dd0c09d --- /dev/null +++ b/assets/meshes/tube/tube.blend.import @@ -0,0 +1,3 @@ +[remap] + +importer="keep"