OverviewFilesCommitsIssuesDocsReleasesPeers

hyper-tps_demo commits / a7fc622

moving levels around
a7fc622e107bc73cec301d93bd9e53d04da5d557
by plankatron <fleeky@gmail.com> · 2022-04-12T19:33:48.000Z

Changed files (8) +17 -13

assets/maps/maps_cyber/level1.scn +0 -0
(no content changes — binary or rename)
game/maps/map_cyber/map_cyber.tscn +4 -4
……@@ -159,7 +159,7 @@ transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 9.48052, 2.93851, 0 )
159159extents = Vector3( 32.8769, 21.6203, 74.8076 )
160160data = SubResource( 1 )
161161
162[node name="PlayerSpawnNodes" type="Node" parent="."]
162[node name="PlayerSpawnNodes" type="Spatial" parent="."]
163163
164164[node name="Spawnpad2" parent="PlayerSpawnNodes" instance=ExtResource( 3 )]
165165transform = Transform( 0.25, 0, 0, 0, 0.25, 0, 0, 0, 0.25, -7.68755, 0.108327, 0 )
……@@ -173,7 +173,7 @@ transform = Transform( 0.5, 0, 0, 0, 0.5, 0, 0, 0, 0.5, 15.6924, -12.4585, 11.85
173173[node name="AudioStreamPlayer" type="AudioStreamPlayer" parent="."]
174174stream = ExtResource( 1 )
175175
176[node name="PlayerTeleportNodes" type="Node" parent="."]
176[node name="PlayerTeleportNodes" type="Spatial" parent="."]
177177
178178[node name="teleporter" parent="PlayerTeleportNodes" instance=ExtResource( 5 )]
179179transform = Transform( -4.37114e-08, 0, 1, 0, 1, 0, -1, 0, -4.37114e-08, 16.0305, -1.21045, 38.7919 )
……@@ -206,7 +206,7 @@ moon_color = Color( 1, 1, 1, 1 )
206206moon_size = 0.5
207207enable_set_moon_texture = false
208208moon_resolution = 2
209moon_light_path = NodePath("../MoonLight")
209moon_light_path = NodePath("MoonLight")
210210moon_light_color = Color( 0.572549, 0.776471, 0.956863, 1 )
211211moon_light_energy = 0.5
212212deep_space_euler = Vector3( -0.752, 2.56, 0 )
……@@ -300,7 +300,7 @@ extra_cull_margin = 16384.0
300300mesh = SubResource( 9 )
301301material/0 = null
302302
303[node name="MoonLight" type="DirectionalLight" parent="WorldEnvironment"]
303[node name="MoonLight" type="DirectionalLight" parent="WorldEnvironment/Skydome"]
304304transform = Transform( 0, -0.713361, -0.700797, 0.444247, -0.627847, 0.639103, -0.895904, -0.311327, 0.316909, -0.700797, 0.639103, 0.316909 )
305305light_color = Color( 0.572549, 0.776471, 0.956863, 1 )
306306light_energy = 0.2907
game/maps/map_cyber1/map_cyber1.scn +0 -0
(no content changes — binary or rename)
game/maps/map_test/map_test.tscn +6 -6
……@@ -47,7 +47,10 @@ script = ExtResource( 2 )
4747
4848[node name="asset_map_test" parent="." instance=ExtResource( 1 )]
4949
50[node name="DirectionalLight" type="DirectionalLight" parent="."]
50[node name="WorldEnvironment" type="WorldEnvironment" parent="."]
51environment = SubResource( 9 )
52
53[node name="DirectionalLight" type="DirectionalLight" parent="WorldEnvironment"]
5154transform = Transform( -0.829081, 0.311429, -0.464368, -0.0172758, 0.815855, 0.577998, 0.558862, 0.487229, -0.67103, 0, 23.9287, 0 )
5255light_color = Color( 0.0117647, 0.8, 0.929412, 1 )
5356light_energy = 1.843
……@@ -56,15 +59,12 @@ light_specular = 1.173
5659shadow_enabled = true
5760directional_shadow_depth_range = 1
5861
59[node name="WorldEnvironment" type="WorldEnvironment" parent="."]
60environment = SubResource( 9 )
61
62[node name="Teleporters" type="Node" parent="."]
62[node name="Teleporters" type="Spatial" parent="."]
6363
6464[node name="Teleporter_1" parent="Teleporters" instance=ExtResource( 4 )]
6565transform = Transform( 0.655427, 0, -0.755259, 0, 1, 0, 0.755259, 0, 0.655427, -15.0371, -3.75616, -37.6492 )
6666
67[node name="PlayerSpawnNodes" type="Node" parent="."]
67[node name="PlayerSpawnNodes" type="Spatial" parent="."]
6868
6969[node name="Spawnpad_1" parent="PlayerSpawnNodes" instance=ExtResource( 3 )]
7070transform = Transform( 0.5, 0, 0, 0, 0.5, 0, 0, 0, 0.5, 0.673, 2.446, -3.56 )
game/player/player_core_local.tscn +2 -1
……@@ -37,11 +37,12 @@ enabled = true
3737cast_to = Vector3( 0, 0, -400 )
3838collision_mask = 2
3939debug_shape_custom_color = Color( 1, 0, 0, 1 )
40debug_shape_thickness = 5
40debug_shape_thickness = 5.0
4141
4242[node name="ClippedCamera" type="ClippedCamera" parent="CameraHead/CameraPivot" index="1"]
4343transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 2.5 )
4444fov = 90.0
45far = 1000.0
4546
4647[node name="PlayerDebugUI" parent="." index="7" instance=ExtResource( 5 )]
4748
game/player/player_local_core.tres +1 -1
……@@ -187,4 +187,4 @@ nodes/walk_scale/node = SubResource( 23 )
187187nodes/walk_scale/position = Vector2( -640, 360 )
188188nodes/wall_run/node = SubResource( 50 )
189189nodes/wall_run/position = Vector2( 720, -60 )
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 7", "walk_scale", 0, "Animation 3", "run_scale", 0, "Animation 4", "aim_transition", 0, "TimeScale 3", "aim_transition", 1, "iwr_blend", "jump_scale", 0, "jump", "air_blend", 0, "jump_scale", "air_blend", 1, "falling_scale", "air_blend", 2, "landing_scale", "roll_scale", 0, "Animation", "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", "Blend2 2", 0, "Animation 11", "Blend2 2", 1, "Animation 10", "TimeScale 3", 0, "strafe", "falling_scale", 0, "Animation 6", "Blend2", 0, "Animation 8", "Blend2", 1, "Animation 9" ]
190node_connections = [ "output", 0, "wall_run", "Blend2", 0, "Animation 8", "Blend2", 1, "Animation 9", "Blend2 2", 0, "Animation 11", "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 6", "iwr_blend", 0, "Animation 2", "iwr_blend", 1, "walk_scale", "iwr_blend", 2, "run_scale", "jump_scale", 0, "jump", "landing_scale", 0, "Animation 7", "roll", 0, "air_transition", "roll", 1, "roll_scale", "roll_scale", 0, "Animation", "run_scale", 0, "Animation 4", "walk_scale", 0, "Animation 3", "wall_run", 0, "Blend2", "wall_run", 1, "Blend2 2", "wall_run", 2, "roll" ]
main.tscn +3 -0
……@@ -16,10 +16,13 @@ script = ExtResource( 7 )
1616[node name="Maps" type="Node" parent="."]
1717
1818[node name="map_test" parent="Maps" instance=ExtResource( 1 )]
19transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 82.6497, 0, 204.33 )
1920
2021[node name="map_cyber" parent="Maps" instance=ExtResource( 9 )]
22transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 132.051, 0, -243 )
2123
2224[node name="map_cyber1" parent="Maps" instance=ExtResource( 8 )]
25transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 357.971, 3.8147e-06, 43.2013 )
2326
2427[node name="Players" type="Node" parent="."]
2528
project.godot +1 -1
……@@ -115,7 +115,7 @@ window/size/height=810
115115
116116[editor_plugins]
117117
118enabled=PoolStringArray( )
118enabled=PoolStringArray( "res://addons/jc.godot.time-of-day/plugin.cfg" )
119119
120120[input]
121121