OverviewFilesCommitsIssuesDocsReleasesPeers

hyper-godot4-test commits / d44be24

signal CHUCK Norris
d44be24208d06a6a7f7f46c3c4555fbdfecead95
by Dresk Spidflisk <dreskspidflisk@gmail.com> · 2022-04-18T16:04:03.000Z

Changed files (7) +166 -172

game/map_decorations/teleporter.gd +1 -1
……@@ -27,7 +27,7 @@ func tryMapChange(mapChangeName : String, sendGossip : bool, playerNode):
2727 elif(mapChangeName == "map_cyber"):
2828 mapNode = mapsNode.find_node("map_cyber", true, false)
2929 elif(mapChangeName == "map_cyber1"):
30Q mapNode = mapsNode.find_node("map_cyber1", true, false)
30 mapNode = mapsNode.find_node("map_cyber1", true, false)
3131 # Find a Respawn Point
3232 playerNode.currentSpawnLocation = playerNode.getSpawnLocationForMapName(mapChangeName)
3333 playerNode.currentMap = mapNode
game/maps/map_test/map_test.tscn +1 -1
……@@ -3,7 +3,7 @@
33[ext_resource type="PackedScene" uid="uid://t6bfklm2qebp" path="res://assets/maps/map_test/asset_map_test.tscn" id="1"]
44[ext_resource type="Script" path="res://game/maps/map_core.gd" id="2"]
55[ext_resource type="PackedScene" uid="uid://bvsite1k7u1j5" path="res://game/map_decorations/spawnpad_nocollision.tscn" id="3"]
6[ext_resource type="Environment" uid="uid://clgc7i2qnn27q" path="res://game/maps/map_test/map_test_environment.res" id="3_0xp3k"]
6[ext_resource type="Environment" uid="uid://c6rnccvc2njyc" path="res://game/maps/map_test/map_test_environment.res" id="3_0xp3k"]
77[ext_resource type="PackedScene" uid="uid://csegj0tubaqd1" path="res://game/map_decorations/teleport.scn" id="4"]
88[ext_resource type="PackedScene" uid="uid://b5dqfyr3ynwt6" path="res://game/maps/map_test/map_test_environment.scn" id="5"]
99[ext_resource type="AudioStream" uid="uid://7mme5t5cy2f3" path="res://assets/sounds/ambience/howling_wind.mp3" id="6"]
game/player/player_animation_tree.tres +73 -73
……@@ -1,45 +1,45 @@
11[gd_resource type="AnimationNodeBlendTree" load_steps=37 format=3 uid="uid://4lcyy2yqlv2m"]
22
3[sub_resource type="AnimationNodeAnimation" id="51"]
3[sub_resource type="AnimationNodeAnimation" id="AnimationNodeAnimation_hs4bc"]
44animation = &"wall-run-r"
55
6[sub_resource type="AnimationNodeAnimation" id="AnimationNodeAnimation_tnaj5"]
6[sub_resource type="AnimationNodeAnimation" id="AnimationNodeAnimation_tqr1x"]
77animation = &"wall-grab-r"
88
9[sub_resource type="AnimationNodeAnimation" id="AnimationNodeAnimation_vyaeb"]
9[sub_resource type="AnimationNodeAnimation" id="AnimationNodeAnimation_o2bng"]
1010animation = &"idle"
1111
12[sub_resource type="AnimationNodeAnimation" id="AnimationNodeAnimation_uru14"]
12[sub_resource type="AnimationNodeAnimation" id="AnimationNodeAnimation_lb2xi"]
1313animation = &"landing"
1414
15[sub_resource type="AnimationNodeAnimation" id="AnimationNodeAnimation_wawqe"]
15[sub_resource type="AnimationNodeAnimation" id="AnimationNodeAnimation_3h6s0"]
1616animation = &"walk-forward"
1717
18[sub_resource type="AnimationNodeAnimation" id="AnimationNodeAnimation_u20ff"]
18[sub_resource type="AnimationNodeAnimation" id="AnimationNodeAnimation_qr8c1"]
1919animation = &"sprint"
2020
21[sub_resource type="AnimationNodeAnimation" id="AnimationNodeAnimation_2vmrc"]
21[sub_resource type="AnimationNodeAnimation" id="AnimationNodeAnimation_8aqij"]
2222animation = &"jump"
2323
24[sub_resource type="AnimationNodeAnimation" id="AnimationNodeAnimation_63xdf"]
24[sub_resource type="AnimationNodeAnimation" id="AnimationNodeAnimation_j28qi"]
2525animation = &"falling"
2626
27[sub_resource type="AnimationNodeAnimation" id="47"]
27[sub_resource type="AnimationNodeAnimation" id="AnimationNodeAnimation_5v37v"]
2828animation = &"wall-grab-r"
2929
30[sub_resource type="AnimationNodeAnimation" id="48"]
30[sub_resource type="AnimationNodeAnimation" id="AnimationNodeAnimation_00mbm"]
3131animation = &"wall-run-r"
3232
33[sub_resource type="AnimationNodeAnimation" id="AnimationNodeAnimation_paagg"]
33[sub_resource type="AnimationNodeAnimation" id="AnimationNodeAnimation_f35y4"]
3434animation = &"dive-roll"
3535
36[sub_resource type="AnimationNodeBlend2" id="53"]
36[sub_resource type="AnimationNodeBlend2" id="AnimationNodeBlend2_s7dlh"]
3737
38[sub_resource type="AnimationNodeBlend2" id="49"]
38[sub_resource type="AnimationNodeBlend2" id="AnimationNodeBlend2_wu6wn"]
3939
40[sub_resource type="AnimationNodeTimeScale" id="22"]
40[sub_resource type="AnimationNodeTimeScale" id="AnimationNodeTimeScale_em73k"]
4141
42[sub_resource type="AnimationNodeTransition" id="29"]
42[sub_resource type="AnimationNodeTransition" id="AnimationNodeTransition_p1a7m"]
4343input_count = 2
4444xfade_time = 0.1
4545input_0/name = "aiming"
……@@ -47,9 +47,9 @@ input_0/auto_advance = false
4747input_1/name = "not_aiming"
4848input_1/auto_advance = false
4949
50[sub_resource type="AnimationNodeBlend3" id="44"]
50[sub_resource type="AnimationNodeBlend3" id="AnimationNodeBlend3_3pej8"]
5151
52[sub_resource type="AnimationNodeTransition" id="41"]
52[sub_resource type="AnimationNodeTransition" id="AnimationNodeTransition_uogps"]
5353input_count = 2
5454xfade_time = 0.1
5555input_0/name = "air"
……@@ -57,71 +57,71 @@ input_0/auto_advance = false
5757input_1/name = "ground"
5858input_1/auto_advance = false
5959
60[sub_resource type="AnimationNodeTimeScale" id="45"]
60[sub_resource type="AnimationNodeTimeScale" id="AnimationNodeTimeScale_cvx2j"]
6161
62[sub_resource type="AnimationNodeBlend3" id="28"]
62[sub_resource type="AnimationNodeBlend3" id="AnimationNodeBlend3_vhjwv"]
6363
64[sub_resource type="AnimationNodeTimeScale" id="42"]
64[sub_resource type="AnimationNodeTimeScale" id="AnimationNodeTimeScale_qbxul"]
6565
66[sub_resource type="AnimationNodeTimeScale" id="46"]
66[sub_resource type="AnimationNodeTimeScale" id="AnimationNodeTimeScale_oswof"]
6767
68[sub_resource type="AnimationNodeOneShot" id="30"]
68[sub_resource type="AnimationNodeOneShot" id="AnimationNodeOneShot_7pwdo"]
6969
70[sub_resource type="AnimationNodeTimeScale" id="31"]
70[sub_resource type="AnimationNodeTimeScale" id="AnimationNodeTimeScale_bi7is"]
7171
72[sub_resource type="AnimationNodeTimeScale" id="33"]
72[sub_resource type="AnimationNodeTimeScale" id="AnimationNodeTimeScale_pqd1w"]
7373
74[sub_resource type="AnimationNodeAnimation" id="78"]
74[sub_resource type="AnimationNodeAnimation" id="AnimationNodeAnimation_l5165"]
7575animation = &"idle"
7676
77[sub_resource type="AnimationNodeAnimation" id="79"]
77[sub_resource type="AnimationNodeAnimation" id="AnimationNodeAnimation_lerby"]
7878animation = &"walk-forward"
7979
80[sub_resource type="AnimationNodeAnimation" id="80"]
80[sub_resource type="AnimationNodeAnimation" id="AnimationNodeAnimation_2lukn"]
8181animation = &"strafe_right"
8282
83[sub_resource type="AnimationNodeAnimation" id="81"]
83[sub_resource type="AnimationNodeAnimation" id="AnimationNodeAnimation_hlvbk"]
8484animation = &"walk-diagonal-right"
8585
86[sub_resource type="AnimationNodeAnimation" id="82"]
86[sub_resource type="AnimationNodeAnimation" id="AnimationNodeAnimation_8dkct"]
8787animation = &"walk-diagonal-right-back"
8888
89[sub_resource type="AnimationNodeAnimation" id="83"]
89[sub_resource type="AnimationNodeAnimation" id="AnimationNodeAnimation_jxhun"]
9090animation = &"walk-backward"
9191
92[sub_resource type="AnimationNodeAnimation" id="84"]
92[sub_resource type="AnimationNodeAnimation" id="AnimationNodeAnimation_8yfpx"]
9393animation = &"walk-diagonal-left-back"
9494
95[sub_resource type="AnimationNodeAnimation" id="85"]
95[sub_resource type="AnimationNodeAnimation" id="AnimationNodeAnimation_yu1sb"]
9696animation = &"strafe-left"
9797
98[sub_resource type="AnimationNodeAnimation" id="86"]
98[sub_resource type="AnimationNodeAnimation" id="AnimationNodeAnimation_6jmbi"]
9999animation = &"walk-diagonal-left"
100100
101[sub_resource type="AnimationNodeBlendSpace2D" id="20"]
102blend_point_0/node = SubResource( "78" )
101[sub_resource type="AnimationNodeBlendSpace2D" id="AnimationNodeBlendSpace2D_snna2"]
102blend_point_0/node = SubResource( "AnimationNodeAnimation_l5165" )
103103blend_point_0/pos = Vector2(0, 0)
104blend_point_1/node = SubResource( "79" )
104blend_point_1/node = SubResource( "AnimationNodeAnimation_lerby" )
105105blend_point_1/pos = Vector2(0, 1)
106blend_point_2/node = SubResource( "80" )
106blend_point_2/node = SubResource( "AnimationNodeAnimation_2lukn" )
107107blend_point_2/pos = Vector2(1, 0)
108blend_point_3/node = SubResource( "81" )
108blend_point_3/node = SubResource( "AnimationNodeAnimation_hlvbk" )
109109blend_point_3/pos = Vector2(1, 1.01)
110blend_point_4/node = SubResource( "82" )
110blend_point_4/node = SubResource( "AnimationNodeAnimation_8dkct" )
111111blend_point_4/pos = Vector2(1, -1)
112blend_point_5/node = SubResource( "83" )
112blend_point_5/node = SubResource( "AnimationNodeAnimation_jxhun" )
113113blend_point_5/pos = Vector2(0, -1)
114blend_point_6/node = SubResource( "84" )
114blend_point_6/node = SubResource( "AnimationNodeAnimation_8yfpx" )
115115blend_point_6/pos = Vector2(-1, -1)
116blend_point_7/node = SubResource( "85" )
116blend_point_7/node = SubResource( "AnimationNodeAnimation_yu1sb" )
117117blend_point_7/pos = Vector2(-1, 0)
118blend_point_8/node = SubResource( "86" )
118blend_point_8/node = SubResource( "AnimationNodeAnimation_6jmbi" )
119119blend_point_8/pos = Vector2(-1, 1)
120120max_space = Vector2(1.01, 1)
121121
122[sub_resource type="AnimationNodeTimeScale" id="23"]
122[sub_resource type="AnimationNodeTimeScale" id="AnimationNodeTimeScale_bvg56"]
123123
124[sub_resource type="AnimationNodeTransition" id="50"]
124[sub_resource type="AnimationNodeTransition" id="AnimationNodeTransition_ur2dc"]
125125input_count = 3
126126input_0/name = "wall_left"
127127input_0/auto_advance = false
……@@ -132,59 +132,59 @@ input_2/auto_advance = false
132132
133133[resource]
134134graph_offset = Vector2(-1318.04, 44.3913)
135nodes/Animation/node = SubResource( "AnimationNodeAnimation_paagg" )
135nodes/Animation/node = SubResource( "AnimationNodeAnimation_f35y4" )
136136nodes/Animation/position = Vector2(-280, 360)
137"nodes/Animation 10/node" = SubResource( "51" )
137"nodes/Animation 10/node" = SubResource( "AnimationNodeAnimation_hs4bc" )
138138"nodes/Animation 10/position" = Vector2(160, -320)
139"nodes/Animation 12/node" = SubResource( "AnimationNodeAnimation_tnaj5" )
139"nodes/Animation 12/node" = SubResource( "AnimationNodeAnimation_tqr1x" )
140140"nodes/Animation 12/position" = Vector2(180, -460)
141"nodes/Animation 2/node" = SubResource( "AnimationNodeAnimation_vyaeb" )
141"nodes/Animation 2/node" = SubResource( "AnimationNodeAnimation_o2bng" )
142142"nodes/Animation 2/position" = Vector2(-720, 220)
143"nodes/Animation 3/node" = SubResource( "AnimationNodeAnimation_uru14" )
143"nodes/Animation 3/node" = SubResource( "AnimationNodeAnimation_lb2xi" )
144144"nodes/Animation 3/position" = Vector2(-620, -80)
145"nodes/Animation 4/node" = SubResource( "AnimationNodeAnimation_wawqe" )
145"nodes/Animation 4/node" = SubResource( "AnimationNodeAnimation_3h6s0" )
146146"nodes/Animation 4/position" = Vector2(-880, 380)
147"nodes/Animation 5/node" = SubResource( "AnimationNodeAnimation_u20ff" )
147"nodes/Animation 5/node" = SubResource( "AnimationNodeAnimation_qr8c1" )
148148"nodes/Animation 5/position" = Vector2(-860, 540)
149"nodes/Animation 6/node" = SubResource( "AnimationNodeAnimation_2vmrc" )
149"nodes/Animation 6/node" = SubResource( "AnimationNodeAnimation_8aqij" )
150150"nodes/Animation 6/position" = Vector2(-580, -340)
151"nodes/Animation 7/node" = SubResource( "AnimationNodeAnimation_63xdf" )
151"nodes/Animation 7/node" = SubResource( "AnimationNodeAnimation_j28qi" )
152152"nodes/Animation 7/position" = Vector2(-580, -200)
153"nodes/Animation 8/node" = SubResource( "47" )
153"nodes/Animation 8/node" = SubResource( "AnimationNodeAnimation_5v37v" )
154154"nodes/Animation 8/position" = Vector2(180, -180)
155"nodes/Animation 9/node" = SubResource( "48" )
155"nodes/Animation 9/node" = SubResource( "AnimationNodeAnimation_00mbm" )
156156"nodes/Animation 9/position" = Vector2(180, -60)
157nodes/Blend2/node = SubResource( "49" )
157nodes/Blend2/node = SubResource( "AnimationNodeBlend2_wu6wn" )
158158nodes/Blend2/position = Vector2(480, -120)
159"nodes/Blend2 2/node" = SubResource( "53" )
159"nodes/Blend2 2/node" = SubResource( "AnimationNodeBlend2_s7dlh" )
160160"nodes/Blend2 2/position" = Vector2(480, -360)
161"nodes/TimeScale 3/node" = SubResource( "22" )
161"nodes/TimeScale 3/node" = SubResource( "AnimationNodeTimeScale_em73k" )
162162"nodes/TimeScale 3/position" = Vector2(-480, 80)
163nodes/aim_transition/node = SubResource( "29" )
163nodes/aim_transition/node = SubResource( "AnimationNodeTransition_p1a7m" )
164164nodes/aim_transition/position = Vector2(-240, 106.667)
165nodes/air_blend/node = SubResource( "44" )
165nodes/air_blend/node = SubResource( "AnimationNodeBlend3_3pej8" )
166166nodes/air_blend/position = Vector2(-100, -160)
167nodes/air_transition/node = SubResource( "41" )
167nodes/air_transition/node = SubResource( "AnimationNodeTransition_uogps" )
168168nodes/air_transition/position = Vector2(133.333, 53.3333)
169nodes/falling_scale/node = SubResource( "45" )
169nodes/falling_scale/node = SubResource( "AnimationNodeTimeScale_cvx2j" )
170170nodes/falling_scale/position = Vector2(-360, -220)
171nodes/iwr_blend/node = SubResource( "28" )
171nodes/iwr_blend/node = SubResource( "AnimationNodeBlend3_vhjwv" )
172172nodes/iwr_blend/position = Vector2(-400, 200)
173nodes/jump_scale/node = SubResource( "42" )
173nodes/jump_scale/node = SubResource( "AnimationNodeTimeScale_qbxul" )
174174nodes/jump_scale/position = Vector2(-380, -360)
175nodes/landing_scale/node = SubResource( "46" )
175nodes/landing_scale/node = SubResource( "AnimationNodeTimeScale_oswof" )
176176nodes/landing_scale/position = Vector2(-380, -80)
177177nodes/output/position = Vector2(900, 100)
178nodes/roll/node = SubResource( "30" )
178nodes/roll/node = SubResource( "AnimationNodeOneShot_7pwdo" )
179179nodes/roll/position = Vector2(373.333, 133.333)
180nodes/roll_scale/node = SubResource( "31" )
180nodes/roll_scale/node = SubResource( "AnimationNodeTimeScale_bi7is" )
181181nodes/roll_scale/position = Vector2(-60, 280)
182nodes/run_scale/node = SubResource( "33" )
182nodes/run_scale/node = SubResource( "AnimationNodeTimeScale_pqd1w" )
183183nodes/run_scale/position = Vector2(-640, 500)
184nodes/strafe/node = SubResource( "20" )
184nodes/strafe/node = SubResource( "AnimationNodeBlendSpace2D_snna2" )
185185nodes/strafe/position = Vector2(-760, 60)
186nodes/walk_scale/node = SubResource( "23" )
186nodes/walk_scale/node = SubResource( "AnimationNodeTimeScale_bvg56" )
187187nodes/walk_scale/position = Vector2(-640, 360)
188nodes/wall_run/node = SubResource( "50" )
188nodes/wall_run/node = SubResource( "AnimationNodeTransition_ur2dc" )
189189nodes/wall_run/position = Vector2(720, -60)
190node_connections = [&"output", 0, &"wall_run", &"roll", 0, &"air_transition", &"roll", 1, &"roll_scale", &"Blend2", 0, &"Animation 8", &"Blend2", 1, &"Animation 9", &"Blend2 2", 0, &"Animation 12", &"Blend2 2", 1, &"Animation 10", &"TimeScale 3", 0, &"strafe", &"aim_transition", 0, &"TimeScale 3", &"aim_transition", 1, &"iwr_blend", &"air_blend", 0, &"jump_scale", &"air_blend", 1, &"falling_scale", &"air_blend", 2, &"landing_scale", &"air_transition", 0, &"air_blend", &"air_transition", 1, &"aim_transition", &"falling_scale", 0, &"Animation 7", &"iwr_blend", 0, &"Animation 2", &"iwr_blend", 1, &"walk_scale", &"iwr_blend", 2, &"run_scale", &"jump_scale", 0, &"Animation 6", &"landing_scale", 0, &"Animation 3", &"roll_scale", 0, &"Animation", &"run_scale", 0, &"Animation 5", &"walk_scale", 0, &"Animation 4", &"wall_run", 0, &"Blend2", &"wall_run", 1, &"Blend2 2", &"wall_run", 2, &"roll"]
190node_connections = [&"output", 0, &"wall_run", &"roll", 0, &"air_transition", &"roll", 1, &"roll_scale", &"air_transition", 0, &"air_blend", &"air_transition", 1, &"aim_transition", &"landing_scale", 0, &"Animation 3", &"walk_scale", 0, &"Animation 4", &"Blend2 2", 0, &"Animation 12", &"Blend2 2", 1, &"Animation 10", &"jump_scale", 0, &"Animation 6", &"Blend2", 0, &"Animation 8", &"Blend2", 1, &"Animation 9", &"run_scale", 0, &"Animation 5", &"TimeScale 3", 0, &"strafe", &"aim_transition", 0, &"TimeScale 3", &"aim_transition", 1, &"iwr_blend", &"iwr_blend", 0, &"Animation 2", &"iwr_blend", 1, &"walk_scale", &"iwr_blend", 2, &"run_scale", &"roll_scale", 0, &"Animation", &"air_blend", 0, &"jump_scale", &"air_blend", 1, &"falling_scale", &"air_blend", 2, &"landing_scale", &"falling_scale", 0, &"Animation 7", &"wall_run", 0, &"Blend2", &"wall_run", 1, &"Blend2 2", &"wall_run", 2, &"roll"]
game/player/player_core.gd +13 -13
……@@ -24,7 +24,7 @@ const EVENT_PLAYER_TOGGLE_LIGHT = 'player_toggle_light'
2424@onready var meshNode : Node3D = $Model
2525@onready var meshSkeletonNode : Skeleton3D = $Model/Armature/Skeleton3D
2626@onready var meshSkeletalIKNode : SkeletonIK3D = $Model/Armature/Skeleton3D/SkeletonIK3D
27@onready var meshSkeletonHiddenHand : MeshInstance3D = $Model/Armature/Skeleton/player001
27@onready var meshSkeletonHiddenHand : MeshInstance3D = $Model/Armature/Skeleton3D/player001
2828@onready var meshHandBone : int = meshSkeletonNode.find_bone("DEF-hand.R")
2929@onready var meshHandBonePos : Transform3D = meshSkeletonNode.get_bone_pose(meshHandBone)
3030
……@@ -133,7 +133,7 @@ func grapplingHook_CheckActivation():
133133 grapplingHook_IsHooked = true
134134 grappleVisualLine.show()
135135 $Model/Sound_Shoot_GrapplingHook_2.play()
136 grappleIKTarget.translation = grapplingHook_GrapplePosition
136 grappleIKTarget.position = grapplingHook_GrapplePosition
137137 grapplingHook_DisappearHand()
138138
139139 elif(playerWantsToReleaseGrapplingHook):
……@@ -156,7 +156,7 @@ func grapplingHook_UpdateVisualLine(length : float):
156156 if(grapplingHook_IsHooked):
157157 grappleLineHelper.look_at(grapplingHook_GrapplePosition, Vector3.UP)
158158 grappleVisualLine.height = length
159 grappleVisualLine.translation.z = length / -1.80
159 grappleVisualLine.position.z = length / -1.80
160160
161161func grapplingHook_UpdatePlayerVelocityAndReturnHookLength() -> float:
162162 # var grapple_speed : float = 0.5
……@@ -352,14 +352,14 @@ func _on_input_player_jump():
352352 playerWantsToJump = true
353353 hyperGossip.broadcast_event(EVENT_PLAYER_WANTSTOJUMP, getPlayerLocalCoreNetworkData() )
354354
355func _on_Input_player_shoot_grapplinghook():
355func _on_input_player_shoot_grapplinghook():
356356 if( Input.get_mouse_mode() != Input.MOUSE_MODE_VISIBLE ):
357357 if( grappleHookCast.is_colliding() ):
358358 playerWantsToShootGrapplingHook = true
359359 grapplingHook_GrapplePosition = grappleHookCast.get_collision_point()
360360 hyperGossip.broadcast_event(EVENT_PLAYER_SHOOT_GRAPPLINGHOOK, getPlayerLocalShootGrapplingHookData() )
361361
362func _on_Input_player_release_grapplinghook():
362func _on_input_player_release_grapplinghook():
363363 if( Input.get_mouse_mode() != Input.MOUSE_MODE_VISIBLE ):
364364 if(grapplingHook_IsHooked):
365365 playerWantsToReleaseGrapplingHook = true
……@@ -386,15 +386,15 @@ func _on_MoveNetworkTimer_timeout():
386386func getPlayerLocalCoreNetworkData() -> Dictionary:
387387 # TODO : Fix finding the local player, and get it out of player_core into player_core_local
388388 var localPlayer : CharacterBody3D = get_tree().get_current_scene().get_node("Players").get_node("PlayerCoreLocal")
389 var position : Vector3 = localPlayer.position
389 var _position : Vector3 = localPlayer.position
390390 var direction : Vector3 = localPlayer.currentDirection
391391
392392 var data : Dictionary = {
393393 #"profile": profile,
394394 "position": {
395 "x": position.x,
396 "y": position.y,
397 "z": position.z
395 "x": _position.x,
396 "y": _position.y,
397 "z": _position.z
398398 },
399399 "direction": {
400400 "x": direction.x,
……@@ -413,15 +413,15 @@ func getPlayerLocalCoreNetworkData() -> Dictionary:
413413func getPlayerLocalShootGrapplingHookData() -> Dictionary:
414414 # TODO : Fix finding the local player, and get it out of player_core into player_core_local
415415 var localPlayer : CharacterBody3D = get_tree().get_current_scene().get_node("Players").get_node("PlayerCoreLocal")
416 var position : Vector3 = localPlayer.position
416 var _position : Vector3 = localPlayer.position
417417 var direction : Vector3 = localPlayer.currentDirection
418418
419419 var data : Dictionary = {
420420 #"profile": profile,
421421 "position": {
422 "x": position.x,
423 "y": position.y,
424 "z": position.z
422 "x": _position.x,
423 "y": _position.y,
424 "z": _position.z
425425 },
426426 "direction": {
427427 "x": direction.x,
game/player/player_core.tscn +1 -1
……@@ -122,7 +122,7 @@ active = true
122122parameters/Blend2/blend_amount = 0
123123"parameters/Blend2 2/blend_amount" = 0
124124"parameters/TimeScale 3/scale" = 1.0
125parameters/aim_transition/current = 0
125parameters/aim_transition/current = 1
126126parameters/air_blend/blend_amount = 0
127127parameters/air_transition/current = 1
128128parameters/falling_scale/scale = 1.0
game/player/player_core_local.tscn +72 -81
……@@ -10,100 +10,89 @@
1010[node name="PlayerCoreLocal" instance=ExtResource( "1" )]
1111
1212[node name="Skeleton3D" parent="Model/Armature" index="0"]
13bones/1/position = Vector3(-0.000419951, 0.0630349, 1.02341)
14bones/1/rotation = Quaternion(-0.000317117, 0.611097, 0.791556, 0.000137524)
15bones/2/rotation = Quaternion(0.0929621, -9.05774e-06, 9.35003e-05, 0.99567)
16bones/3/rotation = Quaternion(-0.000156044, 0.9988, 0.0489682, 1.71224e-05)
13bones/0/position = Vector3(0, 0.235168, 0)
14bones/1/position = Vector3(-0.0240179, 0.0238949, 0.747739)
15bones/1/rotation = Quaternion(0.00109371, 0.537324, 0.843354, 0.00607089)
16bones/2/rotation = Quaternion(0.114988, 3.43713e-05, -0.000373492, 0.993367)
17bones/3/rotation = Quaternion(0.00134837, 0.99984, -0.015718, -0.00843674)
1718bones/3/scale = Vector3(1, 1, 1)
18bones/4/rotation = Quaternion(0.0028957, -0.000203448, 0.000192423, 0.999996)
19bones/5/rotation = Quaternion(-4.07725e-05, 0.979807, 0.199944, 0.000619845)
20bones/6/rotation = Quaternion(0.0948521, 0.000431962, 5.24505e-05, 0.995491)
21bones/7/rotation = Quaternion(0.000204269, 0.99556, 0.0941332, 8.32836e-05)
22bones/8/position = Vector3(0.0210339, 0.157428, 0.0900698)
23bones/8/rotation = Quaternion(-0.574526, -0.380395, -0.372147, 0.621873)
24bones/9/rotation = Quaternion(-0.0785701, 0.76792, -0.601702, 0.205135)
25bones/9/scale = Vector3(0.999974, 1.00004, 0.999974)
26bones/10/rotation = Quaternion(1.50914e-07, -0.0335961, -1.00491e-07, 0.999435)
27bones/11/rotation = Quaternion(0.135138, -0.0336936, 0.00537861, 0.990239)
28bones/11/scale = Vector3(0.999662, 1.00056, 0.999779)
29bones/12/rotation = Quaternion(8.85576e-07, 0.0356237, -5.98644e-07, 0.999365)
30bones/13/rotation = Quaternion(-0.0241799, 0.0357015, -0.11196, 0.992777)
31bones/13/scale = Vector3(1.00029, 0.999342, 1.00037)
32bones/15/position = Vector3(0.000889692, 0.0800309, 2.29131e-05)
19bones/4/rotation = Quaternion(0.155856, 0.00857555, -0.000912705, 0.987742)
20bones/5/rotation = Quaternion(-0.000882708, 0.995072, 0.0989637, 0.00616626)
21bones/6/rotation = Quaternion(0.0931299, 0.000157758, 1.62897e-05, 0.995654)
22bones/7/rotation = Quaternion(0.000822052, 0.989781, 0.142467, 0.00608377)
23bones/8/position = Vector3(0.021036, 0.14111, 0.0955364)
24bones/8/rotation = Quaternion(-0.574533, -0.380402, -0.372139, 0.621867)
25bones/9/rotation = Quaternion(-0.0072548, 0.739461, -0.640532, 0.207034)
26bones/9/scale = Vector3(1.00563, 0.988357, 1.00563)
27bones/10/rotation = Quaternion(1.36131e-07, -0.17504, -1.6109e-08, 0.984561)
28bones/11/rotation = Quaternion(0.396497, -0.159018, 0.0682248, 0.901581)
29bones/11/scale = Vector3(0.999515, 0.989686, 1.01004)
30bones/12/rotation = Quaternion(9.79363e-07, 0.130257, -4.69733e-07, 0.99148)
31bones/13/rotation = Quaternion(0.0736509, 0.139994, -0.0819888, 0.984)
32bones/13/scale = Vector3(0.993985, 1.00997, 0.996089)
3333bones/15/rotation = Quaternion(0.152495, 0.0320204, -0.0648276, 0.985656)
34bones/16/rotation = Quaternion(-0.00577721, 0.00169796, -0.00528011, 0.999968)
35bones/17/rotation = Quaternion(0.00660686, -0.00667314, 0.0208096, 0.999739)
36bones/18/position = Vector3(0.0235955, 0.0697299, -0.0610142)
37bones/18/rotation = Quaternion(0.178151, 0.150501, -0.33743, 0.912005)
34bones/16/rotation = Quaternion(-0.00581883, 0.00169818, -0.00528004, 0.999968)
35bones/17/rotation = Quaternion(0.00656525, -0.00667401, 0.0208093, 0.99974)
36bones/18/rotation = Quaternion(0.178116, 0.150551, -0.33769, 0.911907)
3837bones/18/scale = Vector3(1, 1, 1)
39bones/19/rotation = Quaternion(-0.148144, 0.0253031, -0.0646959, 0.986523)
40bones/20/rotation = Quaternion(-0.0146397, -0.0187563, 0.0312646, 0.999228)
41bones/22/position = Vector3(-0.00202509, 0.0783301, -0.00199306)
38bones/19/rotation = Quaternion(-0.148158, 0.0254844, -0.0646288, 0.986521)
39bones/20/rotation = Quaternion(-0.0146405, -0.0187557, 0.0313062, 0.999227)
4240bones/22/rotation = Quaternion(0.155842, 0.00461602, -0.0101422, 0.987719)
43bones/23/rotation = Quaternion(-0.0133558, -0.000793365, 0.00273884, 0.999907)
44bones/24/rotation = Quaternion(-0.00205268, 0.00257135, -0.00834418, 0.99996)
45bones/26/position = Vector3(-0.00150848, 0.0773161, -0.000150169)
41bones/23/rotation = Quaternion(-0.0133974, -0.000793479, 0.00273881, 0.999906)
42bones/24/rotation = Quaternion(-0.00209429, 0.0025717, -0.00834407, 0.99996)
4643bones/26/rotation = Quaternion(0.118904, 0.0306709, -0.0560406, 0.990848)
47bones/27/rotation = Quaternion(-0.01335, -0.0027066, 0.00650447, 0.999886)
48bones/28/rotation = Quaternion(0.000368088, -0.00915026, 0.0211578, 0.999734)
49bones/30/position = Vector3(0.00137017, 0.0745297, 0.000477669)
44bones/27/rotation = Quaternion(-0.0133916, -0.00270688, 0.00650435, 0.999885)
45bones/28/rotation = Quaternion(0.000326481, -0.00915114, 0.0211574, 0.999734)
5046bones/30/rotation = Quaternion(0.119319, -0.0143616, 0.0193321, 0.992564)
51bones/31/rotation = Quaternion(-0.0148924, 0.0107438, -0.0181574, 0.999667)
52bones/32/rotation = Quaternion(0.0225255, -0.00492372, 0.00846153, 0.999698)
53bones/33/position = Vector3(-0.0210384, 0.157428, 0.0900697)
54bones/33/rotation = Quaternion(-0.574483, 0.380448, 0.372183, 0.621859)
55bones/34/rotation = Quaternion(0.0769122, 0.7679, -0.601873, -0.205335)
56bones/34/scale = Vector3(0.999937, 1.00015, 0.999937)
57bones/35/rotation = Quaternion(4.85748e-07, 0.0323693, 5.71788e-07, 0.999476)
58bones/36/rotation = Quaternion(0.132669, 0.0324086, -0.00448408, 0.99062)
59bones/36/scale = Vector3(0.999667, 1.00064, 0.9997)
60bones/37/rotation = Quaternion(-3.67589e-07, -0.0341525, -2.18187e-07, 0.999417)
61bones/38/rotation = Quaternion(-0.0297941, -0.0344344, 0.115796, 0.992229)
62bones/38/scale = Vector3(1.00036, 0.999244, 1.00042)
63bones/40/position = Vector3(-0.000889778, 0.080031, 2.27726e-05)
47bones/31/rotation = Quaternion(-0.014934, 0.0107446, -0.0181569, 0.999666)
48bones/32/rotation = Quaternion(0.0224839, -0.00492407, 0.00846133, 0.999699)
49bones/33/position = Vector3(-0.0210362, 0.14111, 0.0955362)
50bones/33/rotation = Quaternion(-0.574533, 0.380402, 0.372139, 0.621867)
51bones/34/rotation = Quaternion(0.0871951, 0.74376, -0.635559, -0.187838)
52bones/34/scale = Vector3(1.00372, 0.991867, 1.00372)
53bones/35/rotation = Quaternion(2.2563e-07, 0.123919, 6.7336e-07, 0.992292)
54bones/36/rotation = Quaternion(0.265666, 0.121616, -0.0333382, 0.955782)
55bones/36/scale = Vector3(0.999974, 0.99751, 1.00274)
56bones/37/rotation = Quaternion(-3.65474e-07, -0.124538, -1.96684e-07, 0.992215)
57bones/38/rotation = Quaternion(-0.243179, -0.1246, 0.262713, 0.925376)
58bones/38/scale = Vector3(0.998802, 1.00289, 0.997614)
6459bones/40/rotation = Quaternion(0.152494, -0.0320192, 0.0648276, 0.985656)
65bones/41/rotation = Quaternion(-0.00577654, -0.00169879, 0.0052806, 0.999968)
66bones/42/rotation = Quaternion(0.00660567, 0.00667514, -0.0208097, 0.999739)
67bones/43/position = Vector3(-0.0235955, 0.0697303, -0.0610145)
68bones/43/rotation = Quaternion(0.17815, -0.150499, 0.337431, 0.912005)
69bones/44/rotation = Quaternion(-0.148146, -0.0253015, 0.0646943, 0.986523)
70bones/45/rotation = Quaternion(-0.0146351, 0.0187399, -0.0312678, 0.999228)
71bones/47/position = Vector3(0.00202516, 0.0783306, -0.00199345)
60bones/41/rotation = Quaternion(-0.00581815, -0.00169901, 0.00528053, 0.999968)
61bones/42/rotation = Quaternion(0.00656406, 0.00667601, -0.0208095, 0.99974)
62bones/43/rotation = Quaternion(0.178115, -0.150549, 0.337691, 0.911907)
63bones/44/rotation = Quaternion(-0.14816, -0.0254828, 0.0646272, 0.98652)
64bones/45/rotation = Quaternion(-0.0146359, 0.0187393, -0.0313094, 0.999227)
7265bones/47/rotation = Quaternion(0.155842, -0.0046164, 0.0101418, 0.987719)
73bones/48/rotation = Quaternion(-0.0133607, 0.000799579, -0.00273869, 0.999907)
74bones/49/rotation = Quaternion(-0.0020555, -0.00256762, 0.00834454, 0.99996)
75bones/51/position = Vector3(0.00150848, 0.0773164, -0.000150064)
66bones/48/rotation = Quaternion(-0.0134023, 0.000799693, -0.00273866, 0.999906)
67bones/49/rotation = Quaternion(-0.00209712, -0.00256796, 0.00834444, 0.99996)
7668bones/51/rotation = Quaternion(0.118904, -0.0306705, 0.0560406, 0.990848)
77bones/52/rotation = Quaternion(-0.0133557, 0.00271284, -0.0065037, 0.999886)
78bones/53/rotation = Quaternion(0.000383051, 0.00913384, -0.021159, 0.999734)
79bones/55/position = Vector3(-0.00137016, 0.07453, 0.000477447)
69bones/52/rotation = Quaternion(-0.0133973, 0.00271311, -0.00650359, 0.999885)
70bones/53/rotation = Quaternion(0.000341446, 0.00913473, -0.0211586, 0.999734)
8071bones/55/rotation = Quaternion(0.119319, 0.0143618, -0.0193322, 0.992564)
81bones/56/rotation = Quaternion(-0.0148931, -0.0107432, 0.0181577, 0.999667)
82bones/57/rotation = Quaternion(0.0225235, 0.00492554, -0.00846149, 0.999698)
83bones/58/position = Vector3(0.17716, -0.0674861, -0.0507891)
72bones/56/rotation = Quaternion(-0.0149347, -0.0107439, 0.0181572, 0.999666)
73bones/57/rotation = Quaternion(0.0224819, 0.00492589, -0.00846129, 0.999699)
74bones/58/position = Vector3(0.177163, -0.0838025, -0.0453228)
8475bones/58/rotation = Quaternion(-3.44743e-07, 0.696936, 0.717133, 3.13916e-07)
85bones/59/position = Vector3(-0.177165, -0.067486, -0.0507894)
76bones/59/position = Vector3(-0.177162, -0.0838027, -0.0453232)
8677bones/59/rotation = Quaternion(-3.44744e-07, 0.696936, 0.717133, 3.13916e-07)
87bones/60/position = Vector3(-2.0268e-06, -0.115218, -0.303866)
78bones/60/position = Vector3(2.93092e-07, -0.131534, -0.2984)
8879bones/60/rotation = Quaternion(0.014281, -4.94438e-07, 7.06192e-09, 0.999898)
89bones/63/position = Vector3(-0.174269, 0.0813944, -0.0298022)
90bones/63/rotation = Quaternion(-0.000673943, -0.137111, 0.990536, 0.00618008)
91bones/63/scale = Vector3(0.998992, 1.00202, 0.998992)
92bones/64/rotation = Quaternion(-7.35735e-10, -0.122636, -8.26272e-10, 0.992452)
93bones/65/rotation = Quaternion(0.136994, -0.122594, 0.0155516, 0.982833)
94bones/65/scale = Vector3(0.999985, 0.999688, 1.00035)
95bones/66/rotation = Quaternion(-4.06059e-08, -0.0065416, -1.00852e-07, 0.999979)
96bones/67/rotation = Quaternion(-0.276586, -0.00650005, 0.0012614, 0.960966)
97bones/67/scale = Vector3(1.00103, 0.998944, 1.00006)
98bones/69/position = Vector3(0.174162, 0.0814027, -0.0298332)
99bones/69/rotation = Quaternion(0.000769996, -0.21586, 0.97642, 0.00282187)
100bones/69/scale = Vector3(1.00065, 0.998674, 1.00065)
101bones/70/rotation = Quaternion(-2.06944e-10, 0.000759264, 2.06271e-11, 1)
102bones/71/rotation = Quaternion(0.161482, 0.000823903, -0.00107549, 0.986875)
103bones/71/scale = Vector3(1.00004, 0.999255, 1.00072)
104bones/72/rotation = Quaternion(2.93906e-08, 0.0180644, 1.45757e-10, 0.999837)
105bones/73/rotation = Quaternion(-0.229918, 0.0180717, 0.000684459, 0.973042)
106bones/73/scale = Vector3(0.99933, 1.00066, 1.00004)
80bones/63/rotation = Quaternion(0.00165767, -0.476234, 0.879221, 0.0129778)
81bones/63/scale = Vector3(1.0134, 0.972529, 1.01341)
82bones/64/rotation = Quaternion(9.20876e-11, 1.02774e-05, 2.22219e-11, 1)
83bones/65/rotation = Quaternion(0.77436, 0.00181613, -0.00275689, 0.632737)
84bones/65/scale = Vector3(1.00117, 0.969058, 1.03082)
85bones/66/rotation = Quaternion(6.7734e-11, 1.95539e-05, -4.007e-10, 1)
86bones/67/rotation = Quaternion(0.0801868, 0.0047146, 0.0121173, 0.996695)
87bones/67/scale = Vector3(0.984979, 1.02477, 0.9911)
88bones/69/rotation = Quaternion(0.0175319, -0.676899, 0.72957, 0.0960612)
89bones/69/scale = Vector3(1.01054, 0.980018, 1.01054)
90bones/70/rotation = Quaternion(-2.78949e-08, 0.0269004, 4.27779e-09, 0.999638)
91bones/71/rotation = Quaternion(0.59989, 0.0262679, -0.0199426, 0.799402)
92bones/71/scale = Vector3(1.00085, 0.968931, 1.03119)
93bones/72/rotation = Quaternion(1.61887e-08, 0.00796514, -2.61327e-08, 0.999968)
94bones/73/rotation = Quaternion(-0.307288, 0.0074952, 0.142502, 0.940857)
95bones/73/scale = Vector3(0.990784, 1.00615, 1.00327)
10796
10897[node name="Sound_Jump" parent="Model" index="2"]
10998transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0)
……@@ -140,7 +129,9 @@ transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 2.5)
140129[connection signal="player_jump" from="Input" to="." method="_on_input_player_jump"]
141130[connection signal="player_mousemotion_event" from="Input" to="." method="_on_input_player_mousemotion_event"]
142131[connection signal="player_move" from="Input" to="." method="_on_input_player_move"]
132[connection signal="player_release_grapplinghook" from="Input" to="." method="_on_input_player_release_grapplinghook"]
143133[connection signal="player_respawn_player" from="Input" to="." method="_on_input_player_respawn_player"]
134[connection signal="player_shoot_grapplinghook" from="Input" to="." method="_on_input_player_shoot_grapplinghook"]
144135[connection signal="player_toggle_light" from="Input" to="." method="_on_input_player_toggle_light"]
145136
146137[editable path="Model"]
hypergodot/hyper_gateway/hyper_gateway.gd +5 -2
……@@ -190,11 +190,14 @@ func checkLatestVersion():
190190
191191func _on_got_latest(_result, response_code, _headers, body):
192192 print('Latest info response', response_code)
193 # json.parse now returns a generic Error, no longer JSONParseResult object.
193194 var parsed = jsonInstance.parse(body.get_string_from_utf8())
194 if parsed.error != OK:
195 #if parsed.error != OK:
196 if parsed != OK:
195197 printerr("Unable to parse latest version from GitHub:", parsed.error_string)
196198 return
197 var info = parsed.result
199 # var info = parsed.result
200 var info = jsonInstance.get_data()
198201 var newVersion = info.tag_name
199202
200203 print('Latest version:', newVersion)