Skip to content

Commit c6d10e4

Browse files
Merge remote-tracking branch 'origin/main' into addon
2 parents 9df782b + 5a597a6 commit c6d10e4

File tree

2 files changed

+3
-13
lines changed

2 files changed

+3
-13
lines changed

addons/character-controller/fps/bob/timed_bob_curve.gd

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,6 @@ func do_bob_cycle():
3535
## Tick process of bob timer
3636
func bob_process(delta):
3737
if(_time > 0):
38-
print("sdas")
3938
_time -= delta
4039
if(_direction):
4140
_offset = lerp(0.0, amount, _time/_direction)

addons/character-controller/fps/fps_controller_3d.gd

Lines changed: 3 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -39,10 +39,7 @@ class_name FPSController3D
3939
@export_group("Head Bob - Steps")
4040

4141
## Enables bob for made steps
42-
@export var step_bob_enabled := true:
43-
set(value):
44-
if head_bob != null:
45-
head_bob.step_bob_enabled = value
42+
@export var step_bob_enabled := true
4643

4744
## Difference of step bob movement between vertical and horizontal angle
4845
@export var vertical_horizontal_ratio = 2
@@ -51,19 +48,13 @@ class_name FPSController3D
5148
@export_group("Head Bob - Jump")
5249

5350
## Enables bob for made jumps
54-
@export var jump_bob_enabled := true:
55-
set(value):
56-
if head_bob != null:
57-
head_bob.jump_bob_enabled = value
51+
@export var jump_bob_enabled := true
5852

5953

6054
@export_group("Head Bob - Rotation When Move (Quake Like)")
6155

6256
## Enables camera angle for the direction the character controller moves
63-
@export var rotation_to_move := true:
64-
set(value):
65-
if head_bob != null:
66-
head_bob.rotation_to_move = value
57+
@export var rotation_to_move := true
6758

6859
## Speed at which the camera angle moves
6960
@export var speed_rotation := 4.0

0 commit comments

Comments
 (0)