From 56afc07d8364bf4ea337e6e5695a56f8fcd31071 Mon Sep 17 00:00:00 2001 From: AleaJactaEst Date: Sat, 12 Feb 2022 14:16:26 +0100 Subject: [PATCH] update to use Godot_v4.0-alpha2 --- .gitignore | 1 + maps/basic_setup.tscn | 2 +- maps/ramp-complex.tscn | 9 +++++---- start-khanat-client.sh | 4 ++-- 4 files changed, 9 insertions(+), 7 deletions(-) diff --git a/.gitignore b/.gitignore index f46600b..96dfbf1 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,6 @@ # Godot 4+ specific ignores .godot/ Godot.zip +Godot_v4*linux.64.zip Godot_v4*linux.64 *.old diff --git a/maps/basic_setup.tscn b/maps/basic_setup.tscn index df9da4d..967361a 100644 --- a/maps/basic_setup.tscn +++ b/maps/basic_setup.tscn @@ -43,7 +43,7 @@ shadow_enabled = true environment = SubResource( "Environment_n5kgx" ) [node name="floor" type="MeshInstance3D" parent="."] -transform = Transform3D(40, 0, 0, 0, 0.1, 0, 0, 0, 40, 0, -0.1, 0) +transform = Transform3D(80, 0, 0, 0, 0.1, 0, 0, 0, 80, 0, -0.1, 0) mesh = SubResource( "BoxMesh_k23th" ) [node name="collision" type="StaticBody3D" parent="floor"] diff --git a/maps/ramp-complex.tscn b/maps/ramp-complex.tscn index cda8aa1..7bcbcdc 100644 --- a/maps/ramp-complex.tscn +++ b/maps/ramp-complex.tscn @@ -10,7 +10,7 @@ material = ExtResource( "1_6ofch" ) [node name="ramp-complex" type="Node3D"] [node name="ramp" type="MeshInstance3D" parent="."] -transform = Transform3D(1.69964, 0.0527074, 0, -1.05415, 0.0849819, 0, 0, 0, 2, 3.88877, 1, 1.27697) +transform = Transform3D(3.39928, 0.0527074, 0, -2.1083, 0.0849819, 0, 0, 0, 2, 2.18919, 0.954236, 1.27697) mesh = SubResource( "BoxMesh_k23th" ) skeleton = NodePath("../..") @@ -20,7 +20,7 @@ skeleton = NodePath("../..") shape = SubResource( "BoxShape3D_6y272" ) [node name="ramp2" type="MeshInstance3D" parent="."] -transform = Transform3D(0, -2.98023e-09, 2, -1.05391, 0.0849893, 0, -1.69979, -0.0526956, 0, -2.71124, 1, -2.4059) +transform = Transform3D(4.76837e-07, 0, 2, -2.10782, 0.0849894, 1.19209e-07, -3.39957, -0.0526954, 2.38419e-07, -1.99663, 0.941421, -1.4163) mesh = SubResource( "BoxMesh_k23th" ) skeleton = NodePath("../..") @@ -40,7 +40,7 @@ skeleton = NodePath("../..") shape = SubResource( "BoxShape3D_6y272" ) [node name="wall" type="MeshInstance3D" parent="."] -transform = Transform3D(3.503, 0, 0, 0, 0, -2, 0, 0.1, 0, -1.26628, 2, 3.18398) +transform = Transform3D(4, 0, 0, 0, 0, -4, 0, 0.1, 0, -0.978678, 2, 2.29982) mesh = SubResource( "BoxMesh_k23th" ) skeleton = NodePath("../..") @@ -50,11 +50,12 @@ skeleton = NodePath("../..") shape = SubResource( "BoxShape3D_6y272" ) [node name="wall2" type="MeshInstance3D" parent="."] -transform = Transform3D(1.19209e-07, 0.1, 0, 0, 5.96046e-09, -2, -2, 0, 1.19209e-07, -4.7697, 2, 1.19322) +transform = Transform3D(1.19209e-07, 0.1, 0, 0, 0, -4, -2, 8.9407e-09, 0, -3.1104, 2, 1.19322) mesh = SubResource( "BoxMesh_k23th" ) skeleton = NodePath("../..") [node name="collision" type="StaticBody3D" parent="wall2"] [node name="shape" type="CollisionShape3D" parent="wall2/collision"] +transform = Transform3D(1, 0, 0, 0, 1, -6.77626e-21, 2.11758e-22, 0, 1, 0, 0, 0) shape = SubResource( "BoxShape3D_6y272" ) diff --git a/start-khanat-client.sh b/start-khanat-client.sh index 28f1b19..c09b01a 100755 --- a/start-khanat-client.sh +++ b/start-khanat-client.sh @@ -5,8 +5,8 @@ declare HELP=0 declare EDITOR=0 declare FORCE=0 declare WORKDIR="$(dirname $(readlink -f $0))" -declare GODOT_SRC="https://downloads.tuxfamily.org/godotengine/4.0/alpha1/Godot_v4.0-alpha1_linux.64.zip" -declare OUTZIP="$WORKDIR/Godot.zip" +declare GODOT_SRC="https://downloads.tuxfamily.org/godotengine/4.0/alpha2/Godot_v4.0-alpha2_linux.64.zip" +declare OUTZIP="$WORKDIR/$(basename $GODOT_SRC)" declare OPTION="" function msg_debug()