Merge pull request #3 from sebashtioon/OfficiallyMakingTheInventory

Minor changes (Crosshair size, Forward+ compatability)
NoeCoOfficial · Aug 21, 2024 · 85bcb99 · 85bcb99
2 parents bb777a4 + f3ba724
commit 85bcb99
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 7 deletions.
diff --git a/Scenes and Scripts/Scenes/Player/Player.tscn b/Scenes and Scripts/Scenes/Player/Player.tscn
@@ -143,4 +143,6 @@ horizontal_alignment = 1
 vertical_alignment = 1
 script = ExtResource("11_0enap")
 
+[node name="InventoryLayer" type="CanvasLayer" parent="Head/Camera3D"]
+
 [connection signal="timeout" from="AutoSaveTimer" to="." method="_on_auto_save_timer_timeout"]
diff --git a/Scenes and Scripts/Scenes/Player/Player_SCRIPT.gd b/Scenes and Scripts/Scenes/Player/Player_SCRIPT.gd
@@ -76,7 +76,7 @@ func _unhandled_input(event):
 	if event is InputEventMouseMotion:
 		head.rotate_y(-event.relative.x * SENSITIVITY)
 		camera.rotate_x(-event.relative.y * SENSITIVITY)
-		camera.rotation.x = clamp(camera.rotation.x, deg_to_rad(-60), deg_to_rad(80))
+		camera.rotation.x = clamp(camera.rotation.x, deg_to_rad(-90), deg_to_rad(90))
 ########################################
 
 ########################################

diff --git a/Scenes and Scripts/Scenes/World/world.tscn b/Scenes and Scripts/Scenes/World/world.tscn
@@ -107,11 +107,16 @@ script = ExtResource("4_esxor")
 transform = Transform3D(2, 0, 0, 0, 2, 0, 0, 0, 2, -38.0394, 11.7072, 0.276182)
 script = ExtResource("4_esxor")
 
+[node name="ActualSizeTree9" parent="." instance=ExtResource("16_mxrey")]
+transform = Transform3D(1.2, 0, 0, 0, 1.2, 0, 0, 0, 1.2, -38.0394, 21.3739, 30.1994)
+script = ExtResource("4_esxor")
+
 [node name="Player" parent="." groups=["Player"] instance=ExtResource("3_6yh0b")]
 transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -5.35405, 24.7629, -47.0385)
 StartPOS = Vector3(-5.354, 24.763, -47.038)
 ResetPOS = Vector3(999, 999, 999)
 Fade_In_Time = 2.0
+crosshair_size = Vector2(5, 5)
 
 [node name="Walls" type="Node" parent="."]
 

diff --git a/player.dat b/player.dat
@@ -1 +1 @@
-{"GAME_STATE":"NORMAL","Health":100,"Position":{"x":-8.22047996520996,"y":24.3862400054932,"z":-36.8679962158203}}
+{"GAME_STATE":"NORMAL","Health":100,"Position":{"x":-42.8670539855957,"y":24.3861618041992,"z":22.7945346832275}}
diff --git a/project.godot b/project.godot
@@ -77,8 +77,3 @@ Pause={
 "events": [Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":-1,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":4194305,"key_label":0,"unicode":0,"echo":false,"script":null)
 ]
 }
-
-[rendering]
-
-renderer/rendering_method="gl_compatibility"
-renderer/rendering_method.mobile="gl_compatibility"
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		{"GAME_STATE":"NORMAL","Health":100,"Position":{"x":-8.22047996520996,"y":24.3862400054932,"z":-36.8679962158203}}
		{"GAME_STATE":"NORMAL","Health":100,"Position":{"x":-42.8670539855957,"y":24.3861618041992,"z":22.7945346832275}}