Skip to content

Commit

Permalink
core: update to Godot 4.2
Browse files Browse the repository at this point in the history
  • Loading branch information
ywmaa committed Dec 21, 2023
1 parent 005ffb3 commit 180f53c
Show file tree
Hide file tree
Showing 76 changed files with 34,317 additions and 130 deletions.
Empty file modified .github/workflows/Publish-Godot-Project.yml
100644 → 100755
Empty file.
22 changes: 12 additions & 10 deletions AMSG_Examples/3DObjects/Apple/Apple.tscn

Large diffs are not rendered by default.

Empty file modified AMSG_Examples/Character/Animations/CrouchIdle.res
100644 → 100755
Empty file.
Empty file modified AMSG_Examples/Character/Animations/CrouchWalkingForward.res
100644 → 100755
Empty file.
Empty file modified AMSG_Examples/Character/Animations/Falling.res
100644 → 100755
Empty file.
Empty file modified AMSG_Examples/Character/Animations/FallingStart.res
100644 → 100755
Empty file.
Empty file modified AMSG_Examples/Character/Animations/FallingToRoll.res
100644 → 100755
Empty file.
Empty file modified AMSG_Examples/Character/Animations/HardFalling.res
100644 → 100755
Empty file.
Empty file modified AMSG_Examples/Character/Animations/Idle.res
100644 → 100755
Empty file.
Empty file modified AMSG_Examples/Character/Animations/Idle1.res
100644 → 100755
Empty file.
Empty file modified AMSG_Examples/Character/Animations/Idle2.res
100644 → 100755
Empty file.
Empty file modified AMSG_Examples/Character/Animations/JogForward.res
100644 → 100755
Empty file.
Empty file modified AMSG_Examples/Character/Animations/Jogbackward.res
100644 → 100755
Empty file.
Empty file modified AMSG_Examples/Character/Animations/Kick.res
100644 → 100755
Empty file.
Empty file modified AMSG_Examples/Character/Animations/Run.res
100644 → 100755
Empty file.
Empty file modified AMSG_Examples/Character/Animations/RunToStop.res
100644 → 100755
Empty file.
Empty file modified AMSG_Examples/Character/Animations/TPose.res
100644 → 100755
Empty file.
Empty file modified AMSG_Examples/Character/Animations/TurnLeft.res
100644 → 100755
Empty file.
Empty file modified AMSG_Examples/Character/Animations/TurnRight.res
100644 → 100755
Empty file.
Empty file modified AMSG_Examples/Character/Animations/Walk.res
100644 → 100755
Empty file.
Empty file modified AMSG_Examples/Character/Animations/WalkingBackward.res
100644 → 100755
Empty file.
Empty file modified AMSG_Examples/Character/Character.blend
100644 → 100755
Empty file.
Empty file modified AMSG_Examples/Character/Character.glb
100644 → 100755
Empty file.
34,111 changes: 34,092 additions & 19 deletions AMSG_Examples/Character/Character.glb.import

Large diffs are not rendered by default.

Empty file modified AMSG_Examples/Character/Mesh/.res
100644 → 100755
Empty file.
Empty file modified AMSG_Examples/Character/Mesh/Alpha_Body_MAT.res
100644 → 100755
Empty file.
Empty file modified AMSG_Examples/Character/Mesh/Alpha_Joints_MAT.res
100644 → 100755
Empty file.
Binary file modified AMSG_Examples/Character/Mesh/Character_Alpha_Joints.res
Binary file not shown.
Binary file modified AMSG_Examples/Character/Mesh/Character_Alpha_Surface.res
Binary file not shown.
Empty file modified AMSG_Examples/Character/crouch_movement_values.tres
100644 → 100755
Empty file.
144 changes: 82 additions & 62 deletions AMSG_Examples/Character/mixamo_character.tscn

Large diffs are not rendered by default.

