diff --git a/project.godot b/project.godot
index 12e2653..5d68051 100644
--- a/project.godot
+++ b/project.godot
@@ -29,37 +29,66 @@ window/stretch/aspect="expand"
 
 project/assembly_name="gd-mono-thirdpersoncontroller"
 
+[editor]
+
+export/convert_text_resources_to_binary=true
+
 [input]
 
+move_jump={
+"deadzone": 0.5,
+"events": [Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":32,"physical_keycode":0,"unicode":0,"echo":false,"script":null)
+, Object(InputEventJoypadButton,"resource_local_to_scene":false,"resource_name":"","device":0,"button_index":0,"pressure":0.0,"pressed":false,"script":null)
+]
+}
 move_left={
 "deadzone": 0.5,
 "events": [Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":65,"physical_keycode":0,"unicode":0,"echo":false,"script":null)
+, Object(InputEventJoypadMotion,"resource_local_to_scene":false,"resource_name":"","device":0,"axis":0,"axis_value":-1.0,"script":null)
 ]
 }
 move_right={
 "deadzone": 0.5,
 "events": [Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":68,"physical_keycode":0,"unicode":0,"echo":false,"script":null)
+, Object(InputEventJoypadMotion,"resource_local_to_scene":false,"resource_name":"","device":0,"axis":0,"axis_value":1.0,"script":null)
 ]
 }
 move_forward={
 "deadzone": 0.5,
 "events": [Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":87,"physical_keycode":0,"unicode":0,"echo":false,"script":null)
+, Object(InputEventJoypadMotion,"resource_local_to_scene":false,"resource_name":"","device":0,"axis":1,"axis_value":-1.0,"script":null)
 ]
 }
 move_backward={
 "deadzone": 0.5,
 "events": [Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":83,"physical_keycode":0,"unicode":0,"echo":false,"script":null)
+, Object(InputEventJoypadMotion,"resource_local_to_scene":false,"resource_name":"","device":0,"axis":1,"axis_value":1.0,"script":null)
 ]
 }
-move_jump={
+gp_cam_left={
 "deadzone": 0.5,
-"events": [Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":32,"physical_keycode":0,"unicode":0,"echo":false,"script":null)
+"events": [Object(InputEventJoypadMotion,"resource_local_to_scene":false,"resource_name":"","device":0,"axis":2,"axis_value":-1.0,"script":null)
+]
+}
+gp_cam_right={
+"deadzone": 0.5,
+"events": [Object(InputEventJoypadMotion,"resource_local_to_scene":false,"resource_name":"","device":0,"axis":2,"axis_value":1.0,"script":null)
+]
+}
+gp_cam_up={
+"deadzone": 0.5,
+"events": [Object(InputEventJoypadMotion,"resource_local_to_scene":false,"resource_name":"","device":0,"axis":3,"axis_value":-1.0,"script":null)
+]
+}
+gp_cam_down={
+"deadzone": 0.5,
+"events": [Object(InputEventJoypadMotion,"resource_local_to_scene":false,"resource_name":"","device":0,"axis":3,"axis_value":1.0,"script":null)
 ]
 }
 fullscreen={
 "deadzone": 0.5,
 "events": [Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":4194342,"physical_keycode":0,"unicode":0,"echo":false,"script":null)
-, Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"window_id":0,"alt_pressed":true,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":4194309,"physical_keycode":0,"unicode":0,"echo":false,"script":null)
+, Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"window_id":0,"alt_pressed":true,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":0,"unicode":0,"echo":false,"script":null)
 ]
 }
 uncapture_mouse={
diff --git a/src/player.cs b/src/player.cs
index 59d4132..53a7f92 100644
--- a/src/player.cs
+++ b/src/player.cs
@@ -3,12 +3,14 @@ using Godot;
 public partial class player : CharacterBody3D
 {
 	public Vector3 direction;
+	public Vector2 gpCamVector;
+	public bool gamepadMode;
 	[Export] float speed = 5.0f;
 	[Export] float jumpVelocity = 5f;
 	[Export] float gravity = 14f;
-	[Export(PropertyHint.Range, "0.1,1.0")] float mouseSensitivity = 0.3f;
-	[Export(PropertyHint.Range, "-90,0,1")] float minMousePitch = -50f;
-	[Export(PropertyHint.Range, "0,90,1")] float maxMousePitch = 50f;
+	[Export(PropertyHint.Range, "0.1,1.0")] float camSensitivity = 0.3f;
+	[Export(PropertyHint.Range, "-90,0,1")] float minCamPitch = -50f;
+	[Export(PropertyHint.Range, "0,90,1")] float maxCamPitch = 30f;
 
 	public override void _Process(double delta)
 	{
@@ -24,6 +26,17 @@ public partial class player : CharacterBody3D
 			bodyRotation.y = Mathf.LerpAngle(bodyRotation.y,Mathf.Atan2(-direction.x, -direction.z), (float)delta * speed);
 			GetNode<MeshInstance3D>("collision/body").Rotation = bodyRotation;
 		}
+		//camera gamepad part (needs constant movement so _Input event wouldn't work with this like mouseinput)
+		gpCamVector = Input.GetVector("gp_cam_left", "gp_cam_right", "gp_cam_up", "gp_cam_down");
+		if(gpCamVector != Vector2.Zero)
+		{
+			Vector3 camRot = GetNode<Marker3D>("camera_center").RotationDegrees;
+			camRot.y -= gpCamVector.x * camSensitivity * 500 * (float)delta;
+			camRot.x -= gpCamVector.y * camSensitivity * 500 * (float)delta;
+			GD.Print(gpCamVector);
+			camRot.x = Mathf.Clamp(camRot.x, minCamPitch, maxCamPitch); //prevents camera from going endlessly around the player
+			GetNode<Marker3D>("camera_center").RotationDegrees = camRot;
+		}
 	}
 	public override void _PhysicsProcess(double delta)
 	{
@@ -32,7 +45,7 @@ public partial class player : CharacterBody3D
 		if (!IsOnFloor())
 			velocity.y -= gravity * (float)delta; //characterbodys don't have physic simulations by default like rigidbody
 	
-		if (Input.IsActionJustPressed("move_jump") && IsOnFloor() && Input.MouseMode == Input.MouseModeEnum.Captured)
+		if (Input.IsActionJustPressed("move_jump") && IsOnFloor() && Input.MouseMode == Input.MouseModeEnum.Captured | gamepadMode)
 			velocity.y = jumpVelocity;
 
 		Vector2 inputDir = Input.GetVector("move_left", "move_right", "move_forward", "move_backward");
@@ -52,13 +65,14 @@ public partial class player : CharacterBody3D
 	}
 	public override void _Input(InputEvent @event)
 	{
+		gamepadMode = @event is InputEventJoypadButton | @event is InputEventJoypadMotion;
+		Vector3 camRot = GetNode<Marker3D>("camera_center").RotationDegrees;
 		if (@event is InputEventMouseMotion mouseMotion && Input.MouseMode == Input.MouseModeEnum.Captured)
 		{
-			Vector3 camRot = GetNode<Marker3D>("camera_center").RotationDegrees;
-			camRot.y -= mouseMotion.Relative.x * mouseSensitivity;
-			camRot.x -= mouseMotion.Relative.y * mouseSensitivity;
-			camRot.x = Mathf.Clamp(camRot.x, minMousePitch, maxMousePitch); //prevents camera from going endlessly around the player
-			GetNode<Marker3D>("camera_center").RotationDegrees = camRot;
+			camRot.y -= mouseMotion.Relative.x * camSensitivity;
+			camRot.x -= mouseMotion.Relative.y * camSensitivity;
 		}
+		camRot.x = Mathf.Clamp(camRot.x, minCamPitch, maxCamPitch); //prevents camera from going endlessly around the player
+		GetNode<Marker3D>("camera_center").RotationDegrees = camRot;
 	}
 }