jeremy/joeblox
1
Fork 0
Code Issues Pull requests 2 Releases Activity

Compare commits

base: jeremy:350e17656ba2d86e7905227d975657545bb9f403
Branches Tags
jeremy:master
jeremy:multiplayer
jeremy:devel
jeremy:robux
jeremy:health
..
compare: jeremy:1fd43ac5f9fb09253731241e5474c155a1b6c43c
Branches Tags
jeremy:multiplayer
jeremy:master
jeremy:devel
jeremy:robux
jeremy:health

No commits in common. "350e17656ba2d86e7905227d975657545bb9f403" and "1fd43ac5f9fb09253731241e5474c155a1b6c43c" have entirely different histories.
350e17656b ... 1fd43ac5f9

1 changed files with 0 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

11
player/camera_gimbal.gd
View file

@ -7,15 +7,9 @@ var locked_mouse_positon = Vector2(0,0)
var mouse_locked = false var mouse_locked = false
var mouse_x_velocity = 0 var mouse_x_velocity = 0
var mouse_y_velocity = 0 var mouse_y_velocity = 0
<<<<<<< HEAD
var zoom_min = 4 var zoom_min = 4
var zoom_max = 100 var zoom_max = 100
var current_zoom = 8 var current_zoom = 8
=======
var zoom_min = 0
var zoom_max = 100
var current_zoom = 0
>>>>>>> 4e8b3979486122df89f015f2c767e06df233424f
func reset(): func reset():
basis = Basis() basis = Basis()
@ -70,10 +64,5 @@ func _process(delta):
if Input.is_action_pressed("cam_reset"): if Input.is_action_pressed("cam_reset"):
reset() reset()
<<<<<<< HEAD
current_zoom = clamp(current_zoom, zoom_min, zoom_max) current_zoom = clamp(current_zoom, zoom_min, zoom_max)
$InnerGimbal/Camera3D.position = Vector3($InnerGimbal/Camera3D.position.x, current_zoom, current_zoom) $InnerGimbal/Camera3D.position = Vector3($InnerGimbal/Camera3D.position.x, current_zoom, current_zoom)
=======
current_zoom = clamp(current_zoom,zoom_min,zoom_max)
$InnerGimbal/Camera3D.position = Vector3($InnerGimbal/Camera3D.position.x,current_zoom,current_zoom)
>>>>>>> 4e8b3979486122df89f015f2c767e06df233424f