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

Compare commits

base: jeremy:350e17656b
Branches Tags
jeremy:master
jeremy:multiplayer
jeremy:devel
jeremy:robux
jeremy:health
..
compare: jeremy:f93e3ff992
Branches Tags
jeremy:multiplayer
jeremy:master
jeremy:devel
jeremy:robux
jeremy:health

1 commit
350e17656b ... f93e3ff992

Author SHA1 Message Date
Simon Ward
f93e3ff992 Merge branch 'devel' of ssh://git.baxters.nz/jeremy/joeblox into devel 2026-01-25 20:08:55 +13:00
1 changed files with 1 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

12
player/camera_gimbal.gd
View file

@ -7,15 +7,10 @@ var locked_mouse_positon = Vector2(0,0)
var mouse_locked = false
var mouse_x_velocity = 0
var mouse_y_velocity = 0
<<<<<<< HEAD
var zoom_min = 4
var zoom_max = 100
var current_zoom = 8
=======
var zoom_min = 0
var zoom_max = 100
var current_zoom = 0
>>>>>>> 4e8b3979486122df89f015f2c767e06df233424f
func reset():
basis = Basis()
@ -70,10 +65,5 @@ func _process(delta):
if Input.is_action_pressed("cam_reset"):
reset()
<<<<<<< HEAD
current_zoom = clamp(current_zoom, zoom_min, zoom_max)
$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