Updated the bracnh to the best playable state from after the team meeting

1. Disabled VoxelGI
2. Disabled shell casing
3. Disabled SSAO
4. Lowered shadow quality and tweaked the lighting
5. Added a single reflection probe for contrast
6. Bumped the version to 0.1.1.1-pre-alpha
This is a botch but it's the best version of the game right now.
DM1_temp_test 0.1.1.1-pre-alpha
unfa 2021-12-04 16:17:29 +01:00
parent 535a11bf3f
commit 373214dbd5
9 changed files with 99 additions and 103 deletions

View File

@ -34,4 +34,4 @@ func _process(delta):
text += "\nFPS: " + str(Engine.get_frames_per_second())
text += "\nLiblast 0.1.1 pre-alpha"
text += "\nLiblast 0.1.1.1 pre-alpha"

View File

@ -1,13 +1,13 @@
[gd_scene load_steps=130 format=3 uid="uid://bdp8jwqxbki0m"]
[ext_resource type="Material" uid="uid://cswmc7u2vis0x" path="res://Assets/Maps/Materials/dev_materials/dev_blue.material" id="1_wxym2"]
[ext_resource type="Material" path="res://Assets/Maps/Materials/dev_materials/dev_orange.material" id="2_fdkvc"]
[ext_resource type="Material" path="res://Assets/Maps/Materials/dev_materials/dev_red.material" id="3_svtxp"]
[ext_resource type="Material" path="res://Assets/Maps/Materials/dev_materials/dev_red_dark.material" id="4_0sn1m"]
[ext_resource type="Material" path="res://Assets/Maps/Materials/dev_materials/dev_grey_dark.material" id="5_jyl6e"]
[ext_resource type="Material" path="res://Assets/Maps/Materials/dev_materials/dev_green.material" id="6_qc75x"]
[ext_resource type="Material" path="res://Assets/Maps/Materials/dev_materials/dev_brown.material" id="7_uplhy"]
[ext_resource type="Material" path="res://Assets/Maps/Materials/dev_materials/dev_grey_light.material" id="8_4lr4g"]
[ext_resource type="Material" uid="uid://bpv2blin3m8wm" path="res://Assets/Maps/DM1/dev_blue.material" id="1_glnpr"]
[ext_resource type="Material" path="res://Assets/Maps/DM1/dev_brown.material" id="2_ehbbg"]
[ext_resource type="Material" path="res://Assets/Maps/DM1/dev_green.material" id="3_au0we"]
[ext_resource type="Material" path="res://Assets/Maps/DM1/dev_grey_dark.material" id="4_j47ey"]
[ext_resource type="Material" path="res://Assets/Maps/DM1/dev_grey_light.material" id="5_5hcr4"]
[ext_resource type="Material" path="res://Assets/Maps/DM1/dev_orange.material" id="6_bjgvg"]
[ext_resource type="Material" path="res://Assets/Maps/DM1/dev_red_dark.material" id="7_3hyn0"]
[ext_resource type="Material" path="res://Assets/Maps/DM1/dev_red.material" id="8_0pdw2"]
[sub_resource type="StandardMaterial3D" id="StandardMaterial3D_kh2p0"]
@ -979,10 +979,10 @@ data = PackedVector3Array(7, -4, 10, 13, 3.7, 10, 13, -4, 10, 7, -4, 10, 7, 3.7,
gi_mode = 1
mesh = SubResource( "ArrayMesh_b7hyh" )
skeleton = NodePath("")
surface_material_override/0 = ExtResource( "1_wxym2" )
surface_material_override/1 = ExtResource( "2_fdkvc" )
surface_material_override/2 = ExtResource( "3_svtxp" )
surface_material_override/3 = ExtResource( "4_0sn1m" )
surface_material_override/0 = ExtResource( "1_glnpr" )
surface_material_override/1 = ExtResource( "2_ehbbg" )
surface_material_override/2 = ExtResource( "3_au0we" )
surface_material_override/3 = ExtResource( "4_j47ey" )
[node name="StaticBody3D" type="StaticBody3D" parent="Main 022"]
@ -993,7 +993,7 @@ shape = SubResource( "ConcavePolygonShape3D_5tnln" )
gi_mode = 1
mesh = SubResource( "ArrayMesh_7x7sf" )
skeleton = NodePath("")
surface_material_override/0 = ExtResource( "1_wxym2" )
surface_material_override/0 = ExtResource( "5_5hcr4" )
[node name="StaticBody3D" type="StaticBody3D" parent="Main 031"]
@ -1005,9 +1005,9 @@ transform = Transform3D(0.707107, 0, 0.707107, 0, 1, 0, -0.707107, 0, 0.707107,
gi_mode = 1
mesh = SubResource( "ArrayMesh_4uy7e" )
skeleton = NodePath("")
surface_material_override/0 = ExtResource( "1_wxym2" )
surface_material_override/1 = ExtResource( "3_svtxp" )
surface_material_override/2 = ExtResource( "5_jyl6e" )
surface_material_override/0 = ExtResource( "6_bjgvg" )
surface_material_override/1 = ExtResource( "3_au0we" )
surface_material_override/2 = ExtResource( "1_glnpr" )
[node name="StaticBody3D" type="StaticBody3D" parent="Main 032"]
@ -1018,7 +1018,7 @@ shape = SubResource( "ConcavePolygonShape3D_ioni6" )
gi_mode = 1
mesh = SubResource( "ArrayMesh_8uc48" )
skeleton = NodePath("")
surface_material_override/0 = ExtResource( "1_wxym2" )
surface_material_override/0 = ExtResource( "6_bjgvg" )
[node name="StaticBody3D" type="StaticBody3D" parent="Main 033"]
@ -1030,8 +1030,8 @@ transform = Transform3D(0, 0, 1, 0, 1, 0, -1, 0, 0, 37, -2, 16)
gi_mode = 1
mesh = SubResource( "ArrayMesh_su43k" )
skeleton = NodePath("")
surface_material_override/0 = ExtResource( "1_wxym2" )
surface_material_override/1 = ExtResource( "6_qc75x" )
surface_material_override/0 = ExtResource( "2_ehbbg" )
surface_material_override/1 = ExtResource( "1_glnpr" )
[node name="StaticBody3D" type="StaticBody3D" parent="Main 034"]
@ -1043,19 +1043,19 @@ transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 2, 11, -6)
gi_mode = 1
mesh = SubResource( "ArrayMesh_ljwhl" )
skeleton = NodePath("")
surface_material_override/0 = ExtResource( "7_uplhy" )
surface_material_override/1 = ExtResource( "6_qc75x" )
surface_material_override/0 = ExtResource( "7_3hyn0" )
surface_material_override/1 = ExtResource( "4_j47ey" )
[node name="Main 035" type="MeshInstance3D" parent="."]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -2, 2, 28)
gi_mode = 1
mesh = SubResource( "ArrayMesh_djrpy" )
skeleton = NodePath("")
surface_material_override/0 = ExtResource( "1_wxym2" )
surface_material_override/1 = ExtResource( "8_4lr4g" )
surface_material_override/2 = ExtResource( "7_uplhy" )
surface_material_override/3 = ExtResource( "5_jyl6e" )
surface_material_override/4 = ExtResource( "3_svtxp" )
surface_material_override/0 = ExtResource( "6_bjgvg" )
surface_material_override/1 = ExtResource( "1_glnpr" )
surface_material_override/2 = ExtResource( "4_j47ey" )
surface_material_override/3 = ExtResource( "5_5hcr4" )
surface_material_override/4 = ExtResource( "8_0pdw2" )
[node name="StaticBody3D" type="StaticBody3D" parent="Main 035"]
@ -1067,7 +1067,7 @@ transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, -1, 0, 0, 0)
gi_mode = 1
mesh = SubResource( "ArrayMesh_xn24n" )
skeleton = NodePath("")
surface_material_override/0 = ExtResource( "1_wxym2" )
surface_material_override/0 = ExtResource( "1_glnpr" )
[node name="StaticBody3D" type="StaticBody3D" parent="Main 040"]
@ -1079,7 +1079,7 @@ transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 35, 0, 0)
gi_mode = 1
mesh = SubResource( "ArrayMesh_h2ssv" )
skeleton = NodePath("")
surface_material_override/0 = ExtResource( "1_wxym2" )
surface_material_override/0 = ExtResource( "5_5hcr4" )
[node name="StaticBody3D" type="StaticBody3D" parent="Main 047"]
@ -1091,7 +1091,7 @@ transform = Transform3D(5.96046e-08, 0, 1, 0, 1, 0, -1, 0, 5.96046e-08, 36, 0, -
gi_mode = 1
mesh = SubResource( "ArrayMesh_4f066" )
skeleton = NodePath("")
surface_material_override/0 = ExtResource( "1_wxym2" )
surface_material_override/0 = ExtResource( "4_j47ey" )
[node name="StaticBody3D" type="StaticBody3D" parent="Main 048"]
@ -1103,7 +1103,7 @@ transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 35, 0, 0)
gi_mode = 1
mesh = SubResource( "ArrayMesh_7uv8m" )
skeleton = NodePath("")
surface_material_override/0 = ExtResource( "1_wxym2" )
surface_material_override/0 = ExtResource( "6_bjgvg" )
[node name="StaticBody3D" type="StaticBody3D" parent="Main 049"]
@ -1115,9 +1115,10 @@ transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -1, 0, 0)
gi_mode = 1
mesh = SubResource( "ArrayMesh_cik7l" )
skeleton = NodePath("")
surface_material_override/0 = ExtResource( "1_wxym2" )
surface_material_override/1 = ExtResource( "8_4lr4g" )
surface_material_override/2 = ExtResource( "2_fdkvc" )
surface_material_override/0 = ExtResource( "6_bjgvg" )
surface_material_override/1 = ExtResource( "5_5hcr4" )
surface_material_override/2 = ExtResource( "3_au0we" )
surface_material_override/3 = ExtResource( "1_glnpr" )
[node name="StaticBody3D" type="StaticBody3D" parent="Main 050"]
@ -1128,8 +1129,8 @@ shape = SubResource( "ConcavePolygonShape3D_gcj77" )
gi_mode = 1
mesh = SubResource( "ArrayMesh_xtvb8" )
skeleton = NodePath("")
surface_material_override/0 = ExtResource( "1_wxym2" )
surface_material_override/1 = ExtResource( "2_fdkvc" )
surface_material_override/0 = ExtResource( "5_5hcr4" )
surface_material_override/1 = ExtResource( "2_ehbbg" )
[node name="StaticBody3D" type="StaticBody3D" parent="Main 051"]
@ -1140,7 +1141,7 @@ shape = SubResource( "ConcavePolygonShape3D_c10tx" )
gi_mode = 1
mesh = SubResource( "ArrayMesh_5aoeu" )
skeleton = NodePath("")
surface_material_override/0 = ExtResource( "1_wxym2" )
surface_material_override/0 = ExtResource( "6_bjgvg" )
[node name="StaticBody3D" type="StaticBody3D" parent="Main 052"]
@ -1151,7 +1152,7 @@ shape = SubResource( "ConcavePolygonShape3D_56aqh" )
gi_mode = 1
mesh = SubResource( "ArrayMesh_32hvl" )
skeleton = NodePath("")
surface_material_override/0 = ExtResource( "1_wxym2" )
surface_material_override/0 = ExtResource( "6_bjgvg" )
[node name="StaticBody3D" type="StaticBody3D" parent="Main 053"]
@ -1162,7 +1163,7 @@ shape = SubResource( "ConcavePolygonShape3D_iecji" )
gi_mode = 1
mesh = SubResource( "ArrayMesh_isxj6" )
skeleton = NodePath("")
surface_material_override/0 = ExtResource( "1_wxym2" )
surface_material_override/0 = ExtResource( "8_0pdw2" )
[node name="StaticBody3D" type="StaticBody3D" parent="Main 054"]
@ -1174,7 +1175,7 @@ transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -2, 2, 28)
gi_mode = 1
mesh = SubResource( "ArrayMesh_sciib" )
skeleton = NodePath("")
surface_material_override/0 = ExtResource( "1_wxym2" )
surface_material_override/0 = ExtResource( "1_glnpr" )
[node name="StaticBody3D" type="StaticBody3D" parent="Main 058"]
@ -1186,7 +1187,7 @@ transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -2, 2, 28)
gi_mode = 1
mesh = SubResource( "ArrayMesh_j33u3" )
skeleton = NodePath("")
surface_material_override/0 = ExtResource( "1_wxym2" )
surface_material_override/0 = ExtResource( "3_au0we" )
[node name="StaticBody3D" type="StaticBody3D" parent="Main 059"]
@ -1198,7 +1199,7 @@ transform = Transform3D(5.96046e-08, 0, 1, 0, 1, 0, -1, 0, 5.96046e-08, 36, 9, -
gi_mode = 1
mesh = SubResource( "ArrayMesh_pnk3u" )
skeleton = NodePath("")
surface_material_override/0 = ExtResource( "1_wxym2" )
surface_material_override/0 = ExtResource( "6_bjgvg" )
[node name="StaticBody3D" type="StaticBody3D" parent="Main 060"]
@ -1209,7 +1210,7 @@ shape = SubResource( "ConcavePolygonShape3D_e6x2l" )
gi_mode = 1
mesh = SubResource( "ArrayMesh_s3tll" )
skeleton = NodePath("")
surface_material_override/0 = ExtResource( "1_wxym2" )
surface_material_override/0 = ExtResource( "4_j47ey" )
[node name="StaticBody3D" type="StaticBody3D" parent="Main 061"]
@ -1220,12 +1221,12 @@ shape = SubResource( "ConcavePolygonShape3D_wriek" )
gi_mode = 1
mesh = SubResource( "ArrayMesh_3k3x4" )
skeleton = NodePath("")
surface_material_override/0 = ExtResource( "1_wxym2" )
surface_material_override/1 = ExtResource( "7_uplhy" )
surface_material_override/2 = ExtResource( "6_qc75x" )
surface_material_override/3 = ExtResource( "5_jyl6e" )
surface_material_override/4 = ExtResource( "2_fdkvc" )
surface_material_override/5 = ExtResource( "8_4lr4g" )
surface_material_override/0 = ExtResource( "6_bjgvg" )
surface_material_override/1 = ExtResource( "8_0pdw2" )
surface_material_override/2 = ExtResource( "2_ehbbg" )
surface_material_override/3 = ExtResource( "1_glnpr" )
surface_material_override/4 = ExtResource( "4_j47ey" )
surface_material_override/5 = ExtResource( "5_5hcr4" )
[node name="StaticBody3D" type="StaticBody3D" parent="Main 062"]
@ -1236,7 +1237,7 @@ shape = SubResource( "ConcavePolygonShape3D_yugod" )
gi_mode = 1
mesh = SubResource( "ArrayMesh_2pb4y" )
skeleton = NodePath("")
surface_material_override/0 = ExtResource( "1_wxym2" )
surface_material_override/0 = ExtResource( "4_j47ey" )
[node name="StaticBody3D" type="StaticBody3D" parent="Main 063"]
@ -1248,7 +1249,7 @@ transform = Transform3D(-1, 0, -1.50996e-07, 0, 1, 0, 1.50996e-07, 0, -1, -68, -
gi_mode = 1
mesh = SubResource( "ArrayMesh_jw0pg" )
skeleton = NodePath("")
surface_material_override/0 = ExtResource( "1_wxym2" )
surface_material_override/0 = ExtResource( "5_5hcr4" )
[node name="StaticBody3D" type="StaticBody3D" parent="Main 064"]
@ -1260,7 +1261,7 @@ transform = Transform3D(0.909985, 0.00029046, -0.0022146, -0.00026097, 0.999999,
gi_mode = 1
mesh = SubResource( "ArrayMesh_wlbxv" )
skeleton = NodePath("")
surface_material_override/0 = ExtResource( "8_4lr4g" )
surface_material_override/0 = ExtResource( "1_glnpr" )
[node name="StaticBody3D" type="StaticBody3D" parent="QBlock003"]
@ -1272,7 +1273,7 @@ transform = Transform3D(0.999997, 0.00029046, -0.00243366, -0.000286784, 0.99999
gi_mode = 1
mesh = SubResource( "ArrayMesh_e2gwp" )
skeleton = NodePath("")
surface_material_override/0 = ExtResource( "6_qc75x" )
surface_material_override/0 = ExtResource( "4_j47ey" )
[node name="StaticBody3D" type="StaticBody3D" parent="QBlock005"]
@ -1284,9 +1285,9 @@ transform = Transform3D(0.999997, 0.00029046, -0.00243366, -0.000286784, 0.99999
gi_mode = 1
mesh = SubResource( "ArrayMesh_2qh5d" )
skeleton = NodePath("")
surface_material_override/0 = ExtResource( "1_wxym2" )
surface_material_override/1 = ExtResource( "2_fdkvc" )
surface_material_override/2 = ExtResource( "8_4lr4g" )
surface_material_override/0 = ExtResource( "4_j47ey" )
surface_material_override/1 = ExtResource( "5_5hcr4" )
surface_material_override/2 = ExtResource( "1_glnpr" )
[node name="StaticBody3D" type="StaticBody3D" parent="Main 065"]
@ -1298,7 +1299,7 @@ transform = Transform3D(0.999997, 0.00029046, -0.00243366, -0.000286784, 0.99999
gi_mode = 1
mesh = SubResource( "ArrayMesh_wbeuf" )
skeleton = NodePath("")
surface_material_override/0 = ExtResource( "1_wxym2" )
surface_material_override/0 = ExtResource( "7_3hyn0" )
[node name="StaticBody3D" type="StaticBody3D" parent="Main 066"]
@ -1310,7 +1311,7 @@ transform = Transform3D(-1, 0, -1.50996e-07, 0, 1, 0, 1.50996e-07, 0, -1, -30, 0
gi_mode = 1
mesh = SubResource( "ArrayMesh_8hhvd" )
skeleton = NodePath("")
surface_material_override/0 = ExtResource( "1_wxym2" )
surface_material_override/0 = ExtResource( "1_glnpr" )
[node name="StaticBody3D" type="StaticBody3D" parent="Main 067"]
@ -1322,7 +1323,7 @@ transform = Transform3D(0.999997, 0.00029046, -0.00243366, -0.000286784, 0.99999
gi_mode = 1
mesh = SubResource( "ArrayMesh_pdye2" )
skeleton = NodePath("")
surface_material_override/0 = ExtResource( "1_wxym2" )
surface_material_override/0 = ExtResource( "5_5hcr4" )
[node name="StaticBody3D" type="StaticBody3D" parent="Main 068"]
@ -1333,8 +1334,8 @@ shape = SubResource( "ConcavePolygonShape3D_l8ngj" )
gi_mode = 1
mesh = SubResource( "ArrayMesh_lkqxj" )
skeleton = NodePath("")
surface_material_override/0 = ExtResource( "1_wxym2" )
surface_material_override/1 = ExtResource( "8_4lr4g" )
surface_material_override/0 = ExtResource( "6_bjgvg" )
surface_material_override/1 = ExtResource( "1_glnpr" )
[node name="StaticBody3D" type="StaticBody3D" parent="Main 069"]
@ -1346,7 +1347,7 @@ transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, -1, 0, 0, 0)
gi_mode = 1
mesh = SubResource( "ArrayMesh_bqf6l" )
skeleton = NodePath("")
surface_material_override/0 = ExtResource( "1_wxym2" )
surface_material_override/0 = ExtResource( "4_j47ey" )
[node name="StaticBody3D" type="StaticBody3D" parent="Main 070"]
@ -1358,11 +1359,9 @@ transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, -1, 0, 0, 0)
gi_mode = 1
mesh = SubResource( "ArrayMesh_3o6so" )
skeleton = NodePath("")
surface_material_override/0 = ExtResource( "1_wxym2" )
surface_material_override/0 = ExtResource( "6_bjgvg" )
[node name="StaticBody3D" type="StaticBody3D" parent="Main 072"]
[node name="CollisionShape3D" type="CollisionShape3D" parent="Main 072/StaticBody3D"]
shape = SubResource( "ConcavePolygonShape3D_u67w2" )
[node name="Area3D" type="Area3D" parent="."]

Binary file not shown.

View File

@ -23,4 +23,4 @@ compress/channel_pack=1
mipmaps/generate=false
mipmaps/limit=-1
slices/horizontal=1
slices/vertical=111
slices/vertical=159

View File

@ -48,23 +48,16 @@ var spread = spread_min
$"SFX/Shoot C".play()
$Handgun/AnimationPlayer.play("Shoot", 0, 2.5)
var flash_effect = flash.instantiate()
var tracer_effect = tracer.instantiate()
get_parent().add_child(flash_effect)
get_tree().root.add_child(tracer_effect)
flash_effect.global_transform = muzzle.global_transform
tracer_effect.global_transform = muzzle.global_transform.looking_at(to)
#var casing_instance = casing.instantiate()
#get_tree().root.add_child(casing_instance)
#casing_instance.global_transform = ejector.global_transform.translated(player.motion_velocity / 60) #approximating delta
#casing_instance.linear_velocity = ejector.global_transform.basis[1] * randf_range(3.2, 4.5) + (player.motion_velocity / 2)
#casing_instance.angular_velocity.y += randf_range(-10, 10)
#casing_instance.angular_velocity.x += randf_range(-10, 10)
if ray:
if is_multiplayer_authority(): # only do this on the attacker's local instance of the game
give_damage(ray['collider'], ray['position'], ray['normal'], 20, self.global_transform.origin, Globals.DamageType.BULLET, 1.0)

File diff suppressed because one or more lines are too long

View File

@ -182,6 +182,8 @@ screenshot={
[rendering]
shadows/directional_shadow/soft_shadow_quality=1
shadows/shadows/soft_shadow_quality=1
reflections/sky_reflections/fast_filter_high_quality=true
environment/ssao/quality=0
environment/screen_space_reflection/roughness_quality=3