OverviewFilesCommitsIssuesDocsReleasesPeers

hyper-godot4-test commits / 81a5f4a

more change
81a5f4aa424a2907e2b7d2011420340f122a3e46
by plankatron <fleeky@gmail.com> · 2022-04-29T02:40:44.000Z

Changed files (14) +12 -5

assets/maps/map_cyber/blue-emit.material +0 -0
(no content changes — binary or rename)
assets/maps/map_cyber/blue-emit_004.material +0 -0
(no content changes — binary or rename)
assets/maps/map_cyber/concrete.material +0 -0
(no content changes — binary or rename)
assets/maps/map_cyber/emit-warm-white.material +0 -0
(no content changes — binary or rename)
assets/maps/map_cyber/emit-warm-white_002.material +0 -0
(no content changes — binary or rename)
assets/maps/map_cyber/level1.scn +0 -0
(no content changes — binary or rename)
assets/maps/map_cyber/map_cyber_environment.res +0 -0
(no content changes — binary or rename)
assets/models/gumble/gumble.glb +0 -0
(no content changes — binary or rename)
assets/models/spawnpad/blue-emit.material +0 -0
(no content changes — binary or rename)
assets/models/spawnpad/model_spawnpad.tscn +3 -0
……@@ -3,3 +3,6 @@
33[ext_resource type="PackedScene" uid="uid://doimmmievqnhq" path="res://assets/models/spawnpad/spawnpad.glb" id="1"]
44
55[node name="spawnpad" instance=ExtResource( "1" )]
6
7[node name="spawn_pad" parent="." index="0"]
8gi_mode = 1
assets/models/teleporter/emit.material +0 -0
(no content changes — binary or rename)
assets/models/teleporter/teleporter.tscn +5 -1
……@@ -1,5 +1,9 @@
1[gd_scene load_steps=2 format=3 uid="uid://bhfkx36b5wtfr"]
1[gd_scene load_steps=3 format=3 uid="uid://bhfkx36b5wtfr"]
22
33[ext_resource type="PackedScene" uid="uid://dtw7lqjis6b1" path="res://assets/models/teleporter/teleporter.glb" id="1"]
4[ext_resource type="Material" uid="uid://bxhbikwdj6eg5" path="res://assets/models/teleporter/emit.material" id="2_okkur"]
45
56[node name="teleporter" instance=ExtResource( "1" )]
7
8[node name="Cube001_RPanel_RScatter_RScatter" parent="." index="0"]
9material_override = ExtResource( "2_okkur" )
game/maps/map_cyber/map_cyber.tscn +2 -2
……@@ -1,6 +1,6 @@
11[gd_scene load_steps=7 format=3 uid="uid://bnmqs28j8wtp1"]
22
3[ext_resource type="PackedScene" path="res://assets/maps/map_cyber/level0.scn" id="2"]
3[ext_resource type="PackedScene" uid="uid://denmfe20xh0b4" path="res://assets/maps/map_cyber/level0.scn" id="2"]
44[ext_resource type="PackedScene" uid="uid://cexotumax31qe" path="res://game/map_decorations/spawnpad.tscn" id="3"]
55[ext_resource type="Script" path="res://game/maps/map_core.gd" id="4"]
66[ext_resource type="PackedScene" uid="uid://csegj0tubaqd1" path="res://game/map_decorations/teleport.scn" id="5"]
……@@ -16,7 +16,7 @@ map_name = "map_cyber"
1616[node name="WorldEnvironment" parent="." instance=ExtResource( "6" )]
1717
1818[node name="DirectionalLight3D" parent="WorldEnvironment" index="1"]
19transform = Transform3D(0.938514, -0.30723, -0.157483, -0.0810201, -0.639414, 0.764582, -0.3356, -0.704811, -0.624991, 0, 0, 0)
19transform = Transform3D(0.341722, -0.755064, -0.559558, -0.0734949, -0.615047, 0.785058, -0.936923, -0.227146, -0.265668, 0, 0, 0)
2020
2121[node name="asset_map_cyber" parent="." instance=ExtResource( "2" )]
2222
game/player/player_animation_tree.tres +2 -2
……@@ -131,7 +131,7 @@ input_2/name = "not_wall"
131131input_2/auto_advance = false
132132
133133[resource]
134graph_offset = Vector2(-1318.04, 44.3913)
134graph_offset = Vector2(-570.423, 314.672)
135135nodes/Animation/node = SubResource( "AnimationNodeAnimation_b1wkn" )
136136nodes/Animation/position = Vector2(-280, 360)
137137"nodes/Animation 10/node" = SubResource( "AnimationNodeAnimation_iueri" )
……@@ -187,4 +187,4 @@ nodes/walk_scale/node = SubResource( "AnimationNodeTimeScale_ox5by" )
187187nodes/walk_scale/position = Vector2(-640, 360)
188188nodes/wall_run/node = SubResource( "AnimationNodeTransition_1e0x1" )
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", &"falling_scale", 0, &"Animation 7", &"walk_scale", 0, &"Animation 4", &"jump_scale", 0, &"Animation 6", &"air_transition", 0, &"air_blend", &"air_transition", 1, &"aim_transition", &"air_blend", 0, &"jump_scale", &"air_blend", 1, &"falling_scale", &"air_blend", 2, &"landing_scale", &"iwr_blend", 0, &"Animation 2", &"iwr_blend", 1, &"walk_scale", &"iwr_blend", 2, &"run_scale", &"aim_transition", 0, &"TimeScale 3", &"aim_transition", 1, &"iwr_blend", &"roll_scale", 0, &"Animation", &"TimeScale 3", 0, &"strafe", &"landing_scale", 0, &"Animation 3", &"run_scale", 0, &"Animation 5", &"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", &"jump_scale", 0, &"Animation 6", &"Blend2 2", 0, &"Animation 12", &"Blend2 2", 1, &"Animation 10", &"TimeScale 3", 0, &"strafe", &"air_transition", 0, &"air_blend", &"air_transition", 1, &"aim_transition", &"wall_run", 0, &"Blend2", &"wall_run", 1, &"Blend2 2", &"wall_run", 2, &"roll", &"iwr_blend", 0, &"Animation 2", &"iwr_blend", 1, &"walk_scale", &"iwr_blend", 2, &"run_scale", &"falling_scale", 0, &"Animation 7", &"run_scale", 0, &"Animation 5", &"roll_scale", 0, &"Animation", &"walk_scale", 0, &"Animation 4", &"landing_scale", 0, &"Animation 3", &"air_blend", 0, &"jump_scale", &"air_blend", 1, &"falling_scale", &"air_blend", 2, &"landing_scale", &"Blend2", 0, &"Animation 8", &"Blend2", 1, &"Animation 9", &"aim_transition", 0, &"TimeScale 3", &"aim_transition", 1, &"iwr_blend"]