OverviewFilesCommitsIssuesDocsReleasesPeers

hyper-tps_demo commits / eaca4c1

buggo fixo!
eaca4c131461a0fe40f4f97553f6e4a8a25ba6b8
by Dresk Spidflisk <dreskspidflisk@gmail.com> · 2022-04-14T01:08:26.000Z

Changed files (4) +20 -19

game/map_decorations/teleporter.gd +1 -1
……@@ -1,6 +1,6 @@
11extends Spatial
22
3export var teleportation_destination : String = "map_test"
3export var teleportation_destination : String = ""
44
55onready var mapsNode : Node = get_tree().get_current_scene().get_node("Maps")
66
game/maps/map_cyber/map_cyber.tscn +19 -17
……@@ -4,7 +4,7 @@
44[ext_resource path="res://assets/maps/maps_cyber/level0.scn" type="PackedScene" id=2]
55[ext_resource path="res://game/map_decorations/spawnpad.tscn" type="PackedScene" id=3]
66[ext_resource path="res://game/maps/map_core.gd" type="Script" id=4]
7[ext_resource path="res://assets/models/teleporter/teleporter.tscn" type="PackedScene" id=5]
7[ext_resource path="res://game/map_decorations/teleport.scn" type="PackedScene" id=5]
88[ext_resource path="res://addons/jc.godot.time-of-day/Code/Sky/Skydome.gd" type="Script" id=6]
99[ext_resource path="res://addons/jc.godot.time-of-day-common/Scenes/Moon/MoonRender.tscn" type="PackedScene" id=7]
1010[ext_resource path="res://addons/jc.godot.time-of-day-common/Shaders/Sky.shader" type="Shader" id=8]
……@@ -36,9 +36,9 @@ glow_intensity = 4.65
3636glow_strength = 0.91
3737glow_bicubic_upscale = true
3838
39[sub_resource type="ViewportTexture" id=3]
39[sub_resource type="ViewportTexture" id=11]
4040
41[sub_resource type="ShaderMaterial" id=4]
41[sub_resource type="ShaderMaterial" id=12]
4242render_priority = -128
4343shader = ExtResource( 8 )
4444shader_param/_color_correction_params = Vector2( 0.079, 1.602 )
……@@ -81,17 +81,17 @@ shader_param/_clouds_size = 2.0
8181shader_param/_clouds_uv = Vector2( 0.16, 0.11 )
8282shader_param/_clouds_offset_speed = 0.01
8383shader_param/_clouds_offset = Vector2( 0.21, 0.175 )
84shader_param/_moon_texture = SubResource( 3 )
84shader_param/_moon_texture = SubResource( 11 )
8585shader_param/_background_texture = ExtResource( 12 )
8686shader_param/_stars_field_texture = ExtResource( 13 )
8787shader_param/_noise_tex = ExtResource( 14 )
8888shader_param/_clouds_texture = ExtResource( 9 )
8989
90[sub_resource type="SphereMesh" id=5]
90[sub_resource type="SphereMesh" id=13]
9191radial_segments = 16
9292rings = 8
9393
94[sub_resource type="ShaderMaterial" id=6]
94[sub_resource type="ShaderMaterial" id=14]
9595render_priority = 123
9696shader = ExtResource( 10 )
9797shader_param/_color_correction_params = Vector2( 0.079, 1.602 )
……@@ -119,10 +119,10 @@ shader_param/_atm_moon_partial_mie_phase = Vector3( 0.345519, 1.65448, 1.618 )
119119shader_param/_atm_moon_mie_tint = Color( 0.137255, 0.184314, 0.292196, 1 )
120120shader_param/_atm_moon_mie_intensity = 0.636799
121121
122[sub_resource type="QuadMesh" id=7]
122[sub_resource type="QuadMesh" id=15]
123123size = Vector2( 2, 2 )
124124
125[sub_resource type="ShaderMaterial" id=8]
125[sub_resource type="ShaderMaterial" id=16]
126126render_priority = -127
127127shader = ExtResource( 11 )
128128shader_param/_sun_direction = Vector3( -0.395595, -0.918425, 7.55825e-05 )
……@@ -145,7 +145,7 @@ shader_param/_atm_sun_mie_tint = Color( 1, 1, 1, 1 )
145145shader_param/_atm_moon_mie_tint = Color( 0.137255, 0.184314, 0.292196, 1 )
146146shader_param/_clouds_texture = ExtResource( 15 )
147147
148[sub_resource type="SphereMesh" id=9]
148[sub_resource type="SphereMesh" id=17]
149149radial_segments = 8
150150rings = 8
151151
……@@ -153,6 +153,7 @@ rings = 8
153153
154154[node name="map_cyber" type="Spatial"]
155155script = ExtResource( 4 )
156map_name = "map_cyber"
156157
157158[node name="GIProbe" type="GIProbe" parent="."]
158159transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 9.48052, 2.93851, 0 )
……@@ -177,8 +178,9 @@ stream = ExtResource( 1 )
177178
178179[node name="PlayerTeleportNodes" type="Spatial" parent="."]
179180
180[node name="teleporter" parent="PlayerTeleportNodes" instance=ExtResource( 5 )]
181transform = Transform( -4.37114e-08, 0, 1, 0, 1, 0, -1, 0, -4.37114e-08, 16.0305, -1.21045, 38.7919 )
181[node name="Teleporter" parent="PlayerTeleportNodes" instance=ExtResource( 5 )]
182transform = Transform( -4.37114e-08, 0, 1, 0, 1, 0, -1, 0, -4.37114e-08, 16.031, -1.21, 38.792 )
183teleportation_destination = "map_test"
182184
183185[node name="WorldEnvironment" type="WorldEnvironment" parent="."]
184186environment = SubResource( 2 )
……@@ -276,10 +278,10 @@ enviro = null
276278[node name="_SkyMeshI" type="MeshInstance" parent="WorldEnvironment/Skydome"]
277279transform = Transform( 10, 0, 0, 0, 10, 0, 0, 0, 10, 1e-07, 1e-07, 1e-07 )
278280layers = 4
279material_override = SubResource( 4 )
281material_override = SubResource( 12 )
280282cast_shadow = 0
281283extra_cull_margin = 16384.0
282mesh = SubResource( 5 )
284mesh = SubResource( 13 )
283285material/0 = null
284286
285287[node name="MoonRender" parent="WorldEnvironment/Skydome" instance=ExtResource( 7 )]
……@@ -287,19 +289,19 @@ size = Vector2( 256, 256 )
287289
288290[node name="_FogMeshI" type="MeshInstance" parent="WorldEnvironment/Skydome"]
289291layers = 524288
290material_override = SubResource( 6 )
292material_override = SubResource( 14 )
291293cast_shadow = 0
292294extra_cull_margin = 16384.0
293mesh = SubResource( 7 )
295mesh = SubResource( 15 )
294296material/0 = null
295297
296298[node name="_CloudsCumulusI" type="MeshInstance" parent="WorldEnvironment/Skydome"]
297299transform = Transform( 10, 0, 0, 0, 10, 0, 0, 0, 10, 1e-07, 1e-07, 1e-07 )
298300layers = 4
299material_override = SubResource( 8 )
301material_override = SubResource( 16 )
300302cast_shadow = 0
301303extra_cull_margin = 16384.0
302mesh = SubResource( 9 )
304mesh = SubResource( 17 )
303305material/0 = null
304306
305307[node name="MoonLight" type="DirectionalLight" parent="WorldEnvironment/Skydome"]
game/maps/map_cyber1/map_cyber1.scn +0 -0
(no content changes — binary or rename)
main.tscn +0 -1
……@@ -27,7 +27,6 @@ map_name = "map_cyber"
2727
2828[node name="map_cyber1" parent="Maps" instance=ExtResource( 8 )]
2929transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 357.971, 3.8147e-06, 43.2013 )
30map_name = "map_cyber1"
3130
3231[node name="Players" type="Node" parent="."]
3332