From b6189a93b73272cbe596937c91f810d5bf65ccbd Mon Sep 17 00:00:00 2001
From: Canopteks <thomas.duhamel@protonmail.com>
Date: Tue, 10 Mar 2020 17:38:44 +0100
Subject: [PATCH] premerge feature-branch teamrocket
---
client/levels/test/game.tscn | 2 +-
client/project.godot | 1 +
server/levels/test/game.tscn | 2 +-
3 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/client/levels/test/game.tscn b/client/levels/test/game.tscn
index 0c1ce37..4f05771 100644
--- a/client/levels/test/game.tscn
+++ b/client/levels/test/game.tscn
@@ -13,7 +13,7 @@ fov = 30.0
[node name="structure" type="Spatial" parent="."]
[node name="bloc" parent="structure" instance=ExtResource( 2 )]
-transform = Transform( 10, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0 )
+transform = Transform( 30, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0 )
[node name="bloc2" parent="structure" instance=ExtResource( 2 )]
transform = Transform( 5, 0, 0, 0, 1, 0, 0, 0, 1, 0, 4.15191, 0 )
diff --git a/client/project.godot b/client/project.godot
index 936fcb6..a3b0c06 100644
--- a/client/project.godot
+++ b/client/project.godot
@@ -35,6 +35,7 @@ movementJump={
"deadzone": 0.5,
"events": [ Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":32,"unicode":0,"echo":false,"script":null)
, Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":16777232,"unicode":0,"echo":false,"script":null)
+, Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":90,"unicode":0,"echo":false,"script":null)
]
}
movementRight={
diff --git a/server/levels/test/game.tscn b/server/levels/test/game.tscn
index 0e4f930..3fc5373 100644
--- a/server/levels/test/game.tscn
+++ b/server/levels/test/game.tscn
@@ -16,7 +16,7 @@ fov = 30.0
[node name="structure" type="Spatial" parent="."]
[node name="bloc" parent="structure" instance=ExtResource( 2 )]
-transform = Transform( 10, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0 )
+transform = Transform( 30, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0 )
[node name="bloc2" parent="structure" instance=ExtResource( 2 )]
transform = Transform( 5, 0, 0, 0, 1, 0, 0, 0, 1, 0, 4.15191, 0 )
--
GitLab