Merge branch 'release/2.1.6'

expressobits · May 18, 2023 · f1d8709 · f1d8709
2 parents b63020c + 0feb4a9
commit f1d8709
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 8 deletions.
diff --git a/README.md b/README.md
@@ -1,5 +1,5 @@
 # <img src="https://raw.githubusercontent.com/expressobits/character-controller/main/icon.png" alt= “icon” width="32" height="32"> Welcome to Expresso Character Controller 👋
-![Version](https://img.shields.io/badge/version-2.1.5-blue.svg?cacheSeconds=2592000)
+![Version](https://img.shields.io/badge/version-2.1.6-blue.svg?cacheSeconds=2592000)
 [![Documentation](https://img.shields.io/badge/documentation-yes-brightgreen.svg)](todo-doc)
 [![License: MIT](https://img.shields.io/badge/License-MIT-yellow.svg)](MIT)
 

diff --git a/addons/character-controller/core/controller.tscn b/addons/character-controller/core/controller.tscn
@@ -13,7 +13,7 @@
 [node name="CharacterController3D" type="CharacterBody3D"]
 floor_snap_length = 0.5
 script = ExtResource("1_snllq")
-abilities_path = [NodePath("Crouch Ability 3D"), NodePath("Sprint Ability 3D"), NodePath("Walk Ability 3D"), NodePath("Jump Ability 3D"), NodePath("Fly Ability 3D"), NodePath("Swim Ability 3D")]
+abilities_path = Array[NodePath]([NodePath("Crouch Ability 3D"), NodePath("Sprint Ability 3D"), NodePath("Walk Ability 3D"), NodePath("Jump Ability 3D"), NodePath("Fly Ability 3D"), NodePath("Swim Ability 3D")])
 
 [node name="Collision" type="CollisionShape3D" parent="."]
 shape = SubResource("CapsuleShape3D_fn1rj")

diff --git a/addons/character-controller/example/main/player.tscn b/addons/character-controller/example/main/player.tscn
@@ -1,9 +1,9 @@
 [gd_scene load_steps=5 format=3 uid="uid://2oxdgu03lnbk"]
 
-[ext_resource type="PackedScene" uid="uid://bmybavw6ey5w8" path="res://addons/character-controller/fps/fps_controller_3d.tscn" id="1_fbpun"]
+[ext_resource type="PackedScene" uid="uid://8oy3xm2sff8" path="res://addons/character-controller/fps/fps_controller_3d.tscn" id="1_fbpun"]
 [ext_resource type="Script" path="res://addons/character-controller/example/main/player.gd" id="2_8r0nc"]
 [ext_resource type="Environment" uid="uid://b3cn01u84faiy" path="res://addons/character-controller/example/main/underwater.tres" id="3_dxksd"]
-[ext_resource type="PackedScene" uid="uid://dr814b7u4f0a5" path="res://addons/character-controller/example/main/audios/player_audios.tscn" id="4_ux8kv"]
+[ext_resource type="PackedScene" path="res://addons/character-controller/example/main/audios/player_audios.tscn" id="4_ux8kv"]
 
 [node name="Player" instance=ExtResource("1_fbpun")]
 script = ExtResource("2_8r0nc")

diff --git a/addons/character-controller/fps/fps_controller_3d.tscn b/addons/character-controller/fps/fps_controller_3d.tscn
@@ -1,11 +1,10 @@
-[gd_scene load_steps=7 format=3]
+[gd_scene load_steps=6 format=3 uid="uid://8oy3xm2sff8"]
 
 [ext_resource type="PackedScene" uid="uid://ciu2qgckgu5sr" path="res://addons/character-controller/core/controller.tscn" id="1_l26lu"]
 [ext_resource type="Script" path="res://addons/character-controller/fps/fps_controller_3d.gd" id="2_426o3"]
 [ext_resource type="Script" path="res://addons/character-controller/fps/head_movement_3d.gd" id="3_pqlf6"]
 [ext_resource type="Script" path="res://addons/character-controller/fps/bob/head_bob.gd" id="4_6ym6a"]
 [ext_resource type="Curve" path="res://addons/character-controller/fps/bob/bob_curve.tres" id="5_cv58a"]
-[ext_resource type="Resource" path="res://addons/character-controller/fps/bob/jump_curve.tres" id="6_cgstf"]
 
 [node name="FPSController3D" instance=ExtResource("1_l26lu")]
 script = ExtResource("2_426o3")
@@ -33,4 +32,3 @@ current = true
 script = ExtResource("4_6ym6a")
 head_path = NodePath("../Camera")
 bob_curve = ExtResource("5_cv58a")
-lerp_bob_curve = ExtResource("6_cgstf")
diff --git a/addons/character-controller/plugin.cfg b/addons/character-controller/plugin.cfg
@@ -5,5 +5,5 @@ description="Modular Character Controller for Godot 4.
 Includes FPS version with headbob and camera movement.
 (Walk, Crouch, Sprint, Swim and Fly Mode)."
 author="Expresso Bits and Whimfoome"
-version="2.1.5"
+version="2.1.6"
 script="plugin.gd"