Merge branch 'master' of https://gitlab.hexaquo.at/ggjg20/bodypartfighter
# Conflicts: # 3D Input/hühnchen kopf unwrapped.blend # 3D Input/hühnchen kopf unwrapped.blend1
This commit is contained in:
commit
102428f715
BIN
3D Input/Fertige GLBs/Material.material
Normal file
BIN
3D Input/Fertige GLBs/Material.material
Normal file
Binary file not shown.
BIN
3D Input/Fertige GLBs/flügel.material
Normal file
BIN
3D Input/Fertige GLBs/flügel.material
Normal file
Binary file not shown.
1062
3D Input/Fertige GLBs/gravestone1.glb.import
Normal file
1062
3D Input/Fertige GLBs/gravestone1.glb.import
Normal file
File diff suppressed because it is too large
Load Diff
1062
3D Input/Fertige GLBs/vogel_flügel.glb.import
Normal file
1062
3D Input/Fertige GLBs/vogel_flügel.glb.import
Normal file
File diff suppressed because it is too large
Load Diff
Binary file not shown.
Binary file not shown.
Binary file not shown.
BIN
3D Input/hühnchen kopf unwrapped and rigged.blend
Normal file
BIN
3D Input/hühnchen kopf unwrapped and rigged.blend
Normal file
Binary file not shown.
Binary file not shown.
Binary file not shown.
@ -0,0 +1,36 @@
|
|||||||
|
[remap]
|
||||||
|
|
||||||
|
importer="texture"
|
||||||
|
type="StreamTexture"
|
||||||
|
path.s3tc="res://.import/gravestone1_Material_AlbedoTransparency.png-e7e47eb9e8b84be712d657ebda1db81f.s3tc.stex"
|
||||||
|
path.etc2="res://.import/gravestone1_Material_AlbedoTransparency.png-e7e47eb9e8b84be712d657ebda1db81f.etc2.stex"
|
||||||
|
metadata={
|
||||||
|
"imported_formats": [ "s3tc", "etc2" ],
|
||||||
|
"vram_texture": true
|
||||||
|
}
|
||||||
|
|
||||||
|
[deps]
|
||||||
|
|
||||||
|
source_file="res://3D Input/textures_painter/gravestone1_Material_AlbedoTransparency.png"
|
||||||
|
dest_files=[ "res://.import/gravestone1_Material_AlbedoTransparency.png-e7e47eb9e8b84be712d657ebda1db81f.s3tc.stex", "res://.import/gravestone1_Material_AlbedoTransparency.png-e7e47eb9e8b84be712d657ebda1db81f.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
|
@ -0,0 +1,36 @@
|
|||||||
|
[remap]
|
||||||
|
|
||||||
|
importer="texture"
|
||||||
|
type="StreamTexture"
|
||||||
|
path.s3tc="res://.import/gravestone1_Material_MetallicSmoothness.png-a3e4ac80d82747df2b7f6964c493d179.s3tc.stex"
|
||||||
|
path.etc2="res://.import/gravestone1_Material_MetallicSmoothness.png-a3e4ac80d82747df2b7f6964c493d179.etc2.stex"
|
||||||
|
metadata={
|
||||||
|
"imported_formats": [ "s3tc", "etc2" ],
|
||||||
|
"vram_texture": true
|
||||||
|
}
|
||||||
|
|
||||||
|
[deps]
|
||||||
|
|
||||||
|
source_file="res://3D Input/textures_painter/gravestone1_Material_MetallicSmoothness.png"
|
||||||
|
dest_files=[ "res://.import/gravestone1_Material_MetallicSmoothness.png-a3e4ac80d82747df2b7f6964c493d179.s3tc.stex", "res://.import/gravestone1_Material_MetallicSmoothness.png-a3e4ac80d82747df2b7f6964c493d179.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
|
@ -0,0 +1,36 @@
|
|||||||
|
[remap]
|
||||||
|
|
||||||
|
importer="texture"
|
||||||
|
type="StreamTexture"
|
||||||
|
path.s3tc="res://.import/gravestone1_Material_Normal.png-1ae979772a6858364649499beb22014a.s3tc.stex"
|
||||||
|
path.etc2="res://.import/gravestone1_Material_Normal.png-1ae979772a6858364649499beb22014a.etc2.stex"
|
||||||
|
metadata={
|
||||||
|
"imported_formats": [ "s3tc", "etc2" ],
|
||||||
|
"vram_texture": true
|
||||||
|
}
|
||||||
|
|
||||||
|
[deps]
|
||||||
|
|
||||||
|
source_file="res://3D Input/textures_painter/gravestone1_Material_Normal.png"
|
||||||
|
dest_files=[ "res://.import/gravestone1_Material_Normal.png-1ae979772a6858364649499beb22014a.s3tc.stex", "res://.import/gravestone1_Material_Normal.png-1ae979772a6858364649499beb22014a.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
|
@ -24,7 +24,12 @@ func _physics_process(delta):
|
|||||||
if body.name == "StaticBody":
|
if body.name == "StaticBody":
|
||||||
if current_angle > 0.3:
|
if current_angle > 0.3:
|
||||||
apply_torque_impulse(rot_vector * current_angle * 7)
|
apply_torque_impulse(rot_vector * current_angle * 7)
|
||||||
|
apply_impulse(transform.basis.xform(Vector3.ZERO), -(transform.basis.y) * 0.05)
|
||||||
elif current_angle > 0.05:
|
elif current_angle > 0.05:
|
||||||
apply_torque_impulse(-(rot_vector * current_angle * 20))
|
apply_torque_impulse(-(rot_vector * current_angle * 5))
|
||||||
else:
|
else:
|
||||||
angular_velocity = Vector3.ZERO
|
angular_velocity = Vector3.ZERO
|
||||||
|
|
||||||
|
for axis in angular_velocity:
|
||||||
|
if axis > 10:
|
||||||
|
axis -= axis * 0.75
|
||||||
|
@ -1,13 +1,12 @@
|
|||||||
[gd_scene load_steps=9 format=2]
|
[gd_scene load_steps=8 format=2]
|
||||||
|
|
||||||
[ext_resource path="res://BodyParts/PushingBodyPart.tscn" type="PackedScene" id=1]
|
[ext_resource path="res://BodyParts/PushingBodyPart.tscn" type="PackedScene" id=1]
|
||||||
[ext_resource path="res://BodyParts/FrogLeg.gd" type="Script" id=2]
|
[ext_resource path="res://BodyParts/FrogLeg.gd" type="Script" id=2]
|
||||||
[ext_resource path="res://3D Input/Fertige GLBs/Bein_Frosch.glb" type="PackedScene" id=3]
|
[ext_resource path="res://3D Input/Fertige GLBs/Bein_Frosch.glb" type="PackedScene" id=3]
|
||||||
[ext_resource path="res://3D Input/froschtexture.png" type="Texture" id=4]
|
[ext_resource path="res://3D Input/froschtexture.png" type="Texture" id=4]
|
||||||
[ext_resource path="res://Audio/frog_sound.wav" type="AudioStream" id=5]
|
|
||||||
|
|
||||||
[sub_resource type="BoxShape" id=1]
|
[sub_resource type="BoxShape" id=1]
|
||||||
extents = Vector3( 0.649825, 2.07811, 1.64282 )
|
extents = Vector3( 0.666, 2.41488, 1.57924 )
|
||||||
|
|
||||||
[sub_resource type="SphereShape" id=2]
|
[sub_resource type="SphereShape" id=2]
|
||||||
radius = 0.115004
|
radius = 0.115004
|
||||||
@ -17,16 +16,16 @@ albedo_texture = ExtResource( 4 )
|
|||||||
roughness = 0.3
|
roughness = 0.3
|
||||||
|
|
||||||
[node name="FrogLeg" instance=ExtResource( 1 )]
|
[node name="FrogLeg" instance=ExtResource( 1 )]
|
||||||
transform = Transform( -1, 8.74228e-08, 0, -8.74228e-08, -1, 0, 0, 0, 1, 0, 0, 0 )
|
transform = Transform( -1, 8.74228e-08, 0, -8.48803e-08, -0.970917, 0.239415, 2.09303e-08, 0.239415, 0.970917, 0, 0, 0 )
|
||||||
script = ExtResource( 2 )
|
script = ExtResource( 2 )
|
||||||
cost = 30.0
|
cost = 30.0
|
||||||
|
|
||||||
[node name="PartCollider" parent="." index="0"]
|
[node name="PartCollider" parent="." index="0"]
|
||||||
transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0.21377, -0.911304, -3.94992 )
|
transform = Transform( 1, -6.77822e-08, -8.51879e-08, -6.77823e-08, 0.224662, -0.974437, 8.5188e-08, 0.974437, 0.224662, 1.61495e-07, -1.52524, -2.85154 )
|
||||||
shape = SubResource( 1 )
|
shape = SubResource( 1 )
|
||||||
|
|
||||||
[node name="TouchArea" parent="." index="1"]
|
[node name="TouchArea" parent="." index="1"]
|
||||||
transform = Transform( 2.20191, -0.624093, -2.57245, 1.26297, 3.18837, 0.307522, 2.32635, -1.14024, 2.26789, 0.307056, -2.38919, -4.91366 )
|
transform = Transform( 2.20191, -0.624093, -2.57245, 1.26297, 3.18838, 0.307522, 2.32635, -1.14024, 2.26789, 0.307056, -2.38919, -4.91366 )
|
||||||
|
|
||||||
[node name="CollisionShape" type="CollisionShape" parent="TouchArea" index="0"]
|
[node name="CollisionShape" type="CollisionShape" parent="TouchArea" index="0"]
|
||||||
shape = SubResource( 2 )
|
shape = SubResource( 2 )
|
||||||
@ -34,8 +33,11 @@ shape = SubResource( 2 )
|
|||||||
[node name="Mesh" parent="." index="2" instance=ExtResource( 3 )]
|
[node name="Mesh" parent="." index="2" instance=ExtResource( 3 )]
|
||||||
transform = Transform( -1.13133e-08, 4.2222e-08, 1, 0.965926, 0.258819, 0, -0.258819, 0.965926, -4.37114e-08, 0.734499, -2.94707, -2.68774 )
|
transform = Transform( -1.13133e-08, 4.2222e-08, 1, 0.965926, 0.258819, 0, -0.258819, 0.965926, -4.37114e-08, 0.734499, -2.94707, -2.68774 )
|
||||||
|
|
||||||
|
[node name="Skeleton" parent="Mesh/Armature" index="0"]
|
||||||
|
bones/3/bound_children = [ NodePath("BoneAttachment") ]
|
||||||
|
|
||||||
[node name="froschbein" parent="Mesh/Armature/Skeleton" index="0"]
|
[node name="froschbein" parent="Mesh/Armature/Skeleton" index="0"]
|
||||||
transform = Transform( 1, -1.49012e-08, 0, 0, 1, -5.96046e-08, 0, 2.98023e-08, 1, 0, 0, 0 )
|
transform = Transform( 1, -1.11759e-08, 0, 1.86265e-09, 1, -5.96046e-08, 1.86265e-09, 0, 1, 0, 0, 0 )
|
||||||
material/0 = SubResource( 3 )
|
material/0 = SubResource( 3 )
|
||||||
|
|
||||||
[node name="BoneAttachment" type="BoneAttachment" parent="Mesh/Armature/Skeleton" index="1"]
|
[node name="BoneAttachment" type="BoneAttachment" parent="Mesh/Armature/Skeleton" index="1"]
|
||||||
@ -48,8 +50,9 @@ remote_path = NodePath("../../../../../TouchArea")
|
|||||||
[node name="AnimationPlayer" parent="Mesh" index="2"]
|
[node name="AnimationPlayer" parent="Mesh" index="2"]
|
||||||
playback_speed = 2.0
|
playback_speed = 2.0
|
||||||
|
|
||||||
[node name="ActionSound" parent="." index="3"]
|
[node name="CollisionPolygon" type="CollisionPolygon" parent="." index="3"]
|
||||||
stream = ExtResource( 5 )
|
__meta__ = {
|
||||||
unit_db = 0.0
|
"_edit_group_": true
|
||||||
|
}
|
||||||
|
|
||||||
[editable path="Mesh"]
|
[editable path="Mesh"]
|
||||||
|
@ -7,7 +7,7 @@
|
|||||||
[ext_resource path="res://Audio/punch_sound.wav" type="AudioStream" id=5]
|
[ext_resource path="res://Audio/punch_sound.wav" type="AudioStream" id=5]
|
||||||
|
|
||||||
[sub_resource type="BoxShape" id=1]
|
[sub_resource type="BoxShape" id=1]
|
||||||
extents = Vector3( 0.666, 2.41488, 1.555 )
|
extents = Vector3( 0.666, 2.5097, 1.57924 )
|
||||||
|
|
||||||
[sub_resource type="SphereShape" id=2]
|
[sub_resource type="SphereShape" id=2]
|
||||||
radius = 0.108468
|
radius = 0.108468
|
||||||
|
@ -34,6 +34,7 @@ func _prep_scene(scene_name) -> Node:
|
|||||||
elif scene_name == "fight_scene":
|
elif scene_name == "fight_scene":
|
||||||
_fighting_scene = preload(_fighting_path).instance()
|
_fighting_scene = preload(_fighting_path).instance()
|
||||||
InGameState.connect("player_win", self, "_switch_to_win")
|
InGameState.connect("player_win", self, "_switch_to_win")
|
||||||
|
_fighting_scene.connect("main_menu", self, "_switch_to_main_menu")
|
||||||
return _fighting_scene
|
return _fighting_scene
|
||||||
elif scene_name == "win_screen":
|
elif scene_name == "win_screen":
|
||||||
_win_screen_scene = preload(_win_screen_path).instance()
|
_win_screen_scene = preload(_win_screen_path).instance()
|
||||||
@ -95,3 +96,7 @@ func _switch_to_fighting(torso):
|
|||||||
func _switch_to_body_build():
|
func _switch_to_body_build():
|
||||||
_switch_scene(_body_build_scene, "body_build")
|
_switch_scene(_body_build_scene, "body_build")
|
||||||
_body_build_scene.change_count_ui()
|
_body_build_scene.change_count_ui()
|
||||||
|
|
||||||
|
|
||||||
|
func _switch_to_main_menu():
|
||||||
|
_switch_scene(_main_menu_scene, "main_menu")
|
||||||
|
@ -1,10 +1,11 @@
|
|||||||
[gd_scene load_steps=7 format=2]
|
[gd_scene load_steps=8 format=2]
|
||||||
|
|
||||||
[ext_resource path="res://Ingame/Level/Torch.tscn" type="PackedScene" id=1]
|
[ext_resource path="res://Ingame/Level/Torch.tscn" type="PackedScene" id=1]
|
||||||
[ext_resource path="res://Ingame/Level/Ground.tscn" type="PackedScene" id=2]
|
[ext_resource path="res://Ingame/Level/Ground.tscn" type="PackedScene" id=2]
|
||||||
[ext_resource path="res://default_env.tres" type="Environment" id=3]
|
[ext_resource path="res://default_env.tres" type="Environment" id=3]
|
||||||
[ext_resource path="res://3D Input/Fertige GLBs/Kopf_Mensch.glb" type="PackedScene" id=4]
|
[ext_resource path="res://3D Input/Fertige GLBs/Kopf_Mensch.glb" type="PackedScene" id=4]
|
||||||
[ext_resource path="res://Ingame/Level/Fence.tscn" type="PackedScene" id=5]
|
[ext_resource path="res://Ingame/Level/Fence.tscn" type="PackedScene" id=5]
|
||||||
|
[ext_resource path="res://Ingame/Level/Gravestone.tscn" type="PackedScene" id=6]
|
||||||
|
|
||||||
[sub_resource type="Curve3D" id=1]
|
[sub_resource type="Curve3D" id=1]
|
||||||
_data = {
|
_data = {
|
||||||
@ -15,25 +16,25 @@ _data = {
|
|||||||
[node name="Arena" type="Spatial"]
|
[node name="Arena" type="Spatial"]
|
||||||
|
|
||||||
[node name="Torch" parent="." instance=ExtResource( 1 )]
|
[node name="Torch" parent="." instance=ExtResource( 1 )]
|
||||||
transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 46.6609, 0, -46.1498 )
|
transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 57.6609, 0, -63.1498 )
|
||||||
|
|
||||||
[node name="Torch3" parent="." instance=ExtResource( 1 )]
|
[node name="Torch3" parent="." instance=ExtResource( 1 )]
|
||||||
transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, -40.7873, 0, -66.7423 )
|
transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, -29.7873, 0, -83.7423 )
|
||||||
|
|
||||||
[node name="Torch2" parent="." instance=ExtResource( 1 )]
|
[node name="Torch2" parent="." instance=ExtResource( 1 )]
|
||||||
transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, -80.7649, 0, 4.33311 )
|
transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, -69.7649, 0, -12.6669 )
|
||||||
|
|
||||||
[node name="Torch4" parent="." instance=ExtResource( 1 )]
|
[node name="Torch4" parent="." instance=ExtResource( 1 )]
|
||||||
transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, -55.8087, 0, 76.6803 )
|
transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, -44.8087, 0, 59.6803 )
|
||||||
|
|
||||||
[node name="Torch5" parent="." instance=ExtResource( 1 )]
|
[node name="Torch5" parent="." instance=ExtResource( 1 )]
|
||||||
transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 52.7943, 0, 76.6803 )
|
transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 63.7943, 0, 59.6803 )
|
||||||
|
|
||||||
[node name="Torch6" parent="." instance=ExtResource( 1 )]
|
[node name="Torch6" parent="." instance=ExtResource( 1 )]
|
||||||
transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 27.8085, 0, 49.812 )
|
transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 38.8085, 0, 32.812 )
|
||||||
|
|
||||||
[node name="Torch7" parent="." instance=ExtResource( 1 )]
|
[node name="Torch7" parent="." instance=ExtResource( 1 )]
|
||||||
transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, -35.1849, 0, -15.9355 )
|
transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, -24.1849, 0, -32.9355 )
|
||||||
|
|
||||||
[node name="WorldEnvironment" type="WorldEnvironment" parent="."]
|
[node name="WorldEnvironment" type="WorldEnvironment" parent="."]
|
||||||
environment = ExtResource( 3 )
|
environment = ExtResource( 3 )
|
||||||
@ -41,9 +42,10 @@ environment = ExtResource( 3 )
|
|||||||
[node name="ground" parent="." instance=ExtResource( 2 )]
|
[node name="ground" parent="." instance=ExtResource( 2 )]
|
||||||
|
|
||||||
[node name="Kopf_Mensch" parent="." instance=ExtResource( 4 )]
|
[node name="Kopf_Mensch" parent="." instance=ExtResource( 4 )]
|
||||||
transform = Transform( 3.58646, 0.324361, 1.74129, -1.09151, 3.50169, 1.59586, -1.39495, -1.90603, 3.22817, -62.8568, 12.0891, -17.4997 )
|
transform = Transform( 3.58646, 0.324361, 1.74129, -1.09151, 3.50169, 1.59586, -1.39495, -1.90603, 3.22817, -51.8568, 12.0891, -34.4997 )
|
||||||
|
|
||||||
[node name="Path" type="Path" parent="."]
|
[node name="Path" type="Path" parent="."]
|
||||||
|
transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 11, 0, -17 )
|
||||||
curve = SubResource( 1 )
|
curve = SubResource( 1 )
|
||||||
|
|
||||||
[node name="PathFollow" type="PathFollow" parent="Path"]
|
[node name="PathFollow" type="PathFollow" parent="Path"]
|
||||||
@ -181,3 +183,51 @@ rotation_mode = 4
|
|||||||
|
|
||||||
[node name="Fence" parent="Path/PathFollow17" instance=ExtResource( 5 )]
|
[node name="Fence" parent="Path/PathFollow17" instance=ExtResource( 5 )]
|
||||||
transform = Transform( -1, 0, -3.25841e-07, 0, 1, 0, 3.25841e-07, 0, -1, 0, 0, 0 )
|
transform = Transform( -1, 0, -3.25841e-07, 0, 1, 0, 3.25841e-07, 0, -1, 0, 0, 0 )
|
||||||
|
|
||||||
|
[node name="Gravestone" parent="." instance=ExtResource( 6 )]
|
||||||
|
transform = Transform( 2.89778, 0, 0.776457, 0, 3, 0, -0.776457, 0, 2.89778, -74.388, 0, -0.0179996 )
|
||||||
|
|
||||||
|
[node name="Gravestone2" parent="." instance=ExtResource( 6 )]
|
||||||
|
transform = Transform( 2.89778, 0, 0.776457, 0, 3, 0, -0.776457, 0, 2.89778, -69.2116, 0, 19.3005 )
|
||||||
|
|
||||||
|
[node name="Gravestone3" parent="." instance=ExtResource( 6 )]
|
||||||
|
transform = Transform( 2.89778, 0, 0.776457, 0, 3, 0, -0.776457, 0, 2.89778, -64.0352, 0, 38.619 )
|
||||||
|
|
||||||
|
[node name="Gravestone4" parent="." instance=ExtResource( 6 )]
|
||||||
|
transform = Transform( 2.89778, 0, 0.776457, 0, 3, 0, -0.776457, 0, 2.89778, -58.8589, 0, 57.9375 )
|
||||||
|
|
||||||
|
[node name="Gravestone8" parent="." instance=ExtResource( 6 )]
|
||||||
|
transform = Transform( 2.89778, 0, 0.776457, 0, 3, 0, -0.776457, 0, 2.89778, -104.332, 0, 8.00538 )
|
||||||
|
|
||||||
|
[node name="Gravestone7" parent="." instance=ExtResource( 6 )]
|
||||||
|
transform = Transform( 2.89778, 0, 0.776457, 0, 3, 0, -0.776457, 0, 2.89778, -99.1553, 0, 27.3239 )
|
||||||
|
|
||||||
|
[node name="Gravestone6" parent="." instance=ExtResource( 6 )]
|
||||||
|
transform = Transform( 2.89778, 0, 0.776457, 0, 3, 0, -0.776457, 0, 2.89778, -93.9789, 0, 46.6424 )
|
||||||
|
|
||||||
|
[node name="Gravestone5" parent="." instance=ExtResource( 6 )]
|
||||||
|
transform = Transform( 2.89778, 0, 0.776457, 0, 3, 0, -0.776457, 0, 2.89778, -88.8026, 0, 65.9609 )
|
||||||
|
|
||||||
|
[node name="Gravestone16" parent="." instance=ExtResource( 6 )]
|
||||||
|
transform = Transform( -7.7486e-07, 0, -3, 0, 3, 0, 3, 0, -7.7486e-07, 46.2977, 0, -90.3632 )
|
||||||
|
|
||||||
|
[node name="Gravestone15" parent="." instance=ExtResource( 6 )]
|
||||||
|
transform = Transform( -7.7486e-07, 0, -3, 0, 3, 0, 3, 0, -7.7486e-07, 26.2977, 0, -90.3632 )
|
||||||
|
|
||||||
|
[node name="Gravestone14" parent="." instance=ExtResource( 6 )]
|
||||||
|
transform = Transform( -7.7486e-07, 0, -3, 0, 3, 0, 3, 0, -7.7486e-07, 6.2977, 0, -90.3631 )
|
||||||
|
|
||||||
|
[node name="Gravestone13" parent="." instance=ExtResource( 6 )]
|
||||||
|
transform = Transform( -7.7486e-07, 0, -3, 0, 3, 0, 3, 0, -7.7486e-07, -13.7023, 0, -90.3632 )
|
||||||
|
|
||||||
|
[node name="Gravestone12" parent="." instance=ExtResource( 6 )]
|
||||||
|
transform = Transform( -7.7486e-07, 0, -3, 0, 3, 0, 3, 0, -7.7486e-07, 46.2977, 0, -121.363 )
|
||||||
|
|
||||||
|
[node name="Gravestone11" parent="." instance=ExtResource( 6 )]
|
||||||
|
transform = Transform( -7.7486e-07, 0, -3, 0, 3, 0, 3, 0, -7.7486e-07, 26.2977, 0, -121.363 )
|
||||||
|
|
||||||
|
[node name="Gravestone10" parent="." instance=ExtResource( 6 )]
|
||||||
|
transform = Transform( -7.7486e-07, 0, -3, 0, 3, 0, 3, 0, -7.7486e-07, 6.29771, 0, -121.363 )
|
||||||
|
|
||||||
|
[node name="Gravestone9" parent="." instance=ExtResource( 6 )]
|
||||||
|
transform = Transform( -7.7486e-07, 0, -3, 0, 3, 0, 3, 0, -7.7486e-07, -13.7022, 0, -121.363 )
|
||||||
|
@ -1,16 +1,27 @@
|
|||||||
extends Spatial
|
extends Spatial
|
||||||
|
|
||||||
|
export(NodePath) var escPath
|
||||||
|
|
||||||
# Declare member variables here. Examples:
|
var _esc_button
|
||||||
# var a: int = 2
|
var _esc_visible : bool = false
|
||||||
# var b: String = "text"
|
|
||||||
|
|
||||||
|
signal main_menu()
|
||||||
|
|
||||||
# Called when the node enters the scene tree for the first time.
|
# Called when the node enters the scene tree for the first time.
|
||||||
func _ready() -> void:
|
func _ready() -> void:
|
||||||
InGameState.set_player_count(2)
|
InGameState.set_player_count(2)
|
||||||
|
_esc_button = get_node(escPath) as Button
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
# Called every frame. 'delta' is the elapsed time since the previous frame.
|
# Called every frame. 'delta' is the elapsed time since the previous frame.
|
||||||
#func _process(delta: float) -> void:
|
#func _process(delta: float) -> void:
|
||||||
# pass
|
# pass
|
||||||
|
func _input(event):
|
||||||
|
if event is InputEventKey and event.pressed and event.scancode == KEY_ESCAPE:
|
||||||
|
_esc_visible = !(_esc_visible)
|
||||||
|
_esc_button.visible = _esc_visible
|
||||||
|
|
||||||
|
|
||||||
|
func _on_ESC_Menu_pressed():
|
||||||
|
emit_signal ("main_menu")
|
||||||
|
19
Ingame/Level/Gravestone.tscn
Normal file
19
Ingame/Level/Gravestone.tscn
Normal file
@ -0,0 +1,19 @@
|
|||||||
|
[gd_scene load_steps=6 format=2]
|
||||||
|
|
||||||
|
[ext_resource path="res://3D Input/textures_painter/gravestone1_Material_AlbedoTransparency.png" type="Texture" id=1]
|
||||||
|
[ext_resource path="res://3D Input/textures_painter/gravestone1_Material_Normal.png" type="Texture" id=2]
|
||||||
|
[ext_resource path="res://3D Input/textures_painter/gravestone1_Material_MetallicSmoothness.png" type="Texture" id=3]
|
||||||
|
[ext_resource path="res://3D Input/Fertige GLBs/gravestone1.glb" type="PackedScene" id=4]
|
||||||
|
|
||||||
|
[sub_resource type="SpatialMaterial" id=1]
|
||||||
|
albedo_texture = ExtResource( 1 )
|
||||||
|
metallic_texture = ExtResource( 3 )
|
||||||
|
normal_enabled = true
|
||||||
|
normal_scale = 1.0
|
||||||
|
normal_texture = ExtResource( 2 )
|
||||||
|
|
||||||
|
[node name="Gravestone" instance=ExtResource( 4 )]
|
||||||
|
transform = Transform( 3, 0, 0, 0, 3, 0, 0, 0, 3, 0, 0, 0 )
|
||||||
|
|
||||||
|
[node name="Cube" parent="." index="0"]
|
||||||
|
material/0 = SubResource( 1 )
|
@ -1,19 +1,55 @@
|
|||||||
[gd_scene load_steps=5 format=2]
|
[gd_scene load_steps=9 format=2]
|
||||||
|
|
||||||
|
[ext_resource path="res://Resources/Fonts/MenuTextFont.tres" type="DynamicFont" id=1]
|
||||||
[ext_resource path="res://UI/UI.tscn" type="PackedScene" id=2]
|
[ext_resource path="res://UI/UI.tscn" type="PackedScene" id=2]
|
||||||
|
[ext_resource path="res://Resources/Styles/ButtonHoverStyle.tres" type="StyleBox" id=3]
|
||||||
[ext_resource path="res://Ingame/Ingame.gd" type="Script" id=4]
|
[ext_resource path="res://Ingame/Ingame.gd" type="Script" id=4]
|
||||||
[ext_resource path="res://Ingame/Arena.tscn" type="PackedScene" id=5]
|
[ext_resource path="res://Ingame/Arena.tscn" type="PackedScene" id=5]
|
||||||
[ext_resource path="res://Ingame/CameraFocus.gd" type="Script" id=6]
|
[ext_resource path="res://Ingame/CameraFocus.gd" type="Script" id=6]
|
||||||
|
[ext_resource path="res://Resources/Styles/ButtonNormalStyle.tres" type="StyleBox" id=7]
|
||||||
|
[ext_resource path="res://Resources/Styles/ButtonPressedStyle.tres" type="StyleBox" id=8]
|
||||||
|
|
||||||
[node name="InGame" type="Spatial"]
|
[node name="InGame" type="Spatial"]
|
||||||
script = ExtResource( 4 )
|
script = ExtResource( 4 )
|
||||||
|
escPath = NodePath("UI/ESC Menu")
|
||||||
|
|
||||||
[node name="UI" parent="." instance=ExtResource( 2 )]
|
[node name="UI" parent="." instance=ExtResource( 2 )]
|
||||||
|
|
||||||
|
[node name="ESC Menu" type="Button" parent="UI"]
|
||||||
|
visible = false
|
||||||
|
anchor_left = 0.5
|
||||||
|
anchor_top = 0.5
|
||||||
|
anchor_right = 0.5
|
||||||
|
anchor_bottom = 0.5
|
||||||
|
margin_left = -100.0
|
||||||
|
margin_top = -33.5
|
||||||
|
margin_right = 100.0
|
||||||
|
margin_bottom = 33.5
|
||||||
|
custom_styles/hover = ExtResource( 3 )
|
||||||
|
custom_styles/pressed = ExtResource( 8 )
|
||||||
|
custom_styles/normal = ExtResource( 7 )
|
||||||
|
custom_fonts/font = ExtResource( 1 )
|
||||||
|
text = "Escape"
|
||||||
|
__meta__ = {
|
||||||
|
"_edit_use_anchors_": false
|
||||||
|
}
|
||||||
|
|
||||||
[node name="Arena" parent="." instance=ExtResource( 5 )]
|
[node name="Arena" parent="." instance=ExtResource( 5 )]
|
||||||
|
|
||||||
|
[node name="PathFollow" parent="Arena/Path" index="0"]
|
||||||
|
transform = Transform( -0.564546, 0, 0.825401, 0, 1, 0, -0.825402, 0, -0.564546, -43.137, 0, -40.2265 )
|
||||||
|
|
||||||
|
[node name="PathFollow2" parent="Arena/Path" index="1"]
|
||||||
|
transform = Transform( -0.389933, 0, 0.920842, 0, 1, 0, -0.920843, 0, -0.389933, -22.4314, 0, -51.2965 )
|
||||||
|
|
||||||
[node name="PathFollow3" parent="Arena/Path" index="2"]
|
[node name="PathFollow3" parent="Arena/Path" index="2"]
|
||||||
transform = Transform( 0.0525302, 0, 0.998617, 0, 1, 0, -0.998619, 0, 0.05253, 1.77306, 0, -55.9514 )
|
transform = Transform( 0.0525302, 0, 0.998616, 0, 1, 0, -0.998619, 0, 0.05253, 1.77306, 0, -55.9514 )
|
||||||
|
|
||||||
|
[node name="PathFollow4" parent="Arena/Path" index="3"]
|
||||||
|
transform = Transform( 0.412629, 0, 0.910899, 0, 1, 0, -0.9109, 0, 0.412628, 25.6454, 0, -49.4766 )
|
||||||
|
|
||||||
|
[node name="PathFollow5" parent="Arena/Path" index="4"]
|
||||||
|
transform = Transform( 0.868863, 0, 0.495052, 0, 1, 0, -0.495052, 0, 0.868862, 45.3036, 0, -34.9361 )
|
||||||
|
|
||||||
[node name="PathFollow6" parent="Arena/Path" index="5"]
|
[node name="PathFollow6" parent="Arena/Path" index="5"]
|
||||||
transform = Transform( 0.951672, 0, 0.307114, 0, 1, 0, -0.307114, 0, 0.951672, 54.056, 0, -11.6692 )
|
transform = Transform( 0.951672, 0, 0.307114, 0, 1, 0, -0.307114, 0, 0.951672, 54.056, 0, -11.6692 )
|
||||||
@ -21,19 +57,41 @@ transform = Transform( 0.951672, 0, 0.307114, 0, 1, 0, -0.307114, 0, 0.951672, 5
|
|||||||
[node name="PathFollow7" parent="Arena/Path" index="6"]
|
[node name="PathFollow7" parent="Arena/Path" index="6"]
|
||||||
transform = Transform( 0.989853, 0, 0.142099, 0, 1, 0, -0.142099, 0, 0.98985, 60.6244, 0, 12.2053 )
|
transform = Transform( 0.989853, 0, 0.142099, 0, 1, 0, -0.142099, 0, 0.98985, 60.6244, 0, 12.2053 )
|
||||||
|
|
||||||
|
[node name="PathFollow8" parent="Arena/Path" index="7"]
|
||||||
|
transform = Transform( 0.978626, 1.91684e-07, -0.205647, -1.784e-07, 1, 8.31393e-08, 0.205648, -4.46748e-08, 0.978625, 58.2582, -2.03301e-05, 36.846 )
|
||||||
|
|
||||||
|
[node name="PathFollow9" parent="Arena/Path" index="8"]
|
||||||
|
transform = Transform( 0.760079, -6.86382e-07, -0.64983, 7.11587e-07, 1, -2.23935e-07, 0.649831, -2.92203e-07, 0.760078, 48.2851, 2.0276e-05, 59.2494 )
|
||||||
|
|
||||||
|
[node name="PathFollow10" parent="Arena/Path" index="9"]
|
||||||
|
transform = Transform( 0.425147, -4.37703e-07, -0.905123, 3.06861e-07, 1, -3.39447e-07, 0.905124, -1.33432e-07, 0.425147, 28.181, -7.98279e-07, 73.5253 )
|
||||||
|
|
||||||
|
[node name="PathFollow11" parent="Arena/Path" index="10"]
|
||||||
|
transform = Transform( 0.126477, -1.61642e-07, -0.991968, 1.13677e-07, 1, -1.48456e-07, 0.991969, -9.39879e-08, 0.126477, 4.35371, -1.51216e-05, 79.9373 )
|
||||||
|
|
||||||
[node name="PathFollow12" parent="Arena/Path" index="11"]
|
[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 )
|
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="PathFollow14" parent="Arena/Path" index="13"]
|
||||||
|
transform = Transform( -0.916028, 3.908e-07, -0.401115, 4.26625e-07, 1, 0, 0.401116, -1.71126e-07, -0.916026, -56.2049, 0, 47.1929 )
|
||||||
|
|
||||||
[node name="PathFollow15" parent="Arena/Path" index="14"]
|
[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 )
|
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 )
|
||||||
|
|
||||||
[node name="PathFollow16" parent="Arena/Path" index="15"]
|
[node name="PathFollow16" parent="Arena/Path" index="15"]
|
||||||
transform = Transform( -0.999998, 4.26235e-07, -0.00197735, 4.26236e-07, 1, 0, 0.00197735, -8.42818e-10, -0.999997, -65.6734, 0, -1.33537 )
|
transform = Transform( -0.999998, 4.26235e-07, -0.00197735, 4.26236e-07, 1, 0, 0.00197735, -8.42818e-10, -0.999998, -65.6734, 0, -1.33537 )
|
||||||
|
|
||||||
|
[node name="PathFollow17" parent="Arena/Path" index="16"]
|
||||||
|
transform = Transform( -0.817611, 3.47972e-07, 0.57577, 4.25597e-07, 1, 0, -0.575771, 2.45046e-07, -0.817609, -57.8267, 0, -24.3573 )
|
||||||
|
|
||||||
[node name="CameraFocus" type="Spatial" parent="."]
|
[node name="CameraFocus" type="Spatial" parent="."]
|
||||||
script = ExtResource( 6 )
|
script = ExtResource( 6 )
|
||||||
|
|
||||||
[node name="Camera" type="Camera" parent="CameraFocus"]
|
[node name="Camera" type="Camera" parent="CameraFocus"]
|
||||||
transform = Transform( -4.2222e-08, -0.707107, 0.707107, -1.13133e-08, 0.707107, 0.707107, -1, 2.18557e-08, -3.78552e-08, 19, 17, -2 )
|
transform = Transform( -4.2222e-08, -0.707107, 0.707107, -1.13133e-08, 0.707107, 0.707107, -1, 2.18557e-08, -3.78552e-08, 19, 17, -2 )
|
||||||
|
[connection signal="pressed" from="UI/ESC Menu" to="." method="_on_ESC_Menu_pressed"]
|
||||||
|
|
||||||
[editable path="Arena"]
|
[editable path="Arena"]
|
||||||
|
Loading…
x
Reference in New Issue
Block a user