Merge branch 'master' of https://gitlab.hexaquo.at/ggjg20/bodypartfighter

3D Input/Fertige GLBs/imker_dance.gd

@@ -0,0 +1,11 @@
+extends Spatial
+
+
+# Declare member variables here. Examples:
+# var a: int = 2
+# var b: String = "text"
+
+
+# Called when the node enters the scene tree for the first time.
+func _ready() -> void:
+	get_node("AnimationPlayer").play("ArmaturemixamocomLayer0")

3D Input/imkertextur.png.import

@@ -0,0 +1,34 @@
+[remap]
+
+importer="texture"
+type="StreamTexture"
+path="res://.import/imkertextur.png-8a648b6ed51ab8f0b575bb8b42821923.stex"
+metadata={
+"vram_texture": false
+}
+
+[deps]
+
+source_file="res://3D Input/imkertextur.png"
+dest_files=[ "res://.import/imkertextur.png-8a648b6ed51ab8f0b575bb8b42821923.stex" ]
+
+[params]
+
+compress/mode=0
+compress/lossy_quality=0.7
+compress/hdr_mode=0
+compress/bptc_ldr=0
+compress/normal_map=0
+flags/repeat=0
+flags/filter=true
+flags/mipmaps=false
+flags/anisotropic=false
+flags/srgb=2
+process/fix_alpha_border=true
+process/premult_alpha=false
+process/HDR_as_SRGB=false
+process/invert_color=false
+stream=false
+size_limit=0
+detect_3d=true
+svg/scale=1.0

3D Input/textures_painter/gravestone3_None_AlbedoTransparency.png.import

@@ -0,0 +1,36 @@
+[remap]
+
+importer="texture"
+type="StreamTexture"
+path.s3tc="res://.import/gravestone3_None_AlbedoTransparency.png-e7a6c09ec468532fd32562e58d312df0.s3tc.stex"
+path.etc2="res://.import/gravestone3_None_AlbedoTransparency.png-e7a6c09ec468532fd32562e58d312df0.etc2.stex"
+metadata={
+"imported_formats": [ "s3tc", "etc2" ],
+"vram_texture": true
+}
+
+[deps]
+
+source_file="res://3D Input/textures_painter/gravestone3_None_AlbedoTransparency.png"
+dest_files=[ "res://.import/gravestone3_None_AlbedoTransparency.png-e7a6c09ec468532fd32562e58d312df0.s3tc.stex", "res://.import/gravestone3_None_AlbedoTransparency.png-e7a6c09ec468532fd32562e58d312df0.etc2.stex" ]
+
+[params]
+
+compress/mode=2
+compress/lossy_quality=0.7
+compress/hdr_mode=0
+compress/bptc_ldr=0
+compress/normal_map=0
+flags/repeat=true
+flags/filter=true
+flags/mipmaps=true
+flags/anisotropic=false
+flags/srgb=1
+process/fix_alpha_border=true
+process/premult_alpha=false
+process/HDR_as_SRGB=false
+process/invert_color=false
+stream=false
+size_limit=0
+detect_3d=false
+svg/scale=1.0

3D Input/textures_painter/gravestone3_None_MetallicSmoothness.png.import

@@ -0,0 +1,36 @@
+[remap]
+
+importer="texture"
+type="StreamTexture"
+path.s3tc="res://.import/gravestone3_None_MetallicSmoothness.png-6534cf291785d177533b1d4d345b9f77.s3tc.stex"
+path.etc2="res://.import/gravestone3_None_MetallicSmoothness.png-6534cf291785d177533b1d4d345b9f77.etc2.stex"
+metadata={
+"imported_formats": [ "s3tc", "etc2" ],
+"vram_texture": true
+}
+
+[deps]
+
+source_file="res://3D Input/textures_painter/gravestone3_None_MetallicSmoothness.png"
+dest_files=[ "res://.import/gravestone3_None_MetallicSmoothness.png-6534cf291785d177533b1d4d345b9f77.s3tc.stex", "res://.import/gravestone3_None_MetallicSmoothness.png-6534cf291785d177533b1d4d345b9f77.etc2.stex" ]
+
+[params]
+
+compress/mode=2
+compress/lossy_quality=0.7
+compress/hdr_mode=0
+compress/bptc_ldr=0
+compress/normal_map=0
+flags/repeat=true
+flags/filter=true
+flags/mipmaps=true
+flags/anisotropic=false
+flags/srgb=2
+process/fix_alpha_border=true
+process/premult_alpha=false
+process/HDR_as_SRGB=false
+process/invert_color=false
+stream=false
+size_limit=0
+detect_3d=false
+svg/scale=1.0

3D Input/textures_painter/gravestone3_None_Normal.png.import

@@ -0,0 +1,36 @@
+[remap]
+
+importer="texture"
+type="StreamTexture"
+path.s3tc="res://.import/gravestone3_None_Normal.png-642d56f38092b2d9aa0899f12379f020.s3tc.stex"
+path.etc2="res://.import/gravestone3_None_Normal.png-642d56f38092b2d9aa0899f12379f020.etc2.stex"
+metadata={
+"imported_formats": [ "s3tc", "etc2" ],
+"vram_texture": true
+}
+
+[deps]
+
+source_file="res://3D Input/textures_painter/gravestone3_None_Normal.png"
+dest_files=[ "res://.import/gravestone3_None_Normal.png-642d56f38092b2d9aa0899f12379f020.s3tc.stex", "res://.import/gravestone3_None_Normal.png-642d56f38092b2d9aa0899f12379f020.etc2.stex" ]
+
+[params]
+
+compress/mode=2
+compress/lossy_quality=0.7
+compress/hdr_mode=0
+compress/bptc_ldr=0
+compress/normal_map=1
+flags/repeat=true
+flags/filter=true
+flags/mipmaps=true
+flags/anisotropic=false
+flags/srgb=2
+process/fix_alpha_border=true
+process/premult_alpha=false
+process/HDR_as_SRGB=false
+process/invert_color=false
+stream=false
+size_limit=0
+detect_3d=false
+svg/scale=1.0

Audio/menu.wav.import

@@ -0,0 +1,21 @@
+[remap]
+
+importer="wav"
+type="AudioStreamSample"
+path="res://.import/menu.wav-2935745348e8d9bcccb25346365d54d7.sample"
+
+[deps]
+
+source_file="res://Audio/menu.wav"
+dest_files=[ "res://.import/menu.wav-2935745348e8d9bcccb25346365d54d7.sample" ]
+
+[params]
+
+force/8_bit=false
+force/mono=false
+force/max_rate=false
+force/max_rate_hz=44100
+edit/trim=false
+edit/normalize=false
+edit/loop=false
+compress/mode=0

BodyConfig/bodyBuilderMenu.tscn

@@ -1,4 +1,4 @@
-[gd_scene load_steps=9 format=2]
+[gd_scene load_steps=10 format=2]
 
 [ext_resource path="res://BodyParts/BodyBase/BodyBase.tscn" type="PackedScene" id=1]
 [ext_resource path="res://BodyConfig/bodyBuildingScript.gd" type="Script" id=2]
@@ -8,6 +8,7 @@
 [ext_resource path="res://Resources/Styles/ButtonHoverStyle.tres" type="StyleBox" id=6]
 [ext_resource path="res://Resources/Styles/ButtonPressedStyle.tres" type="StyleBox" id=7]
 [ext_resource path="res://Resources/Styles/ButtonNormalStyle.tres" type="StyleBox" id=8]
+[ext_resource path="res://Audio/menu.wav" type="AudioStream" id=9]
 
 [node name="Body Builder Menu" type="Spatial"]
 script = ExtResource( 2 )
@@ -127,4 +128,8 @@ __meta__ = {
 
 [node name="Arena" parent="." instance=ExtResource( 4 )]
 transform = Transform( 1, 0, 0, 0, 0.707107, -0.707107, 0, 0.707107, 0.707107, 8, -9.91555, -6.62132 )
+
+[node name="AudioStreamPlayer2D" type="AudioStreamPlayer2D" parent="."]
+stream = ExtResource( 9 )
+autoplay = true
 [connection signal="pressed" from="GUI/HBoxC/VBoxC/Start" to="." method="_on_Start_pressed"]

BodyConfig/bodyBuildingScript.gd

@@ -50,6 +50,8 @@ func _ready():
 	
 	_torso.get_node("Head").key = KEY_C
 	
+	_torso.player_id = 0
+
 
 func change_count_ui():
 	if done_player_count == null:
@@ -71,6 +73,8 @@ func change_count_ui():
 		
 		_torso.get_node("Head").key = KEY_M
 		
+		_torso.player_id = 1
+
 
 func _process(delta):
 	# TODO: Would be nicer to just disable gravity, but then it can't be re-enabled...

BodyParts/Wings.gd

@@ -15,7 +15,7 @@ func action():
 		anim.play("ArmatureAction")
 		
 		var offset = transform.basis.xform(Vector3.ZERO)
-		var direction = (-base.transform.basis.z).normalized() * 20.0
+		var direction = (-base.transform.basis.z).normalized() * 15.0
 		
 		base.apply_impulse(offset, direction)
 		

BodyParts/Wings.tscn

@@ -10,7 +10,7 @@ extents = Vector3( 2.75562, 0.605394, 2.0419 )
 [node name="Wings" instance=ExtResource( 2 )]
 transform = Transform( 0.193412, -0.981118, 0, 0.981118, 0.193412, 0, 0, 0, 1, 0, 0, 0 )
 script = ExtResource( 3 )
-cost = 25.0
+cost = 30.0
 
 [node name="PartCollider" parent="." index="0"]
 transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, -2.80638 )
@@ -20,7 +20,7 @@ shape = SubResource( 1 )
 transform = Transform( -0.517952, -0.85541, 1.14363e-07, 4.41231e-09, 1.31023e-07, 1, -0.85541, 0.517952, -6.40892e-08, 1.08802, 0.236862, -3.57712 )
 
 [node name="Timer" type="Timer" parent="." index="3"]
-wait_time = 2.5
+wait_time = 2.2
 one_shot = true
 
 [editable path="Mesh"]

Ingame/Level/Torch.tscn

@@ -34,6 +34,7 @@ transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, -0.730462, 7.55028, -0.0896119
 light_color = Color( 0.996078, 0.568627, 0.380392, 1 )
 light_energy = 3.0
 shadow_enabled = true
+shadow_bias = 2.0
 omni_range = 87.1226
 
 [node name="Smoke" parent="." index="2" instance=ExtResource( 3 )]

Ingame/Testing.tscn

@@ -58,9 +58,6 @@ transform = Transform( 0.978626, 1.91684e-07, -0.205647, -1.784e-07, 1, 8.31393e
 [node name="PathFollow12" parent="Arena/Path" index="11"]
 transform = Transform( -0.305839, 5.41201e-07, -0.952082, 4.12144e-07, 1, 4.36044e-07, 0.952083, -2.59036e-07, -0.305838, -20.2565, -9.77015e-07, 79.0522 )
 
-[node name="PathFollow13" parent="Arena/Path" index="12"]
-transform = Transform( -0.625119, 2.66822e-07, -0.780529, 4.26834e-07, 1, 0, 0.780529, -3.33157e-07, -0.625118, -42.0269, 0, 67.1875 )
-
 [node name="PathFollow15" parent="Arena/Path" index="14"]
 transform = Transform( -0.986687, 4.21016e-07, -0.162631, 4.26697e-07, 1, 0, 0.162631, -6.93941e-08, -0.986685, -63.4917, 0, 23.5427 )