Empty file modified AMSG_Examples/Character/standing_movement_values.tres
100644 → 100755
Empty file.
Empty file modified AMSG_Examples/Lut.JPG
100644 → 100755
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion AMSG_Examples/Lut.JPG.import
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,9 @@ dest_files=["res://.godot/imported/Lut.JPG-190eca90821bdc8b1ba351ed89c59c9f.ctex
[params]

compress/mode=0
compress/high_quality=false
compress/lossy_quality=0.7
compress/hdr_compression=1
compress/bptc_ldr=0
compress/normal_map=0
compress/channel_pack=0
mipmaps/generate=false
Expand Down
Empty file modified AMSG_Examples/Maps/GridMat.tres
100644 → 100755
Empty file.
2 changes: 1 addition & 1 deletion AMSG_Examples/Maps/MovementTestMap.tscn
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
[ext_resource type="Script" path="res://AMSG_Examples/Maps/main.gd" id="1_rvsng"]
[ext_resource type="Material" uid="uid://bf6te7t23qtp3" path="res://AMSG_Examples/Maps/GridMat.tres" id="3_27oba"]
[ext_resource type="Script" path="res://addons/AMSG/Interactable/Light/InteractableLight.gd" id="4_kyyln"]
[ext_resource type="PackedScene" path="res://AMSG_Examples/3DObjects/Apple/Apple.tscn" id="6_aiuj0"]
[ext_resource type="PackedScene" uid="uid://f1hgkwi56ss6" path="res://AMSG_Examples/3DObjects/Apple/Apple.tscn" id="6_aiuj0"]

[sub_resource type="BoxShape3D" id="BoxShape3D_2afi4"]

Expand Down
Empty file modified AMSG_Examples/Maps/main.gd
100644 → 100755
Empty file.
61 changes: 56 additions & 5 deletions AMSG_Examples/Player/Player.tscn
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
[gd_scene load_steps=45 format=3 uid="uid://c2l3xxr5mfm6w"]
[gd_scene load_steps=65 format=3 uid="uid://c2l3xxr5mfm6w"]

[ext_resource type="PackedScene" uid="uid://cth47yn1duvdh" path="res://AMSG_Examples/Character/mixamo_character.tscn" id="1_ihvpu"]
[ext_resource type="PackedScene" uid="uid://bfkejs88xm680" path="res://addons/PoseWarping/MotionWarping.tscn" id="2_0jifq"]
Expand All @@ -9,14 +9,56 @@
[ext_resource type="PackedScene" uid="uid://bkw0qe3jh352j" path="res://addons/AMSG/Components/AttributesComponent/GameAttribute.tscn" id="4_7c4a2"]
[ext_resource type="Script" path="res://AMSG_Examples/Player/PlayerController.gd" id="4_7eusw"]
[ext_resource type="PackedScene" uid="uid://cegbfvlakd2rw" path="res://addons/AMSG/Components/Networking.tscn" id="4_8jv5v"]
[ext_resource type="PackedScene" path="res://AMSG_Examples/Player/flashlight/Flashlight.tscn" id="5_euvsl"]
[ext_resource type="PackedScene" uid="uid://bpe4kqq0dsptn" path="res://AMSG_Examples/Player/flashlight/Flashlight.tscn" id="5_euvsl"]
[ext_resource type="Script" path="res://addons/AMSG/Components/AttributesComponent/HealthAttribute.gd" id="5_hlhwh"]
[ext_resource type="Script" path="res://addons/AMSG/Components/AttributesComponent/StaminaAttribute.gd" id="6_8dtn8"]
[ext_resource type="Script" path="res://AMSG_Examples/Player/Status.gd" id="6_8h4hk"]
[ext_resource type="Texture2D" uid="uid://dpkisrpco54qj" path="res://AMSG_Examples/Player/UI/Debug/circle.png" id="7_n2d8i"]
[ext_resource type="Texture2D" uid="uid://ijv6wr22hov8" path="res://AMSG_Examples/Player/UI/Debug/direction.png" id="8_t071y"]
[ext_resource type="Texture2D" uid="uid://ck5riwbh478s4" path="res://AMSG_Examples/Player/UI/Debug/velocity.png" id="9_464xm"]
[ext_resource type="Script" path="res://addons/AMSG/Components/LockComponent/LockSystem.gd" id="11_06pi7"]
[ext_resource type="Animation" uid="uid://xhse6rakv0vp" path="res://AMSG_Examples/Character/Animations/CrouchIdle.res" id="13_15hcd"]
[ext_resource type="Animation" uid="uid://bfwuav455uabl" path="res://AMSG_Examples/Character/Animations/CrouchWalkingForward.res" id="14_l7yu0"]
[ext_resource type="Animation" uid="uid://cxd1wjiaayrn6" path="res://AMSG_Examples/Character/Animations/Falling.res" id="15_o3sl6"]
[ext_resource type="Animation" uid="uid://bjimeh2fh7g6v" path="res://AMSG_Examples/Character/Animations/FallingStart.res" id="16_r2kuc"]
[ext_resource type="Animation" uid="uid://b224n8qfg8tgq" path="res://AMSG_Examples/Character/Animations/FallingToRoll.res" id="17_fjf80"]
[ext_resource type="Animation" uid="uid://b70e3ssiman4m" path="res://AMSG_Examples/Character/Animations/HardFalling.res" id="18_6427q"]
[ext_resource type="Animation" uid="uid://daq1w2ysqgh2u" path="res://AMSG_Examples/Character/Animations/Idle.res" id="19_kb02o"]
[ext_resource type="Animation" uid="uid://bl171l8rn5qj1" path="res://AMSG_Examples/Character/Animations/Idle1.res" id="20_x2p8y"]
[ext_resource type="Animation" uid="uid://bvxw7rnencmno" path="res://AMSG_Examples/Character/Animations/Idle2.res" id="21_b1fju"]
[ext_resource type="Animation" uid="uid://cklbyyhlh6h4y" path="res://AMSG_Examples/Character/Animations/JogForward.res" id="22_lubt6"]
[ext_resource type="Animation" uid="uid://da8dkhg47tprj" path="res://AMSG_Examples/Character/Animations/Jogbackward.res" id="23_c75je"]
[ext_resource type="Animation" uid="uid://dafqqqlhn3ua5" path="res://AMSG_Examples/Character/Animations/Kick.res" id="24_5itbc"]
[ext_resource type="Animation" uid="uid://c5mm314uy284i" path="res://AMSG_Examples/Character/Animations/Run.res" id="25_ppe4f"]
[ext_resource type="Animation" uid="uid://ciye7exjrais1" path="res://AMSG_Examples/Character/Animations/RunToStop.res" id="26_m5y1a"]
[ext_resource type="Animation" uid="uid://bylwxa24gre04" path="res://AMSG_Examples/Character/Animations/TPose.res" id="27_m5nv1"]
[ext_resource type="Animation" uid="uid://d4glqsi6uhv0c" path="res://AMSG_Examples/Character/Animations/TurnLeft.res" id="28_ejs2y"]
[ext_resource type="Animation" uid="uid://f8m1upuenduu" path="res://AMSG_Examples/Character/Animations/TurnRight.res" id="29_8xpe7"]
[ext_resource type="Animation" uid="uid://xxj1rcp4b5k0" path="res://AMSG_Examples/Character/Animations/Walk.res" id="30_0tci8"]
[ext_resource type="Animation" uid="uid://bl4cuhnoma34i" path="res://AMSG_Examples/Character/Animations/WalkingBackward.res" id="31_vuu6b"]

[sub_resource type="AnimationLibrary" id="AnimationLibrary_5egkr"]
_data = {
"CrouchIdle": ExtResource("13_15hcd"),
"CrouchWalkingForward": ExtResource("14_l7yu0"),
"Falling": ExtResource("15_o3sl6"),
"FallingStart": ExtResource("16_r2kuc"),
"FallingToRoll": ExtResource("17_fjf80"),
"HardFalling": ExtResource("18_6427q"),
"Idle": ExtResource("19_kb02o"),
"Idle1": ExtResource("20_x2p8y"),
"Idle2": ExtResource("21_b1fju"),
"JogForward": ExtResource("22_lubt6"),
"Jogbackward": ExtResource("23_c75je"),
"Kick": ExtResource("24_5itbc"),
"Run": ExtResource("25_ppe4f"),
"RunToStop": ExtResource("26_m5y1a"),
"TPose": ExtResource("27_m5nv1"),
"TurnLeft": ExtResource("28_ejs2y"),
"TurnRight": ExtResource("29_8xpe7"),
"Walk": ExtResource("30_0tci8"),
"WalkingBackward": ExtResource("31_vuu6b")
}

[sub_resource type="AnimationNodeAnimation" id="AnimationNodeAnimation_mb2kt"]
animation = &"TurnLeft"
Expand Down Expand Up @@ -158,7 +200,7 @@ nodes/crouch/node = SubResource("AnimationNodeTransition_3twx3")
nodes/crouch/position = Vector2(100, 180)
nodes/crouching/node = SubResource("AnimationNodeTransition_rufvy")
nodes/crouching/position = Vector2(-120, 640)
node_connections = [&"output", 0, &"crouch", &"JogFB", 0, &"JogForward", &"JogFB", 1, &"JogBackward", &"Standing", 0, &"Idle", &"Standing", 1, &"WalkFB", &"Standing", 2, &"Run", &"Standing", 3, &"JogFB", &"Standing", 4, &"StopSeek", &"StopSeek", 0, &"StopAnim", &"WalkFB", 0, &"WalkForward", &"WalkFB", 1, &"WalkBackward", &"crouch", 0, &"Standing", &"crouch", 1, &"crouching", &"crouching", 0, &"CrouchIdle", &"crouching", 1, &"CrouchWalkingForward"]
node_connections = [&"JogFB", 0, &"JogForward", &"JogFB", 1, &"JogBackward", &"Standing", 0, &"Idle", &"Standing", 1, &"WalkFB", &"Standing", 2, &"Run", &"Standing", 3, &"JogFB", &"Standing", 4, &"StopSeek", &"StopSeek", 0, &"StopAnim", &"WalkFB", 0, &"WalkForward", &"WalkFB", 1, &"WalkBackward", &"crouch", 0, &"Standing", &"crouch", 1, &"crouching", &"crouching", 0, &"CrouchIdle", &"crouching", 1, &"CrouchWalkingForward", &"output", 0, &"crouch"]

[sub_resource type="AnimationNodeBlendTree" id="AnimationNodeBlendTree_jqd3m"]
resource_local_to_scene = true
Expand All @@ -177,7 +219,7 @@ nodes/Turn/position = Vector2(980, 1400)
nodes/VelocityDirection/node = SubResource("AnimationNodeBlendTree_ml0kl")
nodes/VelocityDirection/position = Vector2(680, 1400)
nodes/output/position = Vector2(1540, 1400)
node_connections = [&"output", 0, &"InAir", &"InAir", 0, &"Turn", &"InAir", 1, &"FallAnimation", &"RightOrLeft", 0, &"AnimTurnLeft", &"RightOrLeft", 1, &"AnimTurnRight", &"Turn", 0, &"VelocityDirection", &"Turn", 1, &"RightOrLeft"]
node_connections = [&"InAir", 0, &"Turn", &"InAir", 1, &"FallAnimation", &"RightOrLeft", 0, &"AnimTurnLeft", &"RightOrLeft", 1, &"AnimTurnRight", &"Turn", 0, &"VelocityDirection", &"Turn", 1, &"RightOrLeft", &"output", 0, &"InAir"]

[sub_resource type="CapsuleShape3D" id="CapsuleShape3D_jrjkm"]
resource_local_to_scene = true
Expand Down Expand Up @@ -257,6 +299,9 @@ character_movement_component = NodePath("../CharacterMovementComponent")
networking = NodePath("../Networking")

[node name="AnimationTree" parent="." index="10"]
libraries = {
"": SubResource("AnimationLibrary_5egkr")
}
tree_root = SubResource("AnimationNodeBlendTree_jqd3m")
parameters/VelocityDirection/JogFB/current_state = ""
parameters/VelocityDirection/JogFB/current_index = -1
Expand Down Expand Up @@ -325,9 +370,15 @@ bones/63/rotation = Quaternion(-0.307456, 0.043324, -0.0155887, 0.950448)
bones/64/rotation = Quaternion(0.442158, -0.046071, -0.0947431, 0.890729)
bones/65/rotation = Quaternion(0.352065, -0.016805, -0.00581727, 0.935807)

[node name="BoneAttachment3D" parent="Armature/Skeleton3D" index="2"]
[node name="HeadBone" parent="Armature/Skeleton3D" index="2"]
transform = Transform3D(0.990253, -0.111666, -0.0832491, 0.0474898, 0.832572, -0.551877, 0.130937, 0.542544, 0.82976, -0.0634186, 1.48843, 0.0344127)

[node name="SkeletonIK3D" parent="Armature/Skeleton3D" index="3"]
process_priority = 1

[node name="Knee" parent="Armature/Skeleton3D/SkeletonIK3D" index="0"]
transform = Transform3D(-0.749232, 0.216858, -0.625799, -0.244034, -0.968789, -0.0435476, -0.615711, 0.120089, 0.778768, -0.00737142, 0.51281, 0.311666)

[node name="flashlight" parent="Armature" index="1" instance=ExtResource("5_euvsl")]
transform = Transform3D(-1, 0, -8.74228e-08, 0, 1, 0, 8.74228e-08, 0, -1, 0, 1.12407, 0.156779)
light_energy = 10.0
Expand Down
Empty file modified AMSG_Examples/Player/PlayerController.gd
100644 → 100755
Empty file.
Empty file modified AMSG_Examples/Player/Status.gd
100644 → 100755
Empty file.
2 changes: 1 addition & 1 deletion AMSG_Examples/Player/UI/Debug/circle.png.import
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,9 @@ dest_files=["res://.godot/imported/circle.png-bc756eb36090bb45c162c7c395bd325e.c
[params]

compress/mode=1
compress/high_quality=false
compress/lossy_quality=0.7
compress/hdr_compression=1
compress/bptc_ldr=0
compress/normal_map=0
compress/channel_pack=0
mipmaps/generate=false
Expand Down
2 changes: 1 addition & 1 deletion AMSG_Examples/Player/UI/Debug/direction.png.import
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,9 @@ dest_files=["res://.godot/imported/direction.png-6aeae12aea4a3b74f566790ca48f11d
[params]

compress/mode=1
compress/high_quality=false
compress/lossy_quality=0.7
compress/hdr_compression=1
compress/bptc_ldr=0
compress/normal_map=0
compress/channel_pack=0
mipmaps/generate=false
Expand Down
2 changes: 1 addition & 1 deletion AMSG_Examples/Player/UI/Debug/velocity.png.import
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,9 @@ dest_files=["res://.godot/imported/velocity.png-1d9e4b73ab49623978c32500b4446591
[params]

compress/mode=1
compress/high_quality=false
compress/lossy_quality=0.7
compress/hdr_compression=1
compress/bptc_ldr=0
compress/normal_map=0
compress/channel_pack=0
mipmaps/generate=false
Expand Down
Empty file modified AMSG_Examples/Player/flashlight/Flashlight.gd
100644 → 100755
Empty file.
4 changes: 2 additions & 2 deletions AMSG_Examples/Player/flashlight/Flashlight.tscn
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[gd_scene load_steps=2 format=3]
[gd_scene load_steps=2 format=3 uid="uid://bpe4kqq0dsptn"]

[ext_resource type="Script" path="res://AMSG_Examples/Player/flashlight/Flashlight.gd" id="1_2fd76"]

[node name="Flashlight" type="SpotLight3D"]
script = ExtResource( "1_2fd76" )
script = ExtResource("1_2fd76")
2 changes: 1 addition & 1 deletion AMSG_Examples/icon.png.import
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,9 @@ dest_files=["res://.godot/imported/icon.png-91290734e58f6569ce9232be7f2819e7.cte
[params]

compress/mode=0
compress/high_quality=false
compress/lossy_quality=0.7
compress/hdr_compression=1
compress/bptc_ldr=0
compress/normal_map=0
compress/channel_pack=0
mipmaps/generate=false
Expand Down
2 changes: 1 addition & 1 deletion README.md
100644 → 100755
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

The Project is made using [Godot](https://github.com/godotengine/godot) 4

you can get Godot 4.1 Stable here : https://godotengine.org/
you can get Godot 4.2 Stable here : https://godotengine.org/

### Watch this video for preview :

Expand Down
Empty file modified addons/AMSG/AI/AI_Base.gd
100644 → 100755
Empty file.
Empty file modified addons/AMSG/AMSG.gd
100644 → 100755
Empty file.
Empty file modified addons/AMSG/Components/AnimationComponents/AnimationBlend.gd
100644 → 100755
Empty file.
Empty file.
Original file line number Diff line number Diff line change
Expand Up @@ -25,12 +25,13 @@ sync = true

[sub_resource type="AnimationNodeTransition" id="AnimationNodeTransition_3twx3"]
sync = true
enabled_inputs = 2
xfade_time = 0.3
input_0/name = "stand"
input_0/auto_advance = false
input_0/reset = true
input_1/name = "crouch"
input_1/auto_advance = false
input_1/reset = true

[sub_resource type="AnimationNodeAnimation" id="AnimationNodeAnimation_id6x0"]
animation = &"CrouchIdle"
Expand Down Expand Up @@ -69,11 +70,12 @@ animation = &"Idle"
animation = &"Jogbackward"

[sub_resource type="AnimationNodeTransition" id="AnimationNodeTransition_mk3d0"]
enabled_inputs = 2
input_0/name = "Forward"
input_0/auto_advance = false
input_0/reset = true
input_1/name = "Backward"
input_1/auto_advance = false
input_1/reset = true

[sub_resource type="AnimationNodeAnimation" id="AnimationNodeAnimation_6bsh6"]
animation = &"JogForward"
Expand All @@ -86,7 +88,7 @@ nodes/FB/node = SubResource("AnimationNodeTransition_mk3d0")
nodes/FB/position = Vector2(140, 140)
nodes/Forward/node = SubResource("AnimationNodeAnimation_6bsh6")
nodes/Forward/position = Vector2(-100, 100)
node_connections = [&"output", 0, &"FB", &"FB", 0, &"Forward", &"FB", 1, &"Backward"]
node_connections = [&"FB", 0, &"Forward", &"FB", 1, &"Backward", &"output", 0, &"FB"]

[sub_resource type="AnimationNodeAnimation" id="AnimationNodeAnimation_pgipy"]
animation = &"Run"
Expand All @@ -102,17 +104,18 @@ nodes/StopAnim/node = SubResource("AnimationNodeAnimation_hwdqf")
nodes/StopAnim/position = Vector2(-260, 180)
nodes/StopSeek/node = SubResource("AnimationNodeTimeSeek_3wh8r")
nodes/StopSeek/position = Vector2(-60, 160)
node_connections = [&"output", 0, &"StopSeek", &"StopSeek", 0, &"StopAnim"]
node_connections = [&"StopSeek", 0, &"StopAnim", &"output", 0, &"StopSeek"]

[sub_resource type="AnimationNodeAnimation" id="AnimationNodeAnimation_dxjg6"]
animation = &"WalkingBackward"

[sub_resource type="AnimationNodeTransition" id="AnimationNodeTransition_tyxgb"]
enabled_inputs = 2
input_0/name = "Forward"
input_0/auto_advance = false
input_0/reset = true
input_1/name = "Backward"
input_1/auto_advance = false
input_1/reset = true

[sub_resource type="AnimationNodeAnimation" id="AnimationNodeAnimation_3y4dp"]
animation = &"Walk"
Expand All @@ -125,7 +128,7 @@ nodes/FB/node = SubResource("AnimationNodeTransition_tyxgb")
nodes/FB/position = Vector2(140, 100)
nodes/Forward/node = SubResource("AnimationNodeAnimation_3y4dp")
nodes/Forward/position = Vector2(-60, 60)
node_connections = [&"output", 0, &"FB", &"FB", 0, &"Forward", &"FB", 1, &"Backward"]
node_connections = [&"FB", 0, &"Forward", &"FB", 1, &"Backward", &"output", 0, &"FB"]

[sub_resource type="AnimationNodeStateMachineTransition" id="AnimationNodeStateMachineTransition_wnbtw"]
xfade_time = 0.2
Expand Down Expand Up @@ -214,7 +217,7 @@ nodes/crouching/node = SubResource("AnimationNodeStateMachine_2xodt")
nodes/crouching/position = Vector2(-100, 420)
nodes/standing/node = SubResource("AnimationNodeStateMachine_ieguh")
nodes/standing/position = Vector2(-120, 40)
node_connections = [&"output", 0, &"crouch", &"crouch", 0, &"standing", &"crouch", 1, &"crouching"]
node_connections = [&"crouch", 0, &"standing", &"crouch", 1, &"crouching", &"output", 0, &"crouch"]

[sub_resource type="AnimationNodeBlendTree" id="AnimationNodeBlendTree_5nmia"]
resource_local_to_scene = true
Expand All @@ -234,7 +237,7 @@ nodes/Turn/position = Vector2(980, 1400)
nodes/VelocityDirection/node = SubResource("AnimationNodeBlendTree_ml0kl")
nodes/VelocityDirection/position = Vector2(680, 1400)
nodes/output/position = Vector2(1540, 1400)
node_connections = [&"output", 0, &"InAir", &"InAir", 0, &"Turn", &"InAir", 1, &"FallAnimation", &"RightOrLeft", 0, &"AnimTurnLeft", &"RightOrLeft", 1, &"AnimTurnRight", &"Turn", 0, &"VelocityDirection", &"Turn", 1, &"RightOrLeft"]
node_connections = [&"InAir", 0, &"Turn", &"InAir", 1, &"FallAnimation", &"RightOrLeft", 0, &"AnimTurnLeft", &"RightOrLeft", 1, &"AnimTurnRight", &"Turn", 0, &"VelocityDirection", &"Turn", 1, &"RightOrLeft", &"output", 0, &"InAir"]

[sub_resource type="AnimationNodeStateMachinePlayback" id="AnimationNodeStateMachinePlayback_wc2uc"]

Expand Down
Empty file.
Empty file modified addons/AMSG/Components/AttributesComponent/AttributesManager.gd
100644 → 100755
Empty file.
Empty file modified addons/AMSG/Components/AttributesComponent/GameAttribute.gd
100644 → 100755
Empty file.
Empty file modified addons/AMSG/Components/AttributesComponent/HealthAttribute.gd
100644 → 100755
Empty file.
Empty file modified addons/AMSG/Components/AttributesComponent/StaminaAttribute.gd
100644 → 100755
Empty file.
Empty file modified addons/AMSG/Components/CameraComponent.gd
100644 → 100755
Empty file.
2 changes: 1 addition & 1 deletion addons/AMSG/Components/CharacterMovementComponent.gd
Original file line number Diff line number Diff line change
Expand Up @@ -308,7 +308,7 @@ func _ready():

update_animations()
update_character_movement()
var pose_warping_instance = pose_warping.new()
var pose_warping_instance = PoseWarping.new()
func _process(delta):


Expand Down
Empty file modified addons/AMSG/Components/CombatComponent/CombatSystem.gd
100644 → 100755
Empty file.
Empty file modified addons/AMSG/Components/Interaction.gd
100644 → 100755
Empty file.
Empty file modified addons/AMSG/Components/LockComponent/LockSystem.gd
100644 → 100755
Empty file.
28 changes: 14 additions & 14 deletions addons/AMSG/Components/Networking.tscn
Original file line number Diff line number Diff line change
Expand Up @@ -5,46 +5,46 @@
[sub_resource type="SceneReplicationConfig" id="SceneReplicationConfig_rxj2q"]
properties/0/path = NodePath(":sync_camera_h_transform")
properties/0/spawn = true
properties/0/sync = true
properties/0/replication_mode = 1
properties/1/path = NodePath(":sync_camera_v_transform")
properties/1/spawn = true
properties/1/sync = true
properties/1/replication_mode = 1
properties/2/path = NodePath(":sync_view_mode")
properties/2/spawn = true
properties/2/sync = true
properties/2/replication_mode = 1
properties/3/path = NodePath(":sync_CameraHOffset")
properties/3/spawn = true
properties/3/sync = true
properties/3/replication_mode = 1
properties/4/path = NodePath(":sync_position")
properties/4/spawn = true
properties/4/sync = true
properties/4/replication_mode = 1
properties/5/path = NodePath(":sync_mesh_rotation")
properties/5/spawn = true
properties/5/sync = true
properties/5/replication_mode = 1
properties/6/path = NodePath(":sync_direction")
properties/6/spawn = true
properties/6/sync = true
properties/6/replication_mode = 1
properties/7/path = NodePath(":sync_input_is_moving")
properties/7/spawn = true
properties/7/sync = true
properties/7/replication_mode = 1
properties/8/path = NodePath(":sync_gait")
properties/8/spawn = true
properties/8/sync = true
properties/8/replication_mode = 1
properties/9/path = NodePath(":sync_rotation_mode")
properties/9/spawn = true
properties/9/sync = true
properties/9/replication_mode = 1
properties/10/path = NodePath(":sync_stance")
properties/10/spawn = true
properties/10/sync = true
properties/10/replication_mode = 1
properties/11/path = NodePath(":sync_movement_state")
properties/11/spawn = true
properties/11/sync = true
properties/11/replication_mode = 1
properties/12/path = NodePath(":sync_movement_action")
properties/12/spawn = true
properties/12/sync = true
properties/12/replication_mode = 1
properties/13/path = NodePath(":sync_velocity")
properties/13/spawn = true
properties/13/sync = true
properties/13/replication_mode = 1

[node name="Networking" type="Node"]
script = ExtResource("1_88p3o")
Expand Down
Empty file modified addons/AMSG/Components/PlayerNetworkingComponent.gd
100644 → 100755
Empty file.
Empty file modified addons/AMSG/Components/TargetingComponent/TargetingComponent.gd
100644 → 100755
Empty file.
Empty file modified addons/AMSG/Data/camera_values.gd
100644 → 100755
Empty file.
Empty file modified addons/AMSG/Data/movement_values.gd
100644 → 100755
Empty file.
Empty file modified addons/AMSG/Global.gd
100644 → 100755
Empty file.
Empty file modified addons/AMSG/Interactable/Interactable.gd
100644 → 100755
Empty file.
Empty file modified addons/AMSG/Interactable/Light/InteractableLight.gd
100644 → 100755
Empty file.
Empty file modified addons/AMSG/plugin.cfg
100644 → 100755
Empty file.
6 changes: 6 additions & 0 deletions addons/PoseWarping/PoseWarping.tscn
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
[gd_scene load_steps=2 format=3 uid="uid://b5poio83x0eoe"]

[ext_resource type="Script" path="res://addons/PoseWarping/PoseWarpingFunctions.gd" id="1_jmmdj"]

[node name="PoseWarping" type="Node"]
script = ExtResource("1_jmmdj")
34 changes: 33 additions & 1 deletion addons/PoseWarping/PoseWarpingFunctions.gd
100644 → 100755
Original file line number Diff line number Diff line change
@@ -1,5 +1,37 @@
extends Node
class_name pose_warping
class_name PoseWarping
## a Node that Handles Pose Warping for character for enhanced animations

## The Character Skeleton that is going to be modified
@export var character_skeleton : Skeleton3D


@export_subgroup("Orientation Warping", "orientation_warping_")
@export var orientation_warping_enable : bool
## This is tthe object that contains the camera horizontal rotation
## it could be the camera object itself.
@export var orientation_warping_camera_h_object : Node3D
## MUST BE MODIFIED THROUGH MOVEMENT SCRIPT TO MATCH PLAYER MOVEMENT SPEED
@export var orientation_warping_character_velocity : Vector3
## Hips bone name, Please Write the correct hips bone name according to your skeleton.
@export var orientation_warping_hip_bone_name : String = "Hips"
## Spine Bones Names, Please Write the correct bone names for all of the spine bones according to your skeleton.
@export var orientation_warping_spine_bones_names : Array[String] = ["Spine","Spine1","Spine2"]

## An offset added to the Spine Bones rotation relative to camera forward
@export var orientation_warping_offset := 0.0
##
@export var orientation_warping_turn_rate :float= 10.0


@export_subgroup("Stride - Speed Warping", "stride_warping_")
@export var stride_warping_enable : bool


@export_subgroup("Slope Warping - Leg on ground IK", "slope_warping_")
@export var slope_warping_enable : bool


## For Predicting Stop Location
## it uses a linear equation : d = v*t + 0.5 * a * t^2
## v is velocity. t is time. a is acceleration
Expand Down
Empty file modified addons/PoseWarping/plugin.cfg
100644 → 100755
Empty file.
Empty file modified export_presets.cfg
100644 → 100755
Empty file.
Loading

0 comments on commit 180f53c

Please sign in to comment.