diff --git a/Game/Assets/Characters/Player.tscn b/Game/Assets/Characters/Player.tscn index e8b00e7..bc9840a 100644 --- a/Game/Assets/Characters/Player.tscn +++ b/Game/Assets/Characters/Player.tscn @@ -247,6 +247,7 @@ script = ExtResource( "1" ) transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.852763, 0) layers = 2 mesh = SubResource( "1" ) +surface_material_override/0 = null [node name="Head" type="Node3D" parent="."] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 1.45276, 0) @@ -273,10 +274,7 @@ transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 1.77099e-07, 0, -0.742805) target_position = Vector3(0, 0, -1000) collision_mask = 2 -[node name="GPUParticlesCollisionSphere" type="GPUParticlesCollisionSphere" parent="."] -transform = Transform3D(1, 0, 0, 0, 2.16632, 0, 0, 0, 1, 0.00910211, 0.760577, 0.00278068) -layers = 7 -radius = 0.549216 +[node name="GPUParticlesCollisionSphere" type="Node" parent="."] [node name="Body" type="CollisionShape3D" parent="."] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.852763, 0) @@ -305,6 +303,7 @@ transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.93832, 0.5022) layers = 2 material_override = SubResource( "StandardMaterial3D_y4s21" ) mesh = SubResource( "CylinderMesh_8yana" ) +surface_material_override/0 = null [node name="OmniLight3D" type="OmniLight3D" parent="Jetpack"] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, -0.68079, 0) @@ -417,6 +416,7 @@ transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 2, 0) layers = 4 cast_shadow = 0 mesh = SubResource( "QuadMesh_nhjmb" ) +surface_material_override/0 = null [editable path="JumpSFX"] [editable path="LandSFX"] diff --git a/Game/Assets/Decals/Blood/BloodSplash_albedo.png.import b/Game/Assets/Decals/Blood/BloodSplash_albedo.png.import index 5a1a960..1206526 100644 --- a/Game/Assets/Decals/Blood/BloodSplash_albedo.png.import +++ b/Game/Assets/Decals/Blood/BloodSplash_albedo.png.import @@ -3,19 +3,21 @@ importer="texture" type="StreamTexture2D" uid="uid://th4fli1vgo1a" -path="res://.godot/imported/BloodSplash_albedo.png-9695213797bd3780e56c718551ec2a34.stex" +path.s3tc="res://.godot/imported/BloodSplash_albedo.png-9695213797bd3780e56c718551ec2a34.s3tc.stex" +path.etc2="res://.godot/imported/BloodSplash_albedo.png-9695213797bd3780e56c718551ec2a34.etc2.stex" metadata={ -"vram_texture": false +"imported_formats": ["s3tc", "etc2"], +"vram_texture": true } [deps] source_file="res://Assets/Decals/Blood/BloodSplash_albedo.png" -dest_files=["res://.godot/imported/BloodSplash_albedo.png-9695213797bd3780e56c718551ec2a34.stex"] +dest_files=["res://.godot/imported/BloodSplash_albedo.png-9695213797bd3780e56c718551ec2a34.s3tc.stex", "res://.godot/imported/BloodSplash_albedo.png-9695213797bd3780e56c718551ec2a34.etc2.stex"] [params] -compress/mode=3 +compress/mode=2 compress/lossy_quality=0.7 compress/hdr_compression=1 compress/bptc_ldr=0 diff --git a/Game/Assets/Decals/Blood/BloodSplash_normal.png.import b/Game/Assets/Decals/Blood/BloodSplash_normal.png.import index 46f951d..bba403e 100644 --- a/Game/Assets/Decals/Blood/BloodSplash_normal.png.import +++ b/Game/Assets/Decals/Blood/BloodSplash_normal.png.import @@ -3,19 +3,21 @@ importer="texture" type="StreamTexture2D" uid="uid://pobhi2vhmdpc" -path="res://.godot/imported/BloodSplash_normal.png-48c6b2f64daf5e7bfac0fed9fbe055a5.stex" +path.s3tc="res://.godot/imported/BloodSplash_normal.png-48c6b2f64daf5e7bfac0fed9fbe055a5.s3tc.stex" +path.etc2="res://.godot/imported/BloodSplash_normal.png-48c6b2f64daf5e7bfac0fed9fbe055a5.etc2.stex" metadata={ -"vram_texture": false +"imported_formats": ["s3tc", "etc2"], +"vram_texture": true } [deps] source_file="res://Assets/Decals/Blood/BloodSplash_normal.png" -dest_files=["res://.godot/imported/BloodSplash_normal.png-48c6b2f64daf5e7bfac0fed9fbe055a5.stex"] +dest_files=["res://.godot/imported/BloodSplash_normal.png-48c6b2f64daf5e7bfac0fed9fbe055a5.s3tc.stex", "res://.godot/imported/BloodSplash_normal.png-48c6b2f64daf5e7bfac0fed9fbe055a5.etc2.stex"] [params] -compress/mode=3 +compress/mode=2 compress/lossy_quality=0.7 compress/hdr_compression=1 compress/bptc_ldr=0 diff --git a/Game/Assets/Decals/Blood/BloodSplash_orm.png.import b/Game/Assets/Decals/Blood/BloodSplash_orm.png.import index 15d9538..ffbf753 100644 --- a/Game/Assets/Decals/Blood/BloodSplash_orm.png.import +++ b/Game/Assets/Decals/Blood/BloodSplash_orm.png.import @@ -3,19 +3,21 @@ importer="texture" type="StreamTexture2D" uid="uid://bosf0mht2450i" -path="res://.godot/imported/BloodSplash_orm.png-55467babaeec4f231f18067f02470de0.stex" +path.s3tc="res://.godot/imported/BloodSplash_orm.png-55467babaeec4f231f18067f02470de0.s3tc.stex" +path.etc2="res://.godot/imported/BloodSplash_orm.png-55467babaeec4f231f18067f02470de0.etc2.stex" metadata={ -"vram_texture": false +"imported_formats": ["s3tc", "etc2"], +"vram_texture": true } [deps] source_file="res://Assets/Decals/Blood/BloodSplash_orm.png" -dest_files=["res://.godot/imported/BloodSplash_orm.png-55467babaeec4f231f18067f02470de0.stex"] +dest_files=["res://.godot/imported/BloodSplash_orm.png-55467babaeec4f231f18067f02470de0.s3tc.stex", "res://.godot/imported/BloodSplash_orm.png-55467babaeec4f231f18067f02470de0.etc2.stex"] [params] -compress/mode=3 +compress/mode=2 compress/lossy_quality=0.7 compress/hdr_compression=1 compress/bptc_ldr=0 diff --git a/Game/Assets/Decals/BulletHits/BulletHitConcrete_albedo.png.import b/Game/Assets/Decals/BulletHits/BulletHitConcrete_albedo.png.import index ec3c530..8397ecb 100644 --- a/Game/Assets/Decals/BulletHits/BulletHitConcrete_albedo.png.import +++ b/Game/Assets/Decals/BulletHits/BulletHitConcrete_albedo.png.import @@ -3,19 +3,21 @@ importer="texture" type="StreamTexture2D" uid="uid://cb584onhet4nd" -path="res://.godot/imported/BulletHitConcrete_albedo.png-24e30a79b2d94838247468c1233ee1f7.stex" +path.s3tc="res://.godot/imported/BulletHitConcrete_albedo.png-24e30a79b2d94838247468c1233ee1f7.s3tc.stex" +path.etc2="res://.godot/imported/BulletHitConcrete_albedo.png-24e30a79b2d94838247468c1233ee1f7.etc2.stex" metadata={ -"vram_texture": false +"imported_formats": ["s3tc", "etc2"], +"vram_texture": true } [deps] source_file="res://Assets/Decals/BulletHits/BulletHitConcrete_albedo.png" -dest_files=["res://.godot/imported/BulletHitConcrete_albedo.png-24e30a79b2d94838247468c1233ee1f7.stex"] +dest_files=["res://.godot/imported/BulletHitConcrete_albedo.png-24e30a79b2d94838247468c1233ee1f7.s3tc.stex", "res://.godot/imported/BulletHitConcrete_albedo.png-24e30a79b2d94838247468c1233ee1f7.etc2.stex"] [params] -compress/mode=3 +compress/mode=2 compress/lossy_quality=0.7 compress/hdr_compression=1 compress/bptc_ldr=0 diff --git a/Game/Assets/Decals/BulletHits/BulletHitConcrete_depth.png.import b/Game/Assets/Decals/BulletHits/BulletHitConcrete_depth.png.import index 4ecf789..1562cd6 100644 --- a/Game/Assets/Decals/BulletHits/BulletHitConcrete_depth.png.import +++ b/Game/Assets/Decals/BulletHits/BulletHitConcrete_depth.png.import @@ -3,19 +3,21 @@ importer="texture" type="StreamTexture2D" uid="uid://72ubk3ck2lme" -path="res://.godot/imported/BulletHitConcrete_depth.png-e17ef6e53c66a356888154adf91644ef.stex" +path.s3tc="res://.godot/imported/BulletHitConcrete_depth.png-e17ef6e53c66a356888154adf91644ef.s3tc.stex" +path.etc2="res://.godot/imported/BulletHitConcrete_depth.png-e17ef6e53c66a356888154adf91644ef.etc2.stex" metadata={ -"vram_texture": false +"imported_formats": ["s3tc", "etc2"], +"vram_texture": true } [deps] source_file="res://Assets/Decals/BulletHits/BulletHitConcrete_depth.png" -dest_files=["res://.godot/imported/BulletHitConcrete_depth.png-e17ef6e53c66a356888154adf91644ef.stex"] +dest_files=["res://.godot/imported/BulletHitConcrete_depth.png-e17ef6e53c66a356888154adf91644ef.s3tc.stex", "res://.godot/imported/BulletHitConcrete_depth.png-e17ef6e53c66a356888154adf91644ef.etc2.stex"] [params] -compress/mode=3 +compress/mode=2 compress/lossy_quality=0.7 compress/hdr_compression=1 compress/bptc_ldr=0 diff --git a/Game/Assets/Decals/BulletHits/BulletHitConcrete_normal.png.import b/Game/Assets/Decals/BulletHits/BulletHitConcrete_normal.png.import index d1ccfa7..aecc003 100644 --- a/Game/Assets/Decals/BulletHits/BulletHitConcrete_normal.png.import +++ b/Game/Assets/Decals/BulletHits/BulletHitConcrete_normal.png.import @@ -3,19 +3,21 @@ importer="texture" type="StreamTexture2D" uid="uid://bs08bclmrvacp" -path="res://.godot/imported/BulletHitConcrete_normal.png-25f7efe7bb4460c96b9032bddabcd063.stex" +path.s3tc="res://.godot/imported/BulletHitConcrete_normal.png-25f7efe7bb4460c96b9032bddabcd063.s3tc.stex" +path.etc2="res://.godot/imported/BulletHitConcrete_normal.png-25f7efe7bb4460c96b9032bddabcd063.etc2.stex" metadata={ -"vram_texture": false +"imported_formats": ["s3tc", "etc2"], +"vram_texture": true } [deps] source_file="res://Assets/Decals/BulletHits/BulletHitConcrete_normal.png" -dest_files=["res://.godot/imported/BulletHitConcrete_normal.png-25f7efe7bb4460c96b9032bddabcd063.stex"] +dest_files=["res://.godot/imported/BulletHitConcrete_normal.png-25f7efe7bb4460c96b9032bddabcd063.s3tc.stex", "res://.godot/imported/BulletHitConcrete_normal.png-25f7efe7bb4460c96b9032bddabcd063.etc2.stex"] [params] -compress/mode=3 +compress/mode=2 compress/lossy_quality=0.7 compress/hdr_compression=1 compress/bptc_ldr=0 diff --git a/Game/Assets/Decals/BulletHits/BulletHitConcrete_orm.png.import b/Game/Assets/Decals/BulletHits/BulletHitConcrete_orm.png.import index be780db..3dbf3b4 100644 --- a/Game/Assets/Decals/BulletHits/BulletHitConcrete_orm.png.import +++ b/Game/Assets/Decals/BulletHits/BulletHitConcrete_orm.png.import @@ -3,19 +3,21 @@ importer="texture" type="StreamTexture2D" uid="uid://ddncj1g0e27m8" -path="res://.godot/imported/BulletHitConcrete_orm.png-0698284ef21986015663c02ec973647c.stex" +path.s3tc="res://.godot/imported/BulletHitConcrete_orm.png-0698284ef21986015663c02ec973647c.s3tc.stex" +path.etc2="res://.godot/imported/BulletHitConcrete_orm.png-0698284ef21986015663c02ec973647c.etc2.stex" metadata={ -"vram_texture": false +"imported_formats": ["s3tc", "etc2"], +"vram_texture": true } [deps] source_file="res://Assets/Decals/BulletHits/BulletHitConcrete_orm.png" -dest_files=["res://.godot/imported/BulletHitConcrete_orm.png-0698284ef21986015663c02ec973647c.stex"] +dest_files=["res://.godot/imported/BulletHitConcrete_orm.png-0698284ef21986015663c02ec973647c.s3tc.stex", "res://.godot/imported/BulletHitConcrete_orm.png-0698284ef21986015663c02ec973647c.etc2.stex"] [params] -compress/mode=3 +compress/mode=2 compress/lossy_quality=0.7 compress/hdr_compression=1 compress/bptc_ldr=0 diff --git a/Game/Assets/Decals/Puddle_Albedo.png.import b/Game/Assets/Decals/Puddle_Albedo.png.import index adc96ad..2d64d04 100644 --- a/Game/Assets/Decals/Puddle_Albedo.png.import +++ b/Game/Assets/Decals/Puddle_Albedo.png.import @@ -3,19 +3,21 @@ importer="texture" type="StreamTexture2D" uid="uid://4fe0w7db5jy7" -path="res://.godot/imported/Puddle_Albedo.png-c1987df962c73afcb77d54235d06652a.stex" +path.s3tc="res://.godot/imported/Puddle_Albedo.png-c1987df962c73afcb77d54235d06652a.s3tc.stex" +path.etc2="res://.godot/imported/Puddle_Albedo.png-c1987df962c73afcb77d54235d06652a.etc2.stex" metadata={ -"vram_texture": false +"imported_formats": ["s3tc", "etc2"], +"vram_texture": true } [deps] source_file="res://Assets/Decals/Puddle_Albedo.png" -dest_files=["res://.godot/imported/Puddle_Albedo.png-c1987df962c73afcb77d54235d06652a.stex"] +dest_files=["res://.godot/imported/Puddle_Albedo.png-c1987df962c73afcb77d54235d06652a.s3tc.stex", "res://.godot/imported/Puddle_Albedo.png-c1987df962c73afcb77d54235d06652a.etc2.stex"] [params] -compress/mode=3 +compress/mode=2 compress/lossy_quality=0.7 compress/hdr_compression=1 compress/bptc_ldr=0 diff --git a/Game/Assets/Decals/Puddle_Normal.png.import b/Game/Assets/Decals/Puddle_Normal.png.import index 3da5b01..ee823c7 100644 --- a/Game/Assets/Decals/Puddle_Normal.png.import +++ b/Game/Assets/Decals/Puddle_Normal.png.import @@ -3,19 +3,21 @@ importer="texture" type="StreamTexture2D" uid="uid://bw47ok2363v8p" -path="res://.godot/imported/Puddle_Normal.png-26e780b975fe8d6b3acb6656acdeca11.stex" +path.s3tc="res://.godot/imported/Puddle_Normal.png-26e780b975fe8d6b3acb6656acdeca11.s3tc.stex" +path.etc2="res://.godot/imported/Puddle_Normal.png-26e780b975fe8d6b3acb6656acdeca11.etc2.stex" metadata={ -"vram_texture": false +"imported_formats": ["s3tc", "etc2"], +"vram_texture": true } [deps] source_file="res://Assets/Decals/Puddle_Normal.png" -dest_files=["res://.godot/imported/Puddle_Normal.png-26e780b975fe8d6b3acb6656acdeca11.stex"] +dest_files=["res://.godot/imported/Puddle_Normal.png-26e780b975fe8d6b3acb6656acdeca11.s3tc.stex", "res://.godot/imported/Puddle_Normal.png-26e780b975fe8d6b3acb6656acdeca11.etc2.stex"] [params] -compress/mode=3 +compress/mode=2 compress/lossy_quality=0.7 compress/hdr_compression=1 compress/bptc_ldr=0 diff --git a/Game/Assets/Decals/Puddle_ORM.png.import b/Game/Assets/Decals/Puddle_ORM.png.import index 8db9104..f909cef 100644 --- a/Game/Assets/Decals/Puddle_ORM.png.import +++ b/Game/Assets/Decals/Puddle_ORM.png.import @@ -3,19 +3,21 @@ importer="texture" type="StreamTexture2D" uid="uid://daphvbx7ktd4p" -path="res://.godot/imported/Puddle_ORM.png-4a7cf333057d673b1d493b30c95b2634.stex" +path.s3tc="res://.godot/imported/Puddle_ORM.png-4a7cf333057d673b1d493b30c95b2634.s3tc.stex" +path.etc2="res://.godot/imported/Puddle_ORM.png-4a7cf333057d673b1d493b30c95b2634.etc2.stex" metadata={ -"vram_texture": false +"imported_formats": ["s3tc", "etc2"], +"vram_texture": true } [deps] source_file="res://Assets/Decals/Puddle_ORM.png" -dest_files=["res://.godot/imported/Puddle_ORM.png-4a7cf333057d673b1d493b30c95b2634.stex"] +dest_files=["res://.godot/imported/Puddle_ORM.png-4a7cf333057d673b1d493b30c95b2634.s3tc.stex", "res://.godot/imported/Puddle_ORM.png-4a7cf333057d673b1d493b30c95b2634.etc2.stex"] [params] -compress/mode=3 +compress/mode=2 compress/lossy_quality=0.7 compress/hdr_compression=1 compress/bptc_ldr=0 diff --git a/Game/Assets/Effects/BloodParticles_albedo.png.import b/Game/Assets/Effects/BloodParticles_albedo.png.import index 31a0d29..e06eb14 100644 --- a/Game/Assets/Effects/BloodParticles_albedo.png.import +++ b/Game/Assets/Effects/BloodParticles_albedo.png.import @@ -3,19 +3,21 @@ importer="texture" type="StreamTexture2D" uid="uid://djny4vk6xkldu" -path="res://.godot/imported/BloodParticles_albedo.png-37174a409a071bd6614538c39556dada.stex" +path.s3tc="res://.godot/imported/BloodParticles_albedo.png-37174a409a071bd6614538c39556dada.s3tc.stex" +path.etc2="res://.godot/imported/BloodParticles_albedo.png-37174a409a071bd6614538c39556dada.etc2.stex" metadata={ -"vram_texture": false +"imported_formats": ["s3tc", "etc2"], +"vram_texture": true } [deps] source_file="res://Assets/Effects/BloodParticles_albedo.png" -dest_files=["res://.godot/imported/BloodParticles_albedo.png-37174a409a071bd6614538c39556dada.stex"] +dest_files=["res://.godot/imported/BloodParticles_albedo.png-37174a409a071bd6614538c39556dada.s3tc.stex", "res://.godot/imported/BloodParticles_albedo.png-37174a409a071bd6614538c39556dada.etc2.stex"] [params] -compress/mode=3 +compress/mode=2 compress/lossy_quality=0.7 compress/hdr_compression=1 compress/bptc_ldr=0 diff --git a/Game/Assets/Effects/BloodParticles_normal.png.import b/Game/Assets/Effects/BloodParticles_normal.png.import index 996baef..f25e6b9 100644 --- a/Game/Assets/Effects/BloodParticles_normal.png.import +++ b/Game/Assets/Effects/BloodParticles_normal.png.import @@ -3,19 +3,21 @@ importer="texture" type="StreamTexture2D" uid="uid://cexb4sower0cc" -path="res://.godot/imported/BloodParticles_normal.png-de82d7a88488a976c5db78ba612b3ff5.stex" +path.s3tc="res://.godot/imported/BloodParticles_normal.png-de82d7a88488a976c5db78ba612b3ff5.s3tc.stex" +path.etc2="res://.godot/imported/BloodParticles_normal.png-de82d7a88488a976c5db78ba612b3ff5.etc2.stex" metadata={ -"vram_texture": false +"imported_formats": ["s3tc", "etc2"], +"vram_texture": true } [deps] source_file="res://Assets/Effects/BloodParticles_normal.png" -dest_files=["res://.godot/imported/BloodParticles_normal.png-de82d7a88488a976c5db78ba612b3ff5.stex"] +dest_files=["res://.godot/imported/BloodParticles_normal.png-de82d7a88488a976c5db78ba612b3ff5.s3tc.stex", "res://.godot/imported/BloodParticles_normal.png-de82d7a88488a976c5db78ba612b3ff5.etc2.stex"] [params] -compress/mode=3 +compress/mode=2 compress/lossy_quality=0.7 compress/hdr_compression=1 compress/bptc_ldr=0 diff --git a/Game/Assets/Effects/EnergyHit_texture_1.png.import b/Game/Assets/Effects/EnergyHit_texture_1.png.import index b4b684f..52e934b 100644 --- a/Game/Assets/Effects/EnergyHit_texture_1.png.import +++ b/Game/Assets/Effects/EnergyHit_texture_1.png.import @@ -3,19 +3,21 @@ importer="texture" type="StreamTexture2D" uid="uid://c5dliecb55evh" -path="res://.godot/imported/EnergyHit_texture_1.png-e4cfde2ac8487cb9c2ef5c4a332c8763.stex" +path.s3tc="res://.godot/imported/EnergyHit_texture_1.png-e4cfde2ac8487cb9c2ef5c4a332c8763.s3tc.stex" +path.etc2="res://.godot/imported/EnergyHit_texture_1.png-e4cfde2ac8487cb9c2ef5c4a332c8763.etc2.stex" metadata={ -"vram_texture": false +"imported_formats": ["s3tc", "etc2"], +"vram_texture": true } [deps] source_file="res://Assets/Effects/EnergyHit_texture_1.png" -dest_files=["res://.godot/imported/EnergyHit_texture_1.png-e4cfde2ac8487cb9c2ef5c4a332c8763.stex"] +dest_files=["res://.godot/imported/EnergyHit_texture_1.png-e4cfde2ac8487cb9c2ef5c4a332c8763.s3tc.stex", "res://.godot/imported/EnergyHit_texture_1.png-e4cfde2ac8487cb9c2ef5c4a332c8763.etc2.stex"] [params] -compress/mode=3 +compress/mode=2 compress/lossy_quality=0.7 compress/hdr_compression=1 compress/bptc_ldr=0 diff --git a/Game/Assets/Effects/EnergyHit_texture_2.png.import b/Game/Assets/Effects/EnergyHit_texture_2.png.import index 4ecda92..297d0d4 100644 --- a/Game/Assets/Effects/EnergyHit_texture_2.png.import +++ b/Game/Assets/Effects/EnergyHit_texture_2.png.import @@ -3,19 +3,21 @@ importer="texture" type="StreamTexture2D" uid="uid://cxkigvhuxsp87" -path="res://.godot/imported/EnergyHit_texture_2.png-98146f7f44d5704316be3c03b0b42953.stex" +path.s3tc="res://.godot/imported/EnergyHit_texture_2.png-98146f7f44d5704316be3c03b0b42953.s3tc.stex" +path.etc2="res://.godot/imported/EnergyHit_texture_2.png-98146f7f44d5704316be3c03b0b42953.etc2.stex" metadata={ -"vram_texture": false +"imported_formats": ["s3tc", "etc2"], +"vram_texture": true } [deps] source_file="res://Assets/Effects/EnergyHit_texture_2.png" -dest_files=["res://.godot/imported/EnergyHit_texture_2.png-98146f7f44d5704316be3c03b0b42953.stex"] +dest_files=["res://.godot/imported/EnergyHit_texture_2.png-98146f7f44d5704316be3c03b0b42953.s3tc.stex", "res://.godot/imported/EnergyHit_texture_2.png-98146f7f44d5704316be3c03b0b42953.etc2.stex"] [params] -compress/mode=3 +compress/mode=2 compress/lossy_quality=0.7 compress/hdr_compression=1 compress/bptc_ldr=0 diff --git a/Game/Assets/Effects/Flame.png.import b/Game/Assets/Effects/Flame.png.import index a133e94..76ae2bf 100644 --- a/Game/Assets/Effects/Flame.png.import +++ b/Game/Assets/Effects/Flame.png.import @@ -3,19 +3,21 @@ importer="texture" type="StreamTexture2D" uid="uid://pnh872qjk0oy" -path="res://.godot/imported/Flame.png-7c44abd65ae181a5818470a5b3268f30.stex" +path.s3tc="res://.godot/imported/Flame.png-7c44abd65ae181a5818470a5b3268f30.s3tc.stex" +path.etc2="res://.godot/imported/Flame.png-7c44abd65ae181a5818470a5b3268f30.etc2.stex" metadata={ -"vram_texture": false +"imported_formats": ["s3tc", "etc2"], +"vram_texture": true } [deps] source_file="res://Assets/Effects/Flame.png" -dest_files=["res://.godot/imported/Flame.png-7c44abd65ae181a5818470a5b3268f30.stex"] +dest_files=["res://.godot/imported/Flame.png-7c44abd65ae181a5818470a5b3268f30.s3tc.stex", "res://.godot/imported/Flame.png-7c44abd65ae181a5818470a5b3268f30.etc2.stex"] [params] -compress/mode=3 +compress/mode=2 compress/lossy_quality=0.7 compress/hdr_compression=1 compress/bptc_ldr=0 diff --git a/Game/Assets/Effects/ScorchMark_albedo.png.import b/Game/Assets/Effects/ScorchMark_albedo.png.import index 96751b9..e815558 100644 --- a/Game/Assets/Effects/ScorchMark_albedo.png.import +++ b/Game/Assets/Effects/ScorchMark_albedo.png.import @@ -3,19 +3,21 @@ importer="texture" type="StreamTexture2D" uid="uid://m8n52wtycvro" -path="res://.godot/imported/ScorchMark_albedo.png-17bbecf13305c47ff3db4fc64b07bbce.stex" +path.s3tc="res://.godot/imported/ScorchMark_albedo.png-17bbecf13305c47ff3db4fc64b07bbce.s3tc.stex" +path.etc2="res://.godot/imported/ScorchMark_albedo.png-17bbecf13305c47ff3db4fc64b07bbce.etc2.stex" metadata={ -"vram_texture": false +"imported_formats": ["s3tc", "etc2"], +"vram_texture": true } [deps] source_file="res://Assets/Effects/ScorchMark_albedo.png" -dest_files=["res://.godot/imported/ScorchMark_albedo.png-17bbecf13305c47ff3db4fc64b07bbce.stex"] +dest_files=["res://.godot/imported/ScorchMark_albedo.png-17bbecf13305c47ff3db4fc64b07bbce.s3tc.stex", "res://.godot/imported/ScorchMark_albedo.png-17bbecf13305c47ff3db4fc64b07bbce.etc2.stex"] [params] -compress/mode=3 +compress/mode=2 compress/lossy_quality=0.7 compress/hdr_compression=1 compress/bptc_ldr=0 diff --git a/Game/Assets/Effects/ScorchMark_orm.png.import b/Game/Assets/Effects/ScorchMark_orm.png.import index 95e618f..56391d7 100644 --- a/Game/Assets/Effects/ScorchMark_orm.png.import +++ b/Game/Assets/Effects/ScorchMark_orm.png.import @@ -3,19 +3,21 @@ importer="texture" type="StreamTexture2D" uid="uid://b6ly38wgtbnfw" -path="res://.godot/imported/ScorchMark_orm.png-fb12cf3ec115f81eab1dc5d0155275a9.stex" +path.s3tc="res://.godot/imported/ScorchMark_orm.png-fb12cf3ec115f81eab1dc5d0155275a9.s3tc.stex" +path.etc2="res://.godot/imported/ScorchMark_orm.png-fb12cf3ec115f81eab1dc5d0155275a9.etc2.stex" metadata={ -"vram_texture": false +"imported_formats": ["s3tc", "etc2"], +"vram_texture": true } [deps] source_file="res://Assets/Effects/ScorchMark_orm.png" -dest_files=["res://.godot/imported/ScorchMark_orm.png-fb12cf3ec115f81eab1dc5d0155275a9.stex"] +dest_files=["res://.godot/imported/ScorchMark_orm.png-fb12cf3ec115f81eab1dc5d0155275a9.s3tc.stex", "res://.godot/imported/ScorchMark_orm.png-fb12cf3ec115f81eab1dc5d0155275a9.etc2.stex"] [params] -compress/mode=3 +compress/mode=2 compress/lossy_quality=0.7 compress/hdr_compression=1 compress/bptc_ldr=0 diff --git a/Game/Assets/HUD/HUD.tscn b/Game/Assets/HUD/HUD.tscn index 5d0295b..81561e1 100644 --- a/Game/Assets/HUD/HUD.tscn +++ b/Game/Assets/HUD/HUD.tscn @@ -321,8 +321,6 @@ offset_top = -221.0 offset_right = 220.0 theme_override_font_sizes/font_size = 32 text = "RESPAWNING IN 5.0 seconds" -align = 1 -valign = 1 __meta__ = { "_edit_use_anchors_": false } @@ -335,8 +333,6 @@ anchor_bottom = 0.5 offset_left = -116.0 offset_top = -27.0 offset_bottom = 27.0 -align = 2 -valign = 1 __meta__ = { "_edit_use_anchors_": false } @@ -370,7 +366,6 @@ offset_bottom = 26.0 size_flags_horizontal = 3 size_flags_vertical = 5 text = "LE SCORE TABLE" -align = 1 __meta__ = { "_edit_use_anchors_": false } @@ -448,7 +443,6 @@ offset_right = 202.0 offset_bottom = -2.0 text = "FPS: PING:" -valign = 2 script = ExtResource( "17_getmp" ) __meta__ = { "_edit_use_anchors_": false diff --git a/Game/Assets/HUD/Performance.gd b/Game/Assets/HUD/Performance.gd index c2e7077..f6642c6 100644 --- a/Game/Assets/HUD/Performance.gd +++ b/Game/Assets/HUD/Performance.gd @@ -8,12 +8,8 @@ extends Label var version: String # game build version # Called when the node enters the scene tree for the first time. -func _ready(): - OS.execute('bash', ["./version.sh"]) - var file = File.new() - file.open("res://version", File.READ) - version = file.get_as_text() - file.close() +#func _ready(): +# pass # Called every frame. 'delta' is the elapsed time since the previous frame. func _process(delta): @@ -41,4 +37,4 @@ func _process(delta): text += "\nFPS: " + str(Engine.get_frames_per_second()) if Engine.target_fps != 0: text += " (capped at " + str(Engine.target_fps) + ")" - text += "\n" + version + " · https://git.gieszer.link/unfa/liblast" + text += "\n" + main.version + " · https://git.gieszer.link/unfa/liblast" diff --git a/Game/Assets/HUD/Vignette.png.import b/Game/Assets/HUD/Vignette.png.import index 898825a..a1d16bf 100644 --- a/Game/Assets/HUD/Vignette.png.import +++ b/Game/Assets/HUD/Vignette.png.import @@ -3,19 +3,21 @@ importer="texture" type="StreamTexture2D" uid="uid://dlw3sb5tygqf4" -path="res://.godot/imported/Vignette.png-91c9a8d7fb2c16e38f32b60a556ba3a5.stex" +path.s3tc="res://.godot/imported/Vignette.png-91c9a8d7fb2c16e38f32b60a556ba3a5.s3tc.stex" +path.etc2="res://.godot/imported/Vignette.png-91c9a8d7fb2c16e38f32b60a556ba3a5.etc2.stex" metadata={ -"vram_texture": false +"imported_formats": ["s3tc", "etc2"], +"vram_texture": true } [deps] source_file="res://Assets/HUD/Vignette.png" -dest_files=["res://.godot/imported/Vignette.png-91c9a8d7fb2c16e38f32b60a556ba3a5.stex"] +dest_files=["res://.godot/imported/Vignette.png-91c9a8d7fb2c16e38f32b60a556ba3a5.s3tc.stex", "res://.godot/imported/Vignette.png-91c9a8d7fb2c16e38f32b60a556ba3a5.etc2.stex"] [params] -compress/mode=3 +compress/mode=2 compress/lossy_quality=0.7 compress/hdr_compression=1 compress/bptc_ldr=0 diff --git a/Game/Assets/Maps/Materials/dev_materials/textures/dev_blue.png.import b/Game/Assets/Maps/Materials/dev_materials/textures/dev_blue.png.import index 793d4bd..986dd98 100644 --- a/Game/Assets/Maps/Materials/dev_materials/textures/dev_blue.png.import +++ b/Game/Assets/Maps/Materials/dev_materials/textures/dev_blue.png.import @@ -3,19 +3,21 @@ importer="texture" type="StreamTexture2D" uid="uid://bcdqkek53tlin" -path="res://.godot/imported/dev_blue.png-a8c55308fe08aecc6efa233d28d8c802.stex" +path.s3tc="res://.godot/imported/dev_blue.png-a8c55308fe08aecc6efa233d28d8c802.s3tc.stex" +path.etc2="res://.godot/imported/dev_blue.png-a8c55308fe08aecc6efa233d28d8c802.etc2.stex" metadata={ -"vram_texture": false +"imported_formats": ["s3tc", "etc2"], +"vram_texture": true } [deps] source_file="res://Assets/Maps/Materials/dev_materials/textures/dev_blue.png" -dest_files=["res://.godot/imported/dev_blue.png-a8c55308fe08aecc6efa233d28d8c802.stex"] +dest_files=["res://.godot/imported/dev_blue.png-a8c55308fe08aecc6efa233d28d8c802.s3tc.stex", "res://.godot/imported/dev_blue.png-a8c55308fe08aecc6efa233d28d8c802.etc2.stex"] [params] -compress/mode=3 +compress/mode=2 compress/lossy_quality=0.7 compress/hdr_compression=1 compress/bptc_ldr=0 diff --git a/Game/Assets/Maps/Materials/dev_materials/textures/dev_brown.png.import b/Game/Assets/Maps/Materials/dev_materials/textures/dev_brown.png.import index bcff6a0..2ec6e3f 100644 --- a/Game/Assets/Maps/Materials/dev_materials/textures/dev_brown.png.import +++ b/Game/Assets/Maps/Materials/dev_materials/textures/dev_brown.png.import @@ -3,19 +3,21 @@ importer="texture" type="StreamTexture2D" uid="uid://dew54sy6p74q" -path="res://.godot/imported/dev_brown.png-18ad5017b06e977cbc293279d325fd2b.stex" +path.s3tc="res://.godot/imported/dev_brown.png-18ad5017b06e977cbc293279d325fd2b.s3tc.stex" +path.etc2="res://.godot/imported/dev_brown.png-18ad5017b06e977cbc293279d325fd2b.etc2.stex" metadata={ -"vram_texture": false +"imported_formats": ["s3tc", "etc2"], +"vram_texture": true } [deps] source_file="res://Assets/Maps/Materials/dev_materials/textures/dev_brown.png" -dest_files=["res://.godot/imported/dev_brown.png-18ad5017b06e977cbc293279d325fd2b.stex"] +dest_files=["res://.godot/imported/dev_brown.png-18ad5017b06e977cbc293279d325fd2b.s3tc.stex", "res://.godot/imported/dev_brown.png-18ad5017b06e977cbc293279d325fd2b.etc2.stex"] [params] -compress/mode=3 +compress/mode=2 compress/lossy_quality=0.7 compress/hdr_compression=1 compress/bptc_ldr=0 diff --git a/Game/Assets/Maps/Materials/dev_materials/textures/dev_green.png.import b/Game/Assets/Maps/Materials/dev_materials/textures/dev_green.png.import index 2ccf73c..cad7c5a 100644 --- a/Game/Assets/Maps/Materials/dev_materials/textures/dev_green.png.import +++ b/Game/Assets/Maps/Materials/dev_materials/textures/dev_green.png.import @@ -3,19 +3,21 @@ importer="texture" type="StreamTexture2D" uid="uid://cvqie6lkm44j6" -path="res://.godot/imported/dev_green.png-72568f96bb9f1ce9fdb38c53035b5061.stex" +path.s3tc="res://.godot/imported/dev_green.png-72568f96bb9f1ce9fdb38c53035b5061.s3tc.stex" +path.etc2="res://.godot/imported/dev_green.png-72568f96bb9f1ce9fdb38c53035b5061.etc2.stex" metadata={ -"vram_texture": false +"imported_formats": ["s3tc", "etc2"], +"vram_texture": true } [deps] source_file="res://Assets/Maps/Materials/dev_materials/textures/dev_green.png" -dest_files=["res://.godot/imported/dev_green.png-72568f96bb9f1ce9fdb38c53035b5061.stex"] +dest_files=["res://.godot/imported/dev_green.png-72568f96bb9f1ce9fdb38c53035b5061.s3tc.stex", "res://.godot/imported/dev_green.png-72568f96bb9f1ce9fdb38c53035b5061.etc2.stex"] [params] -compress/mode=3 +compress/mode=2 compress/lossy_quality=0.7 compress/hdr_compression=1 compress/bptc_ldr=0 diff --git a/Game/Assets/Maps/Materials/dev_materials/textures/dev_grey_dark.png.import b/Game/Assets/Maps/Materials/dev_materials/textures/dev_grey_dark.png.import index ca59695..9994826 100644 --- a/Game/Assets/Maps/Materials/dev_materials/textures/dev_grey_dark.png.import +++ b/Game/Assets/Maps/Materials/dev_materials/textures/dev_grey_dark.png.import @@ -3,19 +3,21 @@ importer="texture" type="StreamTexture2D" uid="uid://ccue6q8bujhlw" -path="res://.godot/imported/dev_grey_dark.png-f3291c60b17d57f1feda5b8d0d1a711a.stex" +path.s3tc="res://.godot/imported/dev_grey_dark.png-f3291c60b17d57f1feda5b8d0d1a711a.s3tc.stex" +path.etc2="res://.godot/imported/dev_grey_dark.png-f3291c60b17d57f1feda5b8d0d1a711a.etc2.stex" metadata={ -"vram_texture": false +"imported_formats": ["s3tc", "etc2"], +"vram_texture": true } [deps] source_file="res://Assets/Maps/Materials/dev_materials/textures/dev_grey_dark.png" -dest_files=["res://.godot/imported/dev_grey_dark.png-f3291c60b17d57f1feda5b8d0d1a711a.stex"] +dest_files=["res://.godot/imported/dev_grey_dark.png-f3291c60b17d57f1feda5b8d0d1a711a.s3tc.stex", "res://.godot/imported/dev_grey_dark.png-f3291c60b17d57f1feda5b8d0d1a711a.etc2.stex"] [params] -compress/mode=3 +compress/mode=2 compress/lossy_quality=0.7 compress/hdr_compression=1 compress/bptc_ldr=0 diff --git a/Game/Assets/Maps/Materials/dev_materials/textures/dev_grey_light.png.import b/Game/Assets/Maps/Materials/dev_materials/textures/dev_grey_light.png.import index 40509c6..6ada03d 100644 --- a/Game/Assets/Maps/Materials/dev_materials/textures/dev_grey_light.png.import +++ b/Game/Assets/Maps/Materials/dev_materials/textures/dev_grey_light.png.import @@ -3,19 +3,21 @@ importer="texture" type="StreamTexture2D" uid="uid://b66vy1kyrqiha" -path="res://.godot/imported/dev_grey_light.png-13f76402b98ab37da37362241626de6b.stex" +path.s3tc="res://.godot/imported/dev_grey_light.png-13f76402b98ab37da37362241626de6b.s3tc.stex" +path.etc2="res://.godot/imported/dev_grey_light.png-13f76402b98ab37da37362241626de6b.etc2.stex" metadata={ -"vram_texture": false +"imported_formats": ["s3tc", "etc2"], +"vram_texture": true } [deps] source_file="res://Assets/Maps/Materials/dev_materials/textures/dev_grey_light.png" -dest_files=["res://.godot/imported/dev_grey_light.png-13f76402b98ab37da37362241626de6b.stex"] +dest_files=["res://.godot/imported/dev_grey_light.png-13f76402b98ab37da37362241626de6b.s3tc.stex", "res://.godot/imported/dev_grey_light.png-13f76402b98ab37da37362241626de6b.etc2.stex"] [params] -compress/mode=3 +compress/mode=2 compress/lossy_quality=0.7 compress/hdr_compression=1 compress/bptc_ldr=0 diff --git a/Game/Assets/Maps/Materials/dev_materials/textures/dev_orange.png.import b/Game/Assets/Maps/Materials/dev_materials/textures/dev_orange.png.import index 65ea15e..2228d24 100644 --- a/Game/Assets/Maps/Materials/dev_materials/textures/dev_orange.png.import +++ b/Game/Assets/Maps/Materials/dev_materials/textures/dev_orange.png.import @@ -3,19 +3,21 @@ importer="texture" type="StreamTexture2D" uid="uid://cgmcu1ri2xn3q" -path="res://.godot/imported/dev_orange.png-c6ae1fc77ad705d5315d8d3f16b4a990.stex" +path.s3tc="res://.godot/imported/dev_orange.png-c6ae1fc77ad705d5315d8d3f16b4a990.s3tc.stex" +path.etc2="res://.godot/imported/dev_orange.png-c6ae1fc77ad705d5315d8d3f16b4a990.etc2.stex" metadata={ -"vram_texture": false +"imported_formats": ["s3tc", "etc2"], +"vram_texture": true } [deps] source_file="res://Assets/Maps/Materials/dev_materials/textures/dev_orange.png" -dest_files=["res://.godot/imported/dev_orange.png-c6ae1fc77ad705d5315d8d3f16b4a990.stex"] +dest_files=["res://.godot/imported/dev_orange.png-c6ae1fc77ad705d5315d8d3f16b4a990.s3tc.stex", "res://.godot/imported/dev_orange.png-c6ae1fc77ad705d5315d8d3f16b4a990.etc2.stex"] [params] -compress/mode=3 +compress/mode=2 compress/lossy_quality=0.7 compress/hdr_compression=1 compress/bptc_ldr=0 diff --git a/Game/Assets/Maps/Materials/dev_materials/textures/dev_red.png.import b/Game/Assets/Maps/Materials/dev_materials/textures/dev_red.png.import index 62628bc..d454c0e 100644 --- a/Game/Assets/Maps/Materials/dev_materials/textures/dev_red.png.import +++ b/Game/Assets/Maps/Materials/dev_materials/textures/dev_red.png.import @@ -3,19 +3,21 @@ importer="texture" type="StreamTexture2D" uid="uid://bfhbrpbhhgnlr" -path="res://.godot/imported/dev_red.png-d8f859caabc8153275c8e322aad74fea.stex" +path.s3tc="res://.godot/imported/dev_red.png-d8f859caabc8153275c8e322aad74fea.s3tc.stex" +path.etc2="res://.godot/imported/dev_red.png-d8f859caabc8153275c8e322aad74fea.etc2.stex" metadata={ -"vram_texture": false +"imported_formats": ["s3tc", "etc2"], +"vram_texture": true } [deps] source_file="res://Assets/Maps/Materials/dev_materials/textures/dev_red.png" -dest_files=["res://.godot/imported/dev_red.png-d8f859caabc8153275c8e322aad74fea.stex"] +dest_files=["res://.godot/imported/dev_red.png-d8f859caabc8153275c8e322aad74fea.s3tc.stex", "res://.godot/imported/dev_red.png-d8f859caabc8153275c8e322aad74fea.etc2.stex"] [params] -compress/mode=3 +compress/mode=2 compress/lossy_quality=0.7 compress/hdr_compression=1 compress/bptc_ldr=0 diff --git a/Game/Assets/Maps/Materials/dev_materials/textures/dev_red_dark.png.import b/Game/Assets/Maps/Materials/dev_materials/textures/dev_red_dark.png.import index 6925f7c..26d6692 100644 --- a/Game/Assets/Maps/Materials/dev_materials/textures/dev_red_dark.png.import +++ b/Game/Assets/Maps/Materials/dev_materials/textures/dev_red_dark.png.import @@ -3,19 +3,21 @@ importer="texture" type="StreamTexture2D" uid="uid://dla747jbp0abb" -path="res://.godot/imported/dev_red_dark.png-3a56b899a76c212f39d2d38f2d4b6086.stex" +path.s3tc="res://.godot/imported/dev_red_dark.png-3a56b899a76c212f39d2d38f2d4b6086.s3tc.stex" +path.etc2="res://.godot/imported/dev_red_dark.png-3a56b899a76c212f39d2d38f2d4b6086.etc2.stex" metadata={ -"vram_texture": false +"imported_formats": ["s3tc", "etc2"], +"vram_texture": true } [deps] source_file="res://Assets/Maps/Materials/dev_materials/textures/dev_red_dark.png" -dest_files=["res://.godot/imported/dev_red_dark.png-3a56b899a76c212f39d2d38f2d4b6086.stex"] +dest_files=["res://.godot/imported/dev_red_dark.png-3a56b899a76c212f39d2d38f2d4b6086.s3tc.stex", "res://.godot/imported/dev_red_dark.png-3a56b899a76c212f39d2d38f2d4b6086.etc2.stex"] [params] -compress/mode=3 +compress/mode=2 compress/lossy_quality=0.7 compress/hdr_compression=1 compress/bptc_ldr=0 diff --git a/Game/Assets/UI/ConnectMenu.tscn b/Game/Assets/UI/ConnectMenu.tscn index 39b5f08..e217f50 100644 --- a/Game/Assets/UI/ConnectMenu.tscn +++ b/Game/Assets/UI/ConnectMenu.tscn @@ -1,17 +1,24 @@ -[gd_scene load_steps=5 format=3 uid="uid://dl04vkws76mj5"] +[gd_scene load_steps=7 format=3 uid="uid://dl04vkws76mj5"] [ext_resource type="PackedScene" uid="uid://81ymy0o073e5" path="res://Assets/UI/Menu.tscn" id="1_cf8yy"] [ext_resource type="PackedScene" uid="uid://xptjyy2hwb77" path="res://Assets/UI/MenuLineEdit.tscn" id="2_isg6p"] [ext_resource type="PackedScene" uid="uid://d135tevauvmoq" path="res://Assets/UI/MenuButton.tscn" id="2_n4o24"] [ext_resource type="Script" path="res://Assets/UI/ConnectMenu.gd" id="2_wk4wj"] +[sub_resource type="InputEventKey" id="InputEventKey_7k4wy"] +store_command = false +keycode = 67 + +[sub_resource type="Shortcut" id="Shortcut_vswga"] +events = [SubResource( "InputEventKey_7k4wy" )] + [node name="ConnectMenu" instance=ExtResource( "1_cf8yy" )] script = ExtResource( "2_wk4wj" ) [node name="MenuLineEdit" parent="." index="0" instance=ExtResource( "2_isg6p" )] anchor_right = 0.0 anchor_bottom = 0.0 -offset_right = 155.0 +offset_right = 250.0 offset_bottom = 33.0 label = "ip" index = "ip" @@ -20,14 +27,14 @@ index = "ip" anchor_right = 0.0 anchor_bottom = 0.0 offset_top = 37.0 -offset_right = 155.0 +offset_right = 250.0 offset_bottom = 66.0 +shortcut = SubResource( "Shortcut_vswga" ) text = "connect" label = "connect" [node name="Back" parent="." index="2"] offset_top = 70.0 -offset_right = 155.0 offset_bottom = 99.0 [connection signal="pressed" from="Connect" to="." method="connect_to_server"] diff --git a/Game/Assets/UI/GUI.tscn b/Game/Assets/UI/GUI.tscn index d65f27b..f809e6b 100644 --- a/Game/Assets/UI/GUI.tscn +++ b/Game/Assets/UI/GUI.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=6 format=3 uid="uid://b856vwmg8a6o4"] +[gd_scene load_steps=8 format=3 uid="uid://b856vwmg8a6o4"] [ext_resource type="PackedScene" uid="uid://d135tevauvmoq" path="res://Assets/UI/MenuButton.tscn" id="1"] [ext_resource type="PackedScene" uid="uid://81ymy0o073e5" path="res://Assets/UI/Menu.tscn" id="2"] @@ -6,11 +6,20 @@ [ext_resource type="Script" path="res://Assets/UI/GUI.gd" id="3"] [ext_resource type="AudioStream" uid="uid://dpjwcruomxgkk" path="res://Assets/SFX/UI_Cancel.wav" id="4_lnh50"] +[sub_resource type="InputEventKey" id="InputEventKey_qll7y"] +store_command = false +keycode = 80 + +[sub_resource type="Shortcut" id="Shortcut_jxeso"] +events = [SubResource( "InputEventKey_qll7y" )] + [node name="GUI" type="VBoxContainer"] anchor_right = 1.0 anchor_bottom = 1.0 offset_top = 20.0 offset_bottom = -20.0 +rect_min_size = Vector2(250, 250) +mouse_filter = 0 alignment = 1 script = ExtResource( "3" ) __meta__ = { @@ -29,28 +38,28 @@ __meta__ = { } [node name="ScrollContainer" type="ScrollContainer" parent="."] -offset_left = 387.0 offset_top = 201.0 -offset_right = 637.0 +offset_right = 1024.0 offset_bottom = 560.0 -size_flags_horizontal = 6 -size_flags_vertical = 3 +grow_horizontal = 2 +grow_vertical = 2 +size_flags_horizontal = 5 +size_flags_vertical = 7 follow_focus = true -scroll_horizontal_enabled = false -scroll_horizontal_visible = false [node name="Menu" parent="ScrollContainer" instance=ExtResource( "2" )] offset_left = 0.0 offset_top = 0.0 offset_right = 250.0 -offset_bottom = 128.0 +offset_bottom = 359.0 [node name="Play" parent="ScrollContainer/Menu" instance=ExtResource( "1" )] anchor_right = 0.0 anchor_bottom = 0.0 -offset_top = 33.0 +offset_top = 148.0 offset_right = 250.0 -offset_bottom = 62.0 +offset_bottom = 177.0 +shortcut = SubResource( "Shortcut_jxeso" ) text = "play " label = "play" @@ -58,19 +67,18 @@ label = "play" [node name="Options" parent="ScrollContainer/Menu" instance=ExtResource( "1" )] anchor_right = 0.0 anchor_bottom = 0.0 -offset_top = 66.0 +offset_top = 181.0 offset_right = 250.0 -offset_bottom = 95.0 -theme_override_font_sizes/font_size = 16 +offset_bottom = 210.0 text = "options" label = "options" [node name="Quit" parent="ScrollContainer/Menu" instance=ExtResource( "1" )] anchor_right = 0.0 anchor_bottom = 0.0 -offset_top = 99.0 +offset_top = 214.0 offset_right = 250.0 -offset_bottom = 128.0 +offset_bottom = 243.0 text = "quit" label = "quit" diff --git a/Game/Assets/UI/Menu.tscn b/Game/Assets/UI/Menu.tscn index a30fe84..2e65ec3 100644 --- a/Game/Assets/UI/Menu.tscn +++ b/Game/Assets/UI/Menu.tscn @@ -1,9 +1,11 @@ -[gd_scene load_steps=4 format=3 uid="uid://81ymy0o073e5"] +[gd_scene load_steps=5 format=3 uid="uid://81ymy0o073e5"] [ext_resource type="Script" path="res://Assets/UI/Menu.gd" id="1"] [ext_resource type="AudioStream" uid="uid://da7hq3d1msmud" path="res://Assets/SFX/UI_Click.wav" id="2_nkrit"] [ext_resource type="AudioStream" uid="uid://dc4rractm5dhf" path="res://Assets/SFX/UI_Hover.wav" id="3_qqhse"] +[sub_resource type="Shortcut" id="Shortcut_58c54"] + [node name="Menu" type="VBoxContainer"] offset_left = 475.0 offset_top = 269.0 @@ -21,6 +23,7 @@ __meta__ = { offset_top = 16.0 offset_right = 250.0 offset_bottom = 45.0 +shortcut = SubResource( "Shortcut_58c54" ) text = "back " diff --git a/Game/Assets/UI/MenuButton.tscn b/Game/Assets/UI/MenuButton.tscn index 17c5f23..251f075 100644 --- a/Game/Assets/UI/MenuButton.tscn +++ b/Game/Assets/UI/MenuButton.tscn @@ -7,6 +7,7 @@ [node name="MenuButton" type="Button"] anchor_right = 1.0 anchor_bottom = 1.0 +theme_override_font_sizes/font_size = 16 script = ExtResource( "1" ) __meta__ = { "_edit_use_anchors_": false diff --git a/Game/Assets/UI/MenuSlider.tscn b/Game/Assets/UI/MenuSlider.tscn index dc1580a..4cd69e4 100644 --- a/Game/Assets/UI/MenuSlider.tscn +++ b/Game/Assets/UI/MenuSlider.tscn @@ -1,8 +1,8 @@ [gd_scene load_steps=4 format=3 uid="uid://bwqwic7ex6muv"] [ext_resource type="Script" path="res://Assets/UI/MenuSlider.gd" id="1_vhxwo"] -[ext_resource type="AudioStream" uid="uid://tmb3cqyy8s33" path="res://Assets/SFX/UI_Click.wav" id="2_weawk"] -[ext_resource type="AudioStream" uid="uid://dvfvty8gqab0a" path="res://Assets/SFX/UI_Hover.wav" id="3_b58yr"] +[ext_resource type="AudioStream" uid="uid://da7hq3d1msmud" path="res://Assets/SFX/UI_Click.wav" id="2_weawk"] +[ext_resource type="AudioStream" uid="uid://dc4rractm5dhf" path="res://Assets/SFX/UI_Hover.wav" id="3_b58yr"] [node name="MenuSlider" type="HBoxContainer"] anchor_right = 1.0 @@ -17,8 +17,6 @@ offset_top = 288.0 offset_right = 510.0 offset_bottom = 311.0 size_flags_horizontal = 3 -structured_text_bidi_override_options = [] -script = null [node name="Slider" type="HSlider" parent="."] offset_left = 514.0 @@ -27,16 +25,13 @@ offset_bottom = 16.0 rect_min_size = Vector2(200, 0) rect_pivot_offset = Vector2(-908, 0) size_flags_horizontal = 3 -script = null [node name="ClickSound" type="AudioStreamPlayer" parent="."] stream = ExtResource( "2_weawk" ) volume_db = -12.0 -script = null [node name="HoverSound" type="AudioStreamPlayer" parent="."] stream = ExtResource( "3_b58yr" ) -script = null [connection signal="mouse_entered" from="Slider" to="." method="_on_Slider_mouse_entered"] [connection signal="value_changed" from="Slider" to="." method="on_value_changed"] diff --git a/Game/Assets/UI/PlayMenu.tscn b/Game/Assets/UI/PlayMenu.tscn index 32c8230..244d9a5 100644 --- a/Game/Assets/UI/PlayMenu.tscn +++ b/Game/Assets/UI/PlayMenu.tscn @@ -1,9 +1,16 @@ -[gd_scene load_steps=4 format=3 uid="uid://cc62u7shucxqi"] +[gd_scene load_steps=6 format=3 uid="uid://cc62u7shucxqi"] [ext_resource type="PackedScene" uid="uid://81ymy0o073e5" path="res://Assets/UI/Menu.tscn" id="1_21oe2"] [ext_resource type="PackedScene" uid="uid://d135tevauvmoq" path="res://Assets/UI/MenuButton.tscn" id="2_oo0fl"] [ext_resource type="Script" path="res://Assets/UI/PlayMenu.gd" id="2_pgqlf"] +[sub_resource type="InputEventKey" id="InputEventKey_7k4wy"] +store_command = false +keycode = 67 + +[sub_resource type="Shortcut" id="Shortcut_vswga"] +events = [SubResource( "InputEventKey_7k4wy" )] + [node name="PlayMenu" instance=ExtResource( "1_21oe2" )] script = ExtResource( "2_pgqlf" ) @@ -21,6 +28,7 @@ anchor_bottom = 0.0 offset_top = 33.0 offset_right = 250.0 offset_bottom = 62.0 +shortcut = SubResource( "Shortcut_vswga" ) text = "connect" label = "connect" @@ -39,7 +47,6 @@ anchor_bottom = 0.0 offset_top = 99.0 offset_right = 250.0 offset_bottom = 128.0 -theme_override_font_sizes/font_size = 16 text = "commit suicide" label = "commit suicide" diff --git a/Game/Assets/UI/ProfileMenu.tscn b/Game/Assets/UI/ProfileMenu.tscn index 7d970c7..34bc7c7 100644 --- a/Game/Assets/UI/ProfileMenu.tscn +++ b/Game/Assets/UI/ProfileMenu.tscn @@ -11,7 +11,7 @@ script = ExtResource( "2_5v3ua" ) [node name="UsernameLineEdit" parent="." index="0" instance=ExtResource( "2_ghv7j" )] anchor_right = 0.0 anchor_bottom = 0.0 -offset_right = 155.0 +offset_right = 250.0 offset_bottom = 33.0 label = "username" index = "username" @@ -21,14 +21,13 @@ anchor_right = 0.0 anchor_bottom = 0.0 offset_left = 0.0 offset_top = 37.0 -offset_right = 155.0 +offset_right = 250.0 offset_bottom = 66.0 label = "player color" index = "player color" [node name="Back" parent="." index="2"] offset_top = 70.0 -offset_right = 155.0 offset_bottom = 99.0 [connection signal="data_changed" from="UsernameLineEdit" to="." method="change_player_name"] diff --git a/Game/Main.gd b/Game/Main.gd index 8958bd5..732e57d 100644 --- a/Game/Main.gd +++ b/Game/Main.gd @@ -5,6 +5,8 @@ enum MultiplayerRole {NONE, CLIENT, SERVER, DEDICATED_SERVER, RELAY_SERVER} const NET_PORT = 12597 +var server_message : String +var version : String #const NET_SERVER = "liblast.unfa.xyz" const NET_SERVER = "localhost" @@ -489,7 +491,7 @@ func _player_connected(pid) -> void: for i in player_list.players.keys(): # send the player_list to the new client #pass rpc_id(pid, &'player_list_update', player_list.get(i).serialize(), i) # send local player info to the server - + chat.rpc_id(pid, &'chat_notification', server_message) # if local_player: # local_player.rpc(&"update_info") # @@ -528,7 +530,9 @@ func _server_disconnected() -> void: func _ready() -> void: hud.hide() # start in the menu - focus = GameFocus.MENU +# focus = GameFocus.MENU + focus = GameFocus.GAME + local_player_focus_previous = focus get_tree().multiplayer.connect("peer_connected", self._player_connected) get_tree().multiplayer.connect("peer_disconnected", self._player_disconnected) @@ -536,10 +540,26 @@ func _ready() -> void: get_tree().multiplayer.connect("connection_failed", self._connected_fail) get_tree().multiplayer.connect("server_disconnected", self._server_disconnected) - if OS.get_cmdline_args().has("--dedicated-server"): - start_dedicated_server() + # update game build version, if we're running in the editor + if Engine.get_version_info(): + OS.execute('bash', ["./version.sh"]) + + var file = File.new() + file.open("res://version", File.READ) + version = file.get_as_text() + file.close() + + var out = [] + OS.execute('hostname', [], out) + + var ev = Engine.get_version_info() + server_message = "Welcome to Liblast server on " + out[0] + "game version: " + version + "\nengine version: " + ev['string'] + " [" + ev['hash'].left(10) + "]" $Announcer.speak($Announcer.welcome) + + if OS.get_cmdline_args().has("--dedicated-server"): + start_dedicated_server() + print(server_message) func change_player_color(color): if get_tree().multiplayer.has_multiplayer_peer(): diff --git a/Game/Main.tscn b/Game/Main.tscn index a307fc6..210531a 100644 --- a/Game/Main.tscn +++ b/Game/Main.tscn @@ -1,11 +1,11 @@ [gd_scene load_steps=23 format=3 uid="uid://o68cawatyat2"] -[ext_resource type="PackedScene" uid="uid://b1078bn8gy2qf" path="res://Map.tscn" id="1"] [ext_resource type="PackedScene" uid="uid://b856vwmg8a6o4" path="res://Assets/UI/GUI.tscn" id="2"] [ext_resource type="Script" path="res://Main.gd" id="3"] [ext_resource type="PackedScene" uid="uid://bs80rhfpgh2m2" path="res://Assets/HUD/HUD.tscn" id="4"] [ext_resource type="AudioStream" uid="uid://j42e203vte7h" path="res://Assets/Announcer/Go.wav" id="5_ilayd"] [ext_resource type="Script" path="res://Assets/Announcer/Announcer.gd" id="6_gcsgr"] +[ext_resource type="PackedScene" uid="uid://b7txmrrvh1q4e" path="res://Assets/Maps/MapA.tscn" id="7_yvic5"] [sub_resource type="VisualShaderNodeFloatFunc" id="VisualShaderNodeFloatFunc_6ihsi"] function = 31 @@ -194,15 +194,16 @@ theme_override_font_sizes/font_size = 30 offset_top = 49.0 [node name="GUI" parent="." instance=ExtResource( "2" )] +anchor_left = 0.1 +anchor_top = 0.1 +anchor_right = 0.9 +anchor_bottom = 0.9 [node name="Players" type="Node3D" parent="."] __meta__ = { "_edit_lock_": true } -[node name="Map" parent="." instance=ExtResource( "1" )] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 1) - [node name="NetworkTesting" type="VBoxContainer" parent="."] visible = false anchor_left = 1.0 @@ -272,6 +273,8 @@ stream = ExtResource( "5_ilayd" ) bus = &"Announcer" script = ExtResource( "6_gcsgr" ) +[node name="Map" parent="." instance=ExtResource( "7_yvic5" )] + [connection signal="toggled" from="NetworkTesting/CheckButton" to="." method="_on_CheckButton_toggled"] [connection signal="pressed" from="NetworkTesting/Host" to="." method="_on_Host_pressed"] [connection signal="pressed" from="NetworkTesting/Connect" to="." method="_on_Connect_pressed"] diff --git a/Game/Map.tscn b/Game/Map.tscn index 05f132f..1ee6d36 100644 --- a/Game/Map.tscn +++ b/Game/Map.tscn @@ -103,10 +103,7 @@ __meta__ = { "_edit_lock_": true } -[node name="GPUParticlesCollisionSDF" type="GPUParticlesCollisionSDF" parent="ParticlesCollision"] -cull_mask = 4293918721 -extents = Vector3(64, 64, 64) -resolution = 3 +[node name="GPUParticlesCollisionSDF" type="Node" parent="ParticlesCollision"] __meta__ = { "_edit_lock_": true } diff --git a/Game/default_bus_layout.tres b/Game/default_bus_layout.tres index b7f4ef7..ebcecf6 100644 --- a/Game/default_bus_layout.tres +++ b/Game/default_bus_layout.tres @@ -1,4 +1,4 @@ -[gd_resource type="AudioBusLayout" load_steps=8 format=3 uid="uid://c3pepi7cu2nqa"] +[gd_resource type="AudioBusLayout" load_steps=8 format=3 uid="uid://cmdeg2i2mxmuk"] [sub_resource type="AudioEffectLimiter" id="AudioEffectLimiter_34kb8"] resource_name = "Limiter" diff --git a/Game/export_presets.cfg b/Game/export_presets.cfg index 60f846a..022c3b3 100644 --- a/Game/export_presets.cfg +++ b/Game/export_presets.cfg @@ -5,14 +5,14 @@ platform="Linux/X11" runnable=true custom_features="" export_filter="all_resources" -include_filter="*.wav, *.sample" +include_filter="*.wav, *.sample, version" exclude_filter="" -export_path="Builds/Liblast Linux.x86_64" +export_path="Builds/Server/Liblast Linux.x86_64" encryption_include_filters="" encryption_exclude_filters="" encrypt_pck=false encrypt_directory=false -script_export_mode=0 +script_export_mode=1 script_encryption_key="" [preset.0.options] diff --git a/Game/project.godot b/Game/project.godot index 13db180..20495f5 100644 --- a/Game/project.godot +++ b/Game/project.godot @@ -56,7 +56,7 @@ import/fbx/use_fbx=false [importer_defaults] texture={ -"compress/mode": 3 +"compress/mode": 2 } [input] diff --git a/Godot/godot-linux-nightly-x86_64.zip b/Godot/godot-linux-nightly-x86_64.zip index a77db30..d6e89cd 100644 --- a/Godot/godot-linux-nightly-x86_64.zip +++ b/Godot/godot-linux-nightly-x86_64.zip @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:0147e1ddb94de3bd8d6926af7306cfe2dd7b4005a9c8b4a096197c72f365b35f -size 264230226 +oid sha256:e4b634331cc1601707d943732556a153028303f14d7d243a9140408e493900f5 +size 263765519 diff --git a/Godot/godot-templates-android-html5-linux-windows-nightly.tpz b/Godot/godot-templates-android-html5-linux-windows-nightly.tpz new file mode 100644 index 0000000..d2888fa Binary files /dev/null and b/Godot/godot-templates-android-html5-linux-windows-nightly.tpz differ diff --git a/Godot/godot-windows-nightly-x86_64.zip b/Godot/godot-windows-nightly-x86_64.zip index d429fd3..7a8cc2f 100644 --- a/Godot/godot-windows-nightly-x86_64.zip +++ b/Godot/godot-windows-nightly-x86_64.zip @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:4baae1ff6fe1f22ca4350ed793cc611362c7a5a5daf9e3d90ace97a4e1e5c04b -size 191618760 +oid sha256:62ba660c6aa91d0c143871ee9374a6e3593242b5cdee97e11b01dff4c3caf1fe +size 191156582