OverviewFilesCommitsIssuesDocsReleasesPeers

hyper-godot4-test commits / aabf1be

more (not working) updates
aabf1be9ac563009414ca01b54d3888791d51c54
by Dresk Spidflisk <dreskspidflisk@gmail.com> · 2022-04-19T18:44:49.000Z

Changed files (8) +102 -93

assets/maps/map_cyber/concrete.material +0 -0
(no content changes — binary or rename)
game/maps/map_core.gd +1 -1
……@@ -51,7 +51,7 @@ func checkAndSetChildrenGrapplingHookMask(_Node, indentLevel : int):
5151
5252func _on_Area_body_entered(body, _map_name):
5353 if(body is CharacterBody3D):
54 var mapNodes = get_tree().get_current_scene().find_nodes(_map_name, "", true, false)
54 var mapNodes = get_tree().get_current_scene().get_node("Maps").find_nodes(_map_name, "", true, false)
5555 for i in range(0, mapNodes.size()):
5656 if mapNodes[i].name == _map_name:
5757 body.currentMap = mapNodes[i]
game/player/player_animation_tree.tres +1 -1
……@@ -187,4 +187,4 @@ nodes/walk_scale/node = SubResource( "AnimationNodeTimeScale_bvg56" )
187187nodes/walk_scale/position = Vector2(-640, 360)
188188nodes/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", &"aim_transition", 0, &"TimeScale 3", &"aim_transition", 1, &"iwr_blend", &"Blend2", 0, &"Animation 8", &"Blend2", 1, &"Animation 9", &"TimeScale 3", 0, &"strafe", &"air_blend", 0, &"jump_scale", &"air_blend", 1, &"falling_scale", &"air_blend", 2, &"landing_scale", &"Blend2 2", 0, &"Animation 12", &"Blend2 2", 1, &"Animation 10", &"falling_scale", 0, &"Animation 7", &"air_transition", 0, &"air_blend", &"air_transition", 1, &"aim_transition", &"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", &"roll_scale", 0, &"Animation", &"walk_scale", 0, &"Animation 4", &"falling_scale", 0, &"Animation 7", &"Blend2", 0, &"Animation 8", &"Blend2", 1, &"Animation 9", &"TimeScale 3", 0, &"strafe", &"air_blend", 0, &"jump_scale", &"air_blend", 1, &"falling_scale", &"air_blend", 2, &"landing_scale", &"run_scale", 0, &"Animation 5", &"Blend2 2", 0, &"Animation 12", &"Blend2 2", 1, &"Animation 10", &"landing_scale", 0, &"Animation 3", &"air_transition", 0, &"air_blend", &"air_transition", 1, &"aim_transition", &"jump_scale", 0, &"Animation 6", &"iwr_blend", 0, &"Animation 2", &"iwr_blend", 1, &"walk_scale", &"iwr_blend", 2, &"run_scale", &"wall_run", 0, &"Blend2", &"wall_run", 1, &"Blend2 2", &"wall_run", 2, &"roll", &"aim_transition", 0, &"TimeScale 3", &"aim_transition", 1, &"iwr_blend"]
game/player/player_core.gd +1 -1
……@@ -210,7 +210,7 @@ func _physics_process(_delta):
210210 # Check for New World Environment
211211 if(playerWantsNewWorldEnvironment):
212212 playerWantsNewWorldEnvironment = false
213 # currentMap.updateMapWorldEnvironmentScene()
213 currentMap.updateMapWorldEnvironmentScene()
214214
215215 # Check for Toggle Light
216216 if(playerWantsToToggleLight):
game/player/player_core_local.tscn +45 -45
……@@ -11,25 +11,25 @@
1111
1212[node name="Skeleton3D" parent="Model/Armature" index="0"]
1313bones/0/position = Vector3(0, 0.235168, 0)
14bones/1/position = Vector3(0.0117447, 0.0255968, 0.732043)
15bones/1/rotation = Quaternion(8.23238e-05, 0.526573, 0.850102, 0.00693073)
16bones/2/rotation = Quaternion(0.115696, 3.90989e-05, -0.000424333, 0.993285)
17bones/3/rotation = Quaternion(0.000389739, 0.99995, 0.00908603, -0.00414327)
14bones/1/position = Vector3(-0.0293489, 0.0212329, 0.771383)
15bones/1/rotation = Quaternion(0.000435514, 0.565282, 0.824897, 0.00120302)
16bones/2/rotation = Quaternion(0.107652, 1.53948e-05, -0.000169441, 0.994189)
17bones/3/rotation = Quaternion(0.000979133, 0.999197, -0.0396026, -0.00594724)
1818bones/3/scale = Vector3(1, 1, 1)
19bones/4/rotation = Quaternion(0.167795, 0.00399943, -0.000936797, 0.985813)
20bones/5/rotation = Quaternion(-3.17e-05, 0.994443, 0.105266, 0.00123067)
21bones/6/rotation = Quaternion(0.0924468, 0.000220146, 2.27558e-05, 0.995718)
22bones/7/rotation = Quaternion(-0.000131001, 0.989569, 0.144059, 0.00110956)
23bones/8/position = Vector3(0.0210361, 0.138876, 0.0967471)
19bones/4/rotation = Quaternion(0.128773, 0.00590762, -0.0004568, 0.991656)
20bones/5/rotation = Quaternion(-0.000863858, 0.995041, 0.0993083, 0.00557845)
21bones/6/rotation = Quaternion(0.0940735, 7.15494e-05, 7.36782e-06, 0.995565)
22bones/7/rotation = Quaternion(0.000806622, 0.991371, 0.130965, 0.00558989)
23bones/8/position = Vector3(0.021036, 0.147149, 0.093002)
2424bones/8/rotation = Quaternion(-0.574533, -0.380402, -0.372139, 0.621867)
25bones/9/rotation = Quaternion(-0.135501, 0.740622, -0.634822, 0.173549)
26bones/9/scale = Vector3(1.00463, 0.989662, 1.00463)
27bones/10/rotation = Quaternion(1.18432e-07, -0.176781, -3.36775e-08, 0.98425)
28bones/11/rotation = Quaternion(0.321431, -0.174466, 0.0600226, 0.928785)
29bones/11/scale = Vector3(0.999515, 0.992039, 1.00768)
30bones/12/rotation = Quaternion(9.60543e-07, 0.178808, -4.56622e-07, 0.983884)
31bones/13/rotation = Quaternion(0.0948042, 0.18416, -0.0438809, 0.977329)
32bones/13/scale = Vector3(0.994725, 1.0098, 0.994647)
25bones/9/rotation = Quaternion(0.0378692, 0.752178, -0.617115, 0.227956)
26bones/9/scale = Vector3(1.00603, 0.987842, 1.00603)
27bones/10/rotation = Quaternion(1.47681e-07, -0.131686, -2.31584e-09, 0.991291)
28bones/11/rotation = Quaternion(0.435829, -0.105332, 0.0511706, 0.892379)
29bones/11/scale = Vector3(0.999515, 0.989193, 1.01111)
30bones/12/rotation = Quaternion(9.7673e-07, 0.093011, -4.88864e-07, 0.995665)
31bones/13/rotation = Quaternion(-0.0674295, 0.0760829, -0.127591, 0.986603)
32bones/13/scale = Vector3(0.994769, 1.01003, 0.995293)
3333bones/15/rotation = Quaternion(0.152495, 0.0320204, -0.0648276, 0.985656)
3434bones/16/rotation = Quaternion(-0.00581883, 0.00169818, -0.00528004, 0.999968)
3535bones/17/rotation = Quaternion(0.00656525, -0.00667401, 0.0208093, 0.99974)
……@@ -46,16 +46,16 @@ bones/28/rotation = Quaternion(0.000326481, -0.00915114, 0.0211574, 0.999734)
4646bones/30/rotation = Quaternion(0.119319, -0.0143616, 0.0193321, 0.992564)
4747bones/31/rotation = Quaternion(-0.014934, 0.0107446, -0.0181569, 0.999666)
4848bones/32/rotation = Quaternion(0.0224839, -0.00492407, 0.00846133, 0.999699)
49bones/33/position = Vector3(-0.0210363, 0.138876, 0.096747)
49bones/33/position = Vector3(-0.0210362, 0.147149, 0.093002)
5050bones/33/rotation = Quaternion(-0.574533, 0.380402, 0.372139, 0.621867)
51bones/34/rotation = Quaternion(0.013987, 0.75324, -0.621938, -0.213607)
52bones/34/scale = Vector3(1.00438, 0.993717, 1.00438)
53bones/35/rotation = Quaternion(2.30571e-07, 0.112536, 6.4212e-07, 0.993648)
54bones/36/rotation = Quaternion(0.365253, 0.104518, -0.0408451, 0.92412)
55bones/36/scale = Vector3(0.999974, 0.992469, 1.00808)
56bones/37/rotation = Quaternion(-3.60379e-07, -0.0890528, -2.09748e-07, 0.996027)
57bones/38/rotation = Quaternion(-0.179731, -0.0898426, 0.262409, 0.943804)
58bones/38/scale = Vector3(0.997287, 1.00517, 0.99607)
51bones/34/rotation = Quaternion(0.17706, 0.761033, -0.598759, -0.175969)
52bones/34/scale = Vector3(1.00583, 0.987518, 1.00583)
53bones/35/rotation = Quaternion(2.3706e-07, 0.111779, 6.67528e-07, 0.993733)
54bones/36/rotation = Quaternion(0.33097, 0.110618, -0.0382599, 0.936354)
55bones/36/scale = Vector3(0.999974, 0.993608, 1.00668)
56bones/37/rotation = Quaternion(-3.67723e-07, -0.129096, -1.96943e-07, 0.991632)
57bones/38/rotation = Quaternion(-0.312549, -0.128175, 0.263714, 0.903515)
58bones/38/scale = Vector3(0.999366, 1.00228, 0.99818)
5959bones/40/rotation = Quaternion(0.152494, -0.0320192, 0.0648276, 0.985656)
6060bones/41/rotation = Quaternion(-0.00581815, -0.00169901, 0.00528053, 0.999968)
6161bones/42/rotation = Quaternion(0.00656406, 0.00667601, -0.0208095, 0.99974)
……@@ -71,28 +71,28 @@ bones/53/rotation = Quaternion(0.000341446, 0.00913473, -0.0211586, 0.999734)
7171bones/55/rotation = Quaternion(0.119319, 0.0143618, -0.0193322, 0.992564)
7272bones/56/rotation = Quaternion(-0.0149347, -0.0107439, 0.0181572, 0.999666)
7373bones/57/rotation = Quaternion(0.0224819, 0.00492589, -0.00846129, 0.999699)
74bones/58/position = Vector3(0.177163, -0.0860369, -0.0441121)
74bones/58/position = Vector3(0.177163, -0.0777645, -0.0478571)
7575bones/58/rotation = Quaternion(-3.44743e-07, 0.696936, 0.717133, 3.13916e-07)
76bones/59/position = Vector3(-0.177162, -0.0860369, -0.0441124)
76bones/59/position = Vector3(-0.177162, -0.0777647, -0.0478574)
7777bones/59/rotation = Quaternion(-3.44744e-07, 0.696936, 0.717133, 3.13916e-07)
78bones/60/position = Vector3(2.97545e-07, -0.133768, -0.297189)
78bones/60/position = Vector3(2.96894e-07, -0.125496, -0.300934)
7979bones/60/rotation = Quaternion(0.014281, -4.94438e-07, 7.06192e-09, 0.999898)
80bones/63/rotation = Quaternion(-0.00523926, -0.784474, 0.619559, -0.0268252)
81bones/63/scale = Vector3(1.01117, 0.975321, 1.01117)
82bones/64/rotation = Quaternion(1.98474e-08, -0.00877625, 5.51736e-09, 0.999961)
83bones/65/rotation = Quaternion(0.728941, -0.0120004, 0.0124615, 0.684357)
84bones/65/scale = Vector3(1.0019, 0.964, 1.0356)
85bones/66/rotation = Quaternion(1.30329e-08, -0.0204358, -9.02991e-08, 0.999791)
86bones/67/rotation = Quaternion(0.0979542, -0.019729, -0.041884, 0.994113)
87bones/67/scale = Vector3(0.986079, 1.02709, 0.987631)
88bones/69/rotation = Quaternion(0.0160165, -0.459682, 0.883662, 0.0870521)
89bones/69/scale = Vector3(1.01261, 0.975021, 1.01261)
90bones/70/rotation = Quaternion(7.69128e-10, 0.018437, -1.78052e-09, 0.99983)
91bones/71/rotation = Quaternion(0.682171, 0.019828, -0.0190324, 0.730676)
92bones/71/scale = Vector3(1.00085, 0.965509, 1.03486)
93bones/72/rotation = Quaternion(1.54556e-08, 0.00625633, -2.0455e-08, 0.99998)
94bones/73/rotation = Quaternion(-0.623361, 0.00998981, 0.111784, 0.773838)
95bones/73/scale = Vector3(0.987693, 0.988215, 1.02489)
80bones/63/rotation = Quaternion(-0.00491171, -0.270741, 0.96234, -0.0240307)
81bones/63/scale = Vector3(1.01011, 0.979703, 1.01011)
82bones/64/rotation = Quaternion(0, 0, 0, 1)
83bones/65/rotation = Quaternion(0.654761, -0.0023159, 0.00130474, 0.755831)
84bones/65/scale = Vector3(1.00064, 0.975657, 1.02443)
85bones/66/rotation = Quaternion(7.60946e-09, -0.00785986, -9.2484e-08, 0.999969)
86bones/67/rotation = Quaternion(-0.490816, -0.00802799, -0.0208928, 0.870976)
87bones/67/scale = Vector3(0.989172, 1.0075, 1.00381)
88bones/69/rotation = Quaternion(0.0180409, -0.655303, 0.748648, 0.0988852)
89bones/69/scale = Vector3(1.00941, 0.981803, 1.00942)
90bones/70/rotation = Quaternion(-2.85501e-08, 0.0238029, 8.39291e-09, 0.999717)
91bones/71/rotation = Quaternion(0.537967, 0.0235084, -0.015428, 0.842497)
92bones/71/scale = Vector3(1.00085, 0.975156, 1.02479)
93bones/72/rotation = Quaternion(2.0765e-08, 0.00716727, -2.8055e-08, 0.999974)
94bones/73/rotation = Quaternion(-0.226407, 0.00697197, 0.136835, 0.964348)
95bones/73/scale = Vector3(0.992152, 1.01371, 0.993898)
9696
9797[node name="Sound_Jump" parent="Model" index="2"]
9898transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0)
hypergodot/hyper_debugui/hyper_debugui.tscn +50 -43
……@@ -1,78 +1,85 @@
1[gd_scene load_steps=2 format=3 uid="uid://wlhlq38cvryl"]
1[gd_scene load_steps=4 format=3 uid="uid://wlhlq38cvryl"]
22
33[ext_resource type="Script" path="res://hypergodot/hyper_debugui/hyper_debugui.gd" id="1"]
44
5[sub_resource type="Theme" id="Theme_kgatt"]
6
7[sub_resource type="Theme" id="Theme_kj75o"]
8
59[node name="HyperDebugUI" type="Control"]
610anchor_right = 1.0
711anchor_bottom = 1.0
812mouse_filter = 2
913script = ExtResource( "1" )
1014
11[node name="HypercoreDebugPanel" type="Panel" parent="."]
12mouse_filter = 2
13
14[node name="HypercoreDebugContainer" type="GridContainer" parent="HypercoreDebugPanel"]
15offset_left = 1040.0
16offset_right = 1438.0
15[node name="HypercoreDebugContainer" type="GridContainer" parent="."]
16offset_left = 992.0
17offset_right = 1440.0
1718offset_bottom = 121.0
1819mouse_filter = 2
1920columns = 2
2021metadata/_edit_layout_mode = 0
2122metadata/_edit_use_custom_anchors = false
2223
23[node name="GatewayStartStopButton" type="Button" parent="HypercoreDebugPanel/HypercoreDebugContainer"]
24offset_right = 176.0
25offset_bottom = 31.0
24[node name="GatewayStartStopButton" type="Button" parent="HypercoreDebugContainer"]
25offset_right = 132.0
26offset_bottom = 23.0
2627focus_mode = 0
28theme = SubResource( "Theme_kgatt" )
2729text = "Start Gateway"
2830
29[node name="GatewayStatus_Value" type="Label" parent="HypercoreDebugPanel/HypercoreDebugContainer"]
30offset_left = 180.0
31[node name="GatewayStatus_Value" type="Label" parent="HypercoreDebugContainer"]
32minimum_size = Vector2(260, 0)
33offset_left = 135.0
3134offset_top = 2.0
32offset_right = 277.0
33offset_bottom = 28.0
35offset_right = 395.0
36offset_bottom = 21.0
3437text = "Not Running"
3538
36[node name="GossipURL" type="Label" parent="HypercoreDebugPanel/HypercoreDebugContainer"]
37offset_top = 35.0
38offset_right = 176.0
39offset_bottom = 61.0
39[node name="GossipURL" type="Label" parent="HypercoreDebugContainer"]
40offset_top = 26.0
41offset_right = 132.0
42offset_bottom = 45.0
4043text = "Gossip URL :"
4144
42[node name="GossipURL_Value" type="Label" parent="HypercoreDebugPanel/HypercoreDebugContainer"]
43offset_left = 180.0
44offset_top = 35.0
45offset_right = 277.0
46offset_bottom = 61.0
45[node name="GossipURL_Value" type="Label" parent="HypercoreDebugContainer"]
46offset_left = 135.0
47offset_top = 26.0
48offset_right = 395.0
49offset_bottom = 45.0
4750text = "N/A"
4851
49[node name="GossipUpdateRate" type="Label" parent="HypercoreDebugPanel/HypercoreDebugContainer"]
50offset_top = 65.0
51offset_right = 176.0
52offset_bottom = 91.0
52[node name="GossipUpdateRate" type="Label" parent="HypercoreDebugContainer"]
53offset_top = 48.0
54offset_right = 132.0
55offset_bottom = 67.0
5356text = "Snapshot 1.0 Seconds :"
5457
55[node name="GossipUpdateRate_Value" type="HSlider" parent="HypercoreDebugPanel/HypercoreDebugContainer"]
56offset_left = 180.0
57offset_top = 65.0
58offset_right = 277.0
59offset_bottom = 81.0
58[node name="GossipUpdateRate_Value" type="HSlider" parent="HypercoreDebugContainer"]
59offset_left = 135.0
60offset_top = 48.0
61offset_right = 395.0
62offset_bottom = 60.0
6063max_value = 10.0
6164step = 0.25
6265value = 1.0
6366
64[node name="GossipIDList" type="Label" parent="HypercoreDebugPanel/HypercoreDebugContainer"]
65offset_top = 95.0
66offset_right = 176.0
67offset_bottom = 121.0
67[node name="GossipIDList" type="Label" parent="HypercoreDebugContainer"]
68offset_top = 70.0
69offset_right = 132.0
70offset_bottom = 89.0
6871text = "Gossip ID List :"
6972
70[node name="GossipIDList_Value" type="ItemList" parent="HypercoreDebugPanel/HypercoreDebugContainer"]
71offset_left = 180.0
72offset_top = 95.0
73offset_right = 277.0
74offset_bottom = 121.0
73[node name="GossipIDList_Value" type="ItemList" parent="HypercoreDebugContainer"]
74offset_left = 135.0
75offset_top = 70.0
76offset_right = 395.0
77offset_bottom = 89.0
78theme = SubResource( "Theme_kj75o" )
7579auto_height = true
7680
77[connection signal="button_up" from="HypercoreDebugPanel/HypercoreDebugContainer/GatewayStartStopButton" to="." method="_on_GatewayStartStopButton_button_up"]
78[connection signal="value_changed" from="HypercoreDebugPanel/HypercoreDebugContainer/GossipUpdateRate_Value" to="." method="_on_GossipUpdateRate_Value_value_changed"]
81[node name="HypercoreDebugPanel" type="Panel" parent="."]
82mouse_filter = 2
83
84[connection signal="button_up" from="HypercoreDebugContainer/GatewayStartStopButton" to="." method="_on_GatewayStartStopButton_button_up"]
85[connection signal="value_changed" from="HypercoreDebugContainer/GossipUpdateRate_Value" to="." method="_on_GossipUpdateRate_Value_value_changed"]
main.gd +1 -1
……@@ -2,7 +2,7 @@ extends Node
22
33@onready var map_test_environment = preload("res://game/maps/map_test/map_test.tscn")
44@onready var map_cyber_environment = preload("res://game/maps/map_cyber/map_cyber.tscn")
5# @onready var map_cyber1_environment = preload("res://assets/maps/map_cyber1/map_cyber1_environment.scn")
5@onready var map_cyber1_environment = preload("res://game/maps/map_cyber1/map_cyber1.tscn")
66
77func _ready():
88 pass
main.tscn +3 -1
……@@ -1,6 +1,7 @@
1[gd_scene load_steps=9 format=3 uid="uid://bktxghmjd4nc"]
1[gd_scene load_steps=10 format=3 uid="uid://bktxghmjd4nc"]
22
33[ext_resource type="PackedScene" uid="uid://njxw8k8p0stp" path="res://game/maps/map_test/map_test.tscn" id="1_0op02"]
4[ext_resource type="Script" path="res://main.gd" id="1_ommes"]
45[ext_resource type="PackedScene" uid="uid://bnmqs28j8wtp1" path="res://game/maps/map_cyber/map_cyber.tscn" id="2_7tyrq"]
56[ext_resource type="PackedScene" uid="uid://ds36d5iqtsvuh" path="res://game/player/player_core_local.tscn" id="2_yvl7a"]
67[ext_resource type="Script" path="res://hypergodot/hyper_gossip/hyper_gossip.gd" id="3_g8xkj"]
……@@ -10,6 +11,7 @@
1011[ext_resource type="PackedScene" uid="uid://wlhlq38cvryl" path="res://hypergodot/hyper_debugui/hyper_debugui.tscn" id="5_7ejif"]
1112
1213[node name="Main" type="Node"]
14script = ExtResource( "1_ommes" )
1315
1416[node name="Maps" type="Node3D" parent="."]
1517