Made things much less shiny. Finally fixed the tutorial reset bug.
All checks were successful
godot-ci export / Export Projects (push) Successful in 7m11s
All checks were successful
godot-ci export / Export Projects (push) Successful in 7m11s
This commit is contained in:
parent
dd0a92ac92
commit
c55748b048
6 changed files with 2523 additions and 46 deletions
|
@ -113,7 +113,7 @@ custom_features=""
|
||||||
export_filter="all_resources"
|
export_filter="all_resources"
|
||||||
include_filter=""
|
include_filter=""
|
||||||
exclude_filter=""
|
exclude_filter=""
|
||||||
export_path="export/Linux/teddy.x86_64"
|
export_path="export/linux/teddy.x86_64"
|
||||||
encryption_include_filters=""
|
encryption_include_filters=""
|
||||||
encryption_exclude_filters=""
|
encryption_exclude_filters=""
|
||||||
encrypt_pck=false
|
encrypt_pck=false
|
||||||
|
@ -279,6 +279,7 @@ permissions/mount_format_filesystems=false
|
||||||
permissions/mount_unmount_filesystems=false
|
permissions/mount_unmount_filesystems=false
|
||||||
permissions/nfc=false
|
permissions/nfc=false
|
||||||
permissions/persistent_activity=false
|
permissions/persistent_activity=false
|
||||||
|
permissions/post_notifications=false
|
||||||
permissions/process_outgoing_calls=false
|
permissions/process_outgoing_calls=false
|
||||||
permissions/read_calendar=false
|
permissions/read_calendar=false
|
||||||
permissions/read_call_log=false
|
permissions/read_call_log=false
|
||||||
|
|
|
@ -164,11 +164,12 @@ size = Vector2(1000, 1000)
|
||||||
subdivide_width = 200
|
subdivide_width = 200
|
||||||
subdivide_depth = 200
|
subdivide_depth = 200
|
||||||
|
|
||||||
[sub_resource type="StandardMaterial3D" id="StandardMaterial3D_yt0t4"]
|
[sub_resource type="StandardMaterial3D" id="StandardMaterial3D_n36og"]
|
||||||
resource_name = "WoodenWall"
|
resource_name = "WoodenWall"
|
||||||
cull_mode = 2
|
cull_mode = 2
|
||||||
vertex_color_use_as_albedo = true
|
vertex_color_use_as_albedo = true
|
||||||
albedo_texture = ExtResource("13_8jgdi")
|
albedo_texture = ExtResource("13_8jgdi")
|
||||||
|
metallic_specular = 0.0
|
||||||
roughness = 0.5
|
roughness = 0.5
|
||||||
|
|
||||||
[sub_resource type="ArrayMesh" id="ArrayMesh_17rvs"]
|
[sub_resource type="ArrayMesh" id="ArrayMesh_17rvs"]
|
||||||
|
@ -195,7 +196,7 @@ _surfaces = [{
|
||||||
"index_count": 378,
|
"index_count": 378,
|
||||||
"index_data": PackedByteArray(0, 0, 7, 0, 4, 0, 0, 0, 3, 0, 7, 0, 4, 0, 11, 0, 8, 0, 4, 0, 7, 0, 11, 0, 8, 0, 15, 0, 12, 0, 8, 0, 11, 0, 15, 0, 12, 0, 20, 0, 16, 0, 12, 0, 15, 0, 20, 0, 18, 0, 25, 0, 23, 0, 18, 0, 21, 0, 25, 0, 23, 0, 29, 0, 27, 0, 23, 0, 25, 0, 29, 0, 30, 0, 33, 0, 32, 0, 30, 0, 31, 0, 33, 0, 34, 0, 41, 0, 38, 0, 34, 0, 36, 0, 41, 0, 38, 0, 46, 0, 44, 0, 38, 0, 41, 0, 46, 0, 44, 0, 50, 0, 48, 0, 44, 0, 46, 0, 50, 0, 48, 0, 54, 0, 52, 0, 48, 0, 50, 0, 54, 0, 52, 0, 59, 0, 56, 0, 52, 0, 54, 0, 59, 0, 57, 0, 65, 0, 62, 0, 57, 0, 61, 0, 65, 0, 62, 0, 69, 0, 66, 0, 62, 0, 65, 0, 69, 0, 66, 0, 73, 0, 70, 0, 66, 0, 69, 0, 73, 0, 70, 0, 3, 0, 0, 0, 70, 0, 73, 0, 3, 0, 74, 0, 78, 0, 80, 0, 74, 0, 76, 0, 78, 0, 76, 0, 84, 0, 78, 0, 76, 0, 82, 0, 84, 0, 82, 0, 88, 0, 84, 0, 82, 0, 86, 0, 88, 0, 86, 0, 93, 0, 88, 0, 86, 0, 90, 0, 93, 0, 91, 0, 99, 0, 95, 0, 91, 0, 96, 0, 99, 0, 96, 0, 104, 0, 99, 0, 96, 0, 100, 0, 104, 0, 111, 0, 117, 0, 108, 0, 111, 0, 113, 0, 117, 0, 113, 0, 121, 0, 117, 0, 113, 0, 118, 0, 121, 0, 118, 0, 125, 0, 121, 0, 118, 0, 122, 0, 125, 0, 122, 0, 129, 0, 125, 0, 122, 0, 126, 0, 129, 0, 126, 0, 135, 0, 129, 0, 126, 0, 131, 0, 135, 0, 130, 0, 138, 0, 133, 0, 130, 0, 136, 0, 138, 0, 136, 0, 142, 0, 138, 0, 136, 0, 140, 0, 142, 0, 140, 0, 146, 0, 142, 0, 140, 0, 144, 0, 146, 0, 144, 0, 80, 0, 146, 0, 144, 0, 74, 0, 80, 0, 60, 0, 139, 0, 64, 0, 60, 0, 134, 0, 139, 0, 45, 0, 114, 0, 40, 0, 45, 0, 119, 0, 114, 0, 17, 0, 87, 0, 13, 0, 17, 0, 92, 0, 87, 0, 42, 0, 120, 0, 47, 0, 42, 0, 115, 0, 120, 0, 67, 0, 137, 0, 63, 0, 67, 0, 141, 0, 137, 0, 14, 0, 94, 0, 19, 0, 14, 0, 89, 0, 94, 0, 64, 0, 143, 0, 68, 0, 64, 0, 139, 0, 143, 0, 49, 0, 119, 0, 45, 0, 49, 0, 123, 0, 119, 0, 22, 0, 92, 0, 17, 0, 22, 0, 97, 0, 92, 0, 47, 0, 124, 0, 51, 0, 47, 0, 120, 0, 124, 0, 5, 0, 75, 0, 1, 0, 5, 0, 77, 0, 75, 0, 71, 0, 141, 0, 67, 0, 71, 0, 145, 0, 141, 0, 19, 0, 98, 0, 24, 0, 19, 0, 94, 0, 98, 0, 2, 0, 79, 0, 6, 0, 2, 0, 81, 0, 79, 0, 68, 0, 147, 0, 72, 0, 68, 0, 143, 0, 147, 0, 53, 0, 123, 0, 49, 0, 53, 0, 127, 0, 123, 0, 26, 0, 97, 0, 22, 0, 26, 0, 101, 0, 97, 0, 51, 0, 128, 0, 55, 0, 51, 0, 124, 0, 128, 0, 1, 0, 145, 0, 71, 0, 1, 0, 75, 0, 145, 0, 24, 0, 103, 0, 28, 0, 24, 0, 98, 0, 103, 0, 9, 0, 77, 0, 5, 0, 9, 0, 83, 0, 77, 0, 72, 0, 81, 0, 2, 0, 72, 0, 147, 0, 81, 0, 29, 0, 102, 0, 27, 0, 29, 0, 105, 0, 102, 0, 58, 0, 127, 0, 53, 0, 58, 0, 132, 0, 127, 0, 6, 0, 85, 0, 10, 0, 6, 0, 79, 0, 85, 0, 34, 0, 106, 0, 36, 0, 34, 0, 109, 0, 106, 0, 55, 0, 134, 0, 60, 0, 55, 0, 128, 0, 134, 0, 39, 0, 110, 0, 35, 0, 39, 0, 112, 0, 110, 0, 13, 0, 83, 0, 9, 0, 13, 0, 87, 0, 83, 0, 37, 0, 116, 0, 43, 0, 37, 0, 107, 0, 116, 0, 63, 0, 132, 0, 58, 0, 63, 0, 137, 0, 132, 0, 10, 0, 89, 0, 14, 0, 10, 0, 85, 0, 89, 0),
|
"index_data": PackedByteArray(0, 0, 7, 0, 4, 0, 0, 0, 3, 0, 7, 0, 4, 0, 11, 0, 8, 0, 4, 0, 7, 0, 11, 0, 8, 0, 15, 0, 12, 0, 8, 0, 11, 0, 15, 0, 12, 0, 20, 0, 16, 0, 12, 0, 15, 0, 20, 0, 18, 0, 25, 0, 23, 0, 18, 0, 21, 0, 25, 0, 23, 0, 29, 0, 27, 0, 23, 0, 25, 0, 29, 0, 30, 0, 33, 0, 32, 0, 30, 0, 31, 0, 33, 0, 34, 0, 41, 0, 38, 0, 34, 0, 36, 0, 41, 0, 38, 0, 46, 0, 44, 0, 38, 0, 41, 0, 46, 0, 44, 0, 50, 0, 48, 0, 44, 0, 46, 0, 50, 0, 48, 0, 54, 0, 52, 0, 48, 0, 50, 0, 54, 0, 52, 0, 59, 0, 56, 0, 52, 0, 54, 0, 59, 0, 57, 0, 65, 0, 62, 0, 57, 0, 61, 0, 65, 0, 62, 0, 69, 0, 66, 0, 62, 0, 65, 0, 69, 0, 66, 0, 73, 0, 70, 0, 66, 0, 69, 0, 73, 0, 70, 0, 3, 0, 0, 0, 70, 0, 73, 0, 3, 0, 74, 0, 78, 0, 80, 0, 74, 0, 76, 0, 78, 0, 76, 0, 84, 0, 78, 0, 76, 0, 82, 0, 84, 0, 82, 0, 88, 0, 84, 0, 82, 0, 86, 0, 88, 0, 86, 0, 93, 0, 88, 0, 86, 0, 90, 0, 93, 0, 91, 0, 99, 0, 95, 0, 91, 0, 96, 0, 99, 0, 96, 0, 104, 0, 99, 0, 96, 0, 100, 0, 104, 0, 111, 0, 117, 0, 108, 0, 111, 0, 113, 0, 117, 0, 113, 0, 121, 0, 117, 0, 113, 0, 118, 0, 121, 0, 118, 0, 125, 0, 121, 0, 118, 0, 122, 0, 125, 0, 122, 0, 129, 0, 125, 0, 122, 0, 126, 0, 129, 0, 126, 0, 135, 0, 129, 0, 126, 0, 131, 0, 135, 0, 130, 0, 138, 0, 133, 0, 130, 0, 136, 0, 138, 0, 136, 0, 142, 0, 138, 0, 136, 0, 140, 0, 142, 0, 140, 0, 146, 0, 142, 0, 140, 0, 144, 0, 146, 0, 144, 0, 80, 0, 146, 0, 144, 0, 74, 0, 80, 0, 60, 0, 139, 0, 64, 0, 60, 0, 134, 0, 139, 0, 45, 0, 114, 0, 40, 0, 45, 0, 119, 0, 114, 0, 17, 0, 87, 0, 13, 0, 17, 0, 92, 0, 87, 0, 42, 0, 120, 0, 47, 0, 42, 0, 115, 0, 120, 0, 67, 0, 137, 0, 63, 0, 67, 0, 141, 0, 137, 0, 14, 0, 94, 0, 19, 0, 14, 0, 89, 0, 94, 0, 64, 0, 143, 0, 68, 0, 64, 0, 139, 0, 143, 0, 49, 0, 119, 0, 45, 0, 49, 0, 123, 0, 119, 0, 22, 0, 92, 0, 17, 0, 22, 0, 97, 0, 92, 0, 47, 0, 124, 0, 51, 0, 47, 0, 120, 0, 124, 0, 5, 0, 75, 0, 1, 0, 5, 0, 77, 0, 75, 0, 71, 0, 141, 0, 67, 0, 71, 0, 145, 0, 141, 0, 19, 0, 98, 0, 24, 0, 19, 0, 94, 0, 98, 0, 2, 0, 79, 0, 6, 0, 2, 0, 81, 0, 79, 0, 68, 0, 147, 0, 72, 0, 68, 0, 143, 0, 147, 0, 53, 0, 123, 0, 49, 0, 53, 0, 127, 0, 123, 0, 26, 0, 97, 0, 22, 0, 26, 0, 101, 0, 97, 0, 51, 0, 128, 0, 55, 0, 51, 0, 124, 0, 128, 0, 1, 0, 145, 0, 71, 0, 1, 0, 75, 0, 145, 0, 24, 0, 103, 0, 28, 0, 24, 0, 98, 0, 103, 0, 9, 0, 77, 0, 5, 0, 9, 0, 83, 0, 77, 0, 72, 0, 81, 0, 2, 0, 72, 0, 147, 0, 81, 0, 29, 0, 102, 0, 27, 0, 29, 0, 105, 0, 102, 0, 58, 0, 127, 0, 53, 0, 58, 0, 132, 0, 127, 0, 6, 0, 85, 0, 10, 0, 6, 0, 79, 0, 85, 0, 34, 0, 106, 0, 36, 0, 34, 0, 109, 0, 106, 0, 55, 0, 134, 0, 60, 0, 55, 0, 128, 0, 134, 0, 39, 0, 110, 0, 35, 0, 39, 0, 112, 0, 110, 0, 13, 0, 83, 0, 9, 0, 13, 0, 87, 0, 83, 0, 37, 0, 116, 0, 43, 0, 37, 0, 107, 0, 116, 0, 63, 0, 132, 0, 58, 0, 63, 0, 137, 0, 132, 0, 10, 0, 89, 0, 14, 0, 10, 0, 85, 0, 89, 0),
|
||||||
"lods": [0.163194, PackedByteArray(0, 0, 20, 0, 16, 0, 0, 0, 15, 0, 20, 0, 0, 0, 65, 0, 15, 0, 57, 0, 65, 0, 0, 0, 57, 0, 61, 0, 65, 0, 18, 0, 29, 0, 27, 0, 18, 0, 21, 0, 29, 0, 29, 0, 102, 0, 27, 0, 29, 0, 105, 0, 102, 0, 30, 0, 33, 0, 32, 0, 30, 0, 31, 0, 33, 0, 34, 0, 41, 0, 38, 0, 34, 0, 36, 0, 41, 0, 34, 0, 106, 0, 36, 0, 34, 0, 109, 0, 106, 0, 38, 0, 41, 0, 46, 0, 38, 0, 46, 0, 44, 0, 44, 0, 46, 0, 52, 0, 52, 0, 46, 0, 59, 0, 52, 0, 59, 0, 56, 0, 74, 0, 93, 0, 78, 0, 74, 0, 90, 0, 93, 0, 130, 0, 74, 0, 78, 0, 130, 0, 78, 0, 133, 0, 91, 0, 99, 0, 95, 0, 91, 0, 96, 0, 99, 0, 96, 0, 104, 0, 99, 0, 96, 0, 100, 0, 104, 0, 111, 0, 117, 0, 108, 0, 111, 0, 113, 0, 117, 0, 113, 0, 129, 0, 117, 0, 113, 0, 118, 0, 129, 0, 118, 0, 135, 0, 129, 0, 118, 0, 131, 0, 135, 0, 60, 0, 79, 0, 64, 0, 64, 0, 79, 0, 14, 0, 60, 0, 134, 0, 79, 0, 14, 0, 79, 0, 94, 0, 47, 0, 134, 0, 60, 0, 14, 0, 94, 0, 19, 0, 47, 0, 128, 0, 134, 0, 42, 0, 128, 0, 47, 0, 42, 0, 115, 0, 128, 0, 19, 0, 94, 0, 98, 0, 19, 0, 98, 0, 28, 0, 28, 0, 98, 0, 103, 0, 45, 0, 114, 0, 40, 0, 45, 0, 119, 0, 114, 0, 53, 0, 119, 0, 45, 0, 58, 0, 119, 0, 53, 0, 58, 0, 132, 0, 119, 0, 1, 0, 132, 0, 58, 0, 1, 0, 75, 0, 132, 0, 17, 0, 75, 0, 1, 0, 17, 0, 92, 0, 75, 0, 26, 0, 92, 0, 17, 0, 26, 0, 97, 0, 92, 0, 26, 0, 101, 0, 97, 0, 39, 0, 110, 0, 35, 0, 39, 0, 112, 0, 110, 0, 37, 0, 116, 0, 43, 0, 37, 0, 107, 0, 116, 0)],
|
"lods": [0.163194, PackedByteArray(0, 0, 20, 0, 16, 0, 0, 0, 15, 0, 20, 0, 0, 0, 65, 0, 15, 0, 57, 0, 65, 0, 0, 0, 57, 0, 61, 0, 65, 0, 18, 0, 29, 0, 27, 0, 18, 0, 21, 0, 29, 0, 29, 0, 102, 0, 27, 0, 29, 0, 105, 0, 102, 0, 30, 0, 33, 0, 32, 0, 30, 0, 31, 0, 33, 0, 34, 0, 41, 0, 38, 0, 34, 0, 36, 0, 41, 0, 34, 0, 106, 0, 36, 0, 34, 0, 109, 0, 106, 0, 38, 0, 41, 0, 46, 0, 38, 0, 46, 0, 44, 0, 44, 0, 46, 0, 52, 0, 52, 0, 46, 0, 59, 0, 52, 0, 59, 0, 56, 0, 74, 0, 93, 0, 78, 0, 74, 0, 90, 0, 93, 0, 130, 0, 74, 0, 78, 0, 130, 0, 78, 0, 133, 0, 91, 0, 99, 0, 95, 0, 91, 0, 96, 0, 99, 0, 96, 0, 104, 0, 99, 0, 96, 0, 100, 0, 104, 0, 111, 0, 117, 0, 108, 0, 111, 0, 113, 0, 117, 0, 113, 0, 129, 0, 117, 0, 113, 0, 118, 0, 129, 0, 118, 0, 135, 0, 129, 0, 118, 0, 131, 0, 135, 0, 60, 0, 79, 0, 64, 0, 64, 0, 79, 0, 14, 0, 60, 0, 134, 0, 79, 0, 14, 0, 79, 0, 94, 0, 47, 0, 134, 0, 60, 0, 14, 0, 94, 0, 19, 0, 47, 0, 128, 0, 134, 0, 42, 0, 128, 0, 47, 0, 42, 0, 115, 0, 128, 0, 19, 0, 94, 0, 98, 0, 19, 0, 98, 0, 28, 0, 28, 0, 98, 0, 103, 0, 45, 0, 114, 0, 40, 0, 45, 0, 119, 0, 114, 0, 53, 0, 119, 0, 45, 0, 58, 0, 119, 0, 53, 0, 58, 0, 132, 0, 119, 0, 1, 0, 132, 0, 58, 0, 1, 0, 75, 0, 132, 0, 17, 0, 75, 0, 1, 0, 17, 0, 92, 0, 75, 0, 26, 0, 92, 0, 17, 0, 26, 0, 97, 0, 92, 0, 26, 0, 101, 0, 97, 0, 39, 0, 110, 0, 35, 0, 39, 0, 112, 0, 110, 0, 37, 0, 116, 0, 43, 0, 37, 0, 107, 0, 116, 0)],
|
||||||
"material": SubResource("StandardMaterial3D_yt0t4"),
|
"material": SubResource("StandardMaterial3D_n36og"),
|
||||||
"name": "WoodenWall",
|
"name": "WoodenWall",
|
||||||
"primitive": 3,
|
"primitive": 3,
|
||||||
"uv_scale": Vector4(0, 0, 0, 0),
|
"uv_scale": Vector4(0, 0, 0, 0),
|
||||||
|
|
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
|
@ -114,7 +114,7 @@ func _on_issues_button_pressed():
|
||||||
|
|
||||||
func load_tutorial():
|
func load_tutorial():
|
||||||
Global.playerPleaseRespawn = true
|
Global.playerPleaseRespawn = true
|
||||||
Networking.create_server(28000, 0)
|
Networking.create_server(28000, 1)
|
||||||
Networking.load_map("res://scenes/tutorial.tscn")
|
Networking.load_map("res://scenes/tutorial.tscn")
|
||||||
Networking.add_player_node(1)
|
Networking.add_player_node(1)
|
||||||
Global.connectedPlayers += [Global.playerName]
|
Global.connectedPlayers += [Global.playerName]
|
||||||
|
|
Loading…
Reference in a new issue