Skip to content
Snippets Groups Projects
Commit 06ce141b authored by Jannik Rosendahl's avatar Jannik Rosendahl
Browse files

Merge remote-tracking branch 'origin/main' into main

parents 389d019a cf290b3b
No related branches found
No related tags found
No related merge requests found
Showing
with 420 additions and 117 deletions
extends KinematicBody2D
func _on_Area2D_body_entered(body):
if body.get("TYPE") == "player":
get_tree().reload_current_scene()
[gd_scene load_steps=5 format=2]
[ext_resource path="res://src/assets/FreeSciFiPlatformTileSet/png/Tiles/Acid (1).png" type="Texture" id=1]
[ext_resource path="res://src/scenes/Acid.gd" type="Script" id=2]
[ext_resource path="res://src/scripts/Acid.gd" type="Script" id=2]
[sub_resource type="RectangleShape2D" id=1]
extents = Vector2( 0, 0 )
......
......@@ -23,7 +23,7 @@ func _physics_process(delta):
emit_signal(\"enter_door\")
"
[sub_resource type="RectangleShape2D" id=2]
[sub_resource type="RectangleShape2D" id=32]
extents = Vector2( 22.71, 7.42306 )
[node name="Door" type="Node2D"]
......@@ -38,4 +38,4 @@ position = Vector2( 0, -48 )
[node name="CollisionShape2D" type="CollisionShape2D" parent="Area2D"]
position = Vector2( 0, 35 )
shape = SubResource( 2 )
shape = SubResource( 32 )
extends Control
func _ready():
pass # Replace with function body.
func _on_Start_pressed():
$buttonSound.play()
yield($buttonSound, "finished")
get_tree().change_scene("res://src/scenes/Game.tscn")
func _on_Einstellungen_pressed():
$buttonSound.play()
yield($buttonSound, "finished")
get_tree().change_scene("res://src/scenes/Settings.tscn")
func _on_ENDE_pressed():
$buttonSound.play()
yield($buttonSound, "finished")
get_tree().quit()
func _on_buttonSound_finished():
pass # Replace with function body.
......@@ -5,7 +5,7 @@
[ext_resource path="res://src/assets/menu_assets/ButtonTextur.png" type="Texture" id=3]
[ext_resource path="res://src/assets/menu_assets/Geist SpriteSheet.png" type="Texture" id=4]
[ext_resource path="res://src/assets/menu_assets/ButtonTexturHover.png" type="Texture" id=5]
[ext_resource path="res://src/scenes/Menu.gd" type="Script" id=6]
[ext_resource path="res://src/scripts/Menu.gd" type="Script" id=6]
[ext_resource path="res://src/assets/sounds/click1.wav" type="AudioStream" id=7]
[sub_resource type="DynamicFont" id=1]
......@@ -180,7 +180,7 @@ __meta__ = {
position = Vector2( 1080, 248 )
scale = Vector2( 2.81113, 2.65621 )
frames = SubResource( 18 )
frame = 1
frame = 2
speed_scale = 0.8
playing = true
......
extends Node
export(bool) var can_toggle_pause: bool = true
func _ready():
print("loaded pause controller")
func _process(delta):
if Input.is_action_just_pressed("menu_pause"):
print("action pause")
if !get_tree().paused:
$CanvasLayer/PauseBackground.visible = true
$CanvasLayer2/pauseText.visible = true
pause()
else:
$CanvasLayer/PauseBackground.visible = false
$CanvasLayer2/pauseText.visible = false
resume()
func pause():
if can_toggle_pause:
get_tree().set_deferred("paused", true)
func resume():
if can_toggle_pause:
get_tree().set_deferred("paused", false)
[gd_scene load_steps=4 format=2]
[ext_resource path="res://src/scenes/PauseController.gd" type="Script" id=1]
[ext_resource path="res://src/scripts/PauseController.gd" type="Script" id=1]
[ext_resource path="res://src/assets/menu_assets/04B_30__.TTF" type="DynamicFontData" id=2]
[sub_resource type="DynamicFont" id=1]
font_data = ExtResource( 2 )
......
[gd_scene load_steps=2 format=2]
[sub_resource type="RectangleShape2D" id=1]
extents = Vector2( 2328, 16 )
[node name="Node2D" type="Node2D"]
[node name="KinematicBody2D" type="KinematicBody2D" parent="."]
[node name="CollisionShape2D" type="CollisionShape2D" parent="KinematicBody2D"]
shape = SubResource( 1 )
[gd_scene load_steps=4 format=2]
[sub_resource type="RectangleShape2D" id=1]
extents = Vector2( 80, 8 )
[sub_resource type="Curve2D" id=2]
_data = {
"points": PoolVector2Array( 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1088, 0, 0, 0, 0, 0, 1088, 192 )
}
[sub_resource type="Animation" id=3]
resource_name = "Box"
length = 20.0
tracks/0/type = "value"
tracks/0/path = NodePath("Path2D/PathFollow2D:unit_offset")
tracks/0/interp = 1
tracks/0/loop_wrap = true
tracks/0/imported = false
tracks/0/enabled = true
tracks/0/keys = {
"times": PoolRealArray( 0, 10 ),
"transitions": PoolRealArray( 1, 1 ),
"update": 0,
"values": [ 1.0, 0.99 ]
}
[node name="Box" type="Node2D"]
[node name="KinematicBody2D" type="KinematicBody2D" parent="."]
motion/sync_to_physics = true
[node name="CollisionShape2D" type="CollisionShape2D" parent="KinematicBody2D"]
shape = SubResource( 1 )
[node name="Path2D" type="Path2D" parent="."]
curve = SubResource( 2 )
[node name="PathFollow2D" type="PathFollow2D" parent="Path2D"]
[node name="RemoteTransform2D" type="RemoteTransform2D" parent="Path2D/PathFollow2D"]
remote_path = NodePath("../../../KinematicBody2D")
[node name="AnimationPlayer" type="AnimationPlayer" parent="."]
autoplay = "Box"
playback_process_mode = 0
anims/Box = SubResource( 3 )
[gd_scene load_steps=6 format=2]
[sub_resource type="RectangleShape2D" id=1]
extents = Vector2( 80, 8 )
[sub_resource type="Curve2D" id=2]
_data = {
"points": PoolVector2Array( 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 4032, 0, 0, 0, 0, 0, 4032, 256, 0, 0, 0, 0, 8, 256 )
}
[sub_resource type="Animation" id=3]
resource_name = "Neue Animation1"
length = 80.0
loop = true
tracks/0/type = "value"
tracks/0/path = NodePath("Path2D/PathFollow2D:unit_offset")
tracks/0/interp = 1
tracks/0/loop_wrap = true
tracks/0/imported = false
tracks/0/enabled = true
tracks/0/keys = {
"times": PoolRealArray( 0, 40 ),
"transitions": PoolRealArray( 1, 1 ),
"update": 0,
"values": [ 0.0, 1.0 ]
}
[sub_resource type="Animation" id=4]
resource_name = "Neue Animation2"
length = 2.0
loop = true
tracks/0/type = "value"
tracks/0/path = NodePath("Path2D/PathFollow2D:unit_offset")
tracks/0/interp = 1
tracks/0/loop_wrap = true
tracks/0/imported = false
tracks/0/enabled = true
tracks/0/keys = {
"times": PoolRealArray( 0, 0.99 ),
"transitions": PoolRealArray( 1, 1 ),
"update": 0,
"values": [ 0.0, 1.0 ]
}
[sub_resource type="Animation" id=5]
length = 0.001
tracks/0/type = "value"
tracks/0/path = NodePath("Path2D/PathFollow2D:unit_offset")
tracks/0/interp = 1
tracks/0/loop_wrap = true
tracks/0/imported = false
tracks/0/enabled = true
tracks/0/keys = {
"times": PoolRealArray( 0 ),
"transitions": PoolRealArray( 1 ),
"update": 0,
"values": [ 1.0 ]
}
[node name="PlatformFunctional" type="Node2D"]
[node name="KinematicBody2D" type="KinematicBody2D" parent="."]
motion/sync_to_physics = true
[node name="CollisionShape2D" type="CollisionShape2D" parent="KinematicBody2D"]
shape = SubResource( 1 )
[node name="Path2D" type="Path2D" parent="."]
curve = SubResource( 2 )
[node name="PathFollow2D" type="PathFollow2D" parent="Path2D"]
rotate = false
[node name="RemoteTransform2D" type="RemoteTransform2D" parent="Path2D/PathFollow2D"]
remote_path = NodePath("../../../KinematicBody2D")
[node name="AnimationPlayer" type="AnimationPlayer" parent="."]
autoplay = "Neue Animation1"
playback_process_mode = 0
"anims/Neue Animation1" = SubResource( 3 )
"anims/Neue Animation2" = SubResource( 4 )
anims/RESET = SubResource( 5 )
[gd_scene load_steps=6 format=2]
[sub_resource type="RectangleShape2D" id=1]
extents = Vector2( 8, 64 )
[sub_resource type="Curve2D" id=2]
_data = {
"points": PoolVector2Array( 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 4032, 0, 0, 0, 0, 0, 4032, 384, 0, 0, 0, 0, 0, 384 )
}
[sub_resource type="Animation" id=3]
resource_name = "Neue Animation1"
length = 80.0
loop = true
tracks/0/type = "value"
tracks/0/path = NodePath("Path2D/PathFollow2D:unit_offset")
tracks/0/interp = 1
tracks/0/loop_wrap = true
tracks/0/imported = false
tracks/0/enabled = true
tracks/0/keys = {
"times": PoolRealArray( 0, 40 ),
"transitions": PoolRealArray( 1, 1 ),
"update": 0,
"values": [ 0.0, 1.0 ]
}
[sub_resource type="Animation" id=4]
resource_name = "Neue Animation2"
length = 2.0
loop = true
tracks/0/type = "value"
tracks/0/path = NodePath("Path2D/PathFollow2D:unit_offset")
tracks/0/interp = 1
tracks/0/loop_wrap = true
tracks/0/imported = false
tracks/0/enabled = true
tracks/0/keys = {
"times": PoolRealArray( 0, 0.99 ),
"transitions": PoolRealArray( 1, 1 ),
"update": 0,
"values": [ 0.0, 1.0 ]
}
[sub_resource type="Animation" id=5]
length = 0.001
tracks/0/type = "value"
tracks/0/path = NodePath("Path2D/PathFollow2D:unit_offset")
tracks/0/interp = 1
tracks/0/loop_wrap = true
tracks/0/imported = false
tracks/0/enabled = true
tracks/0/keys = {
"times": PoolRealArray( 0 ),
"transitions": PoolRealArray( 1 ),
"update": 0,
"values": [ 1.0 ]
}
[node name="PlatformFunctional" type="Node2D"]
[node name="KinematicBody2D" type="KinematicBody2D" parent="."]
motion/sync_to_physics = true
[node name="CollisionShape2D" type="CollisionShape2D" parent="KinematicBody2D"]
shape = SubResource( 1 )
[node name="Path2D" type="Path2D" parent="."]
curve = SubResource( 2 )
[node name="PathFollow2D" type="PathFollow2D" parent="Path2D"]
rotate = false
[node name="RemoteTransform2D" type="RemoteTransform2D" parent="Path2D/PathFollow2D"]
remote_path = NodePath("../../../KinematicBody2D")
[node name="AnimationPlayer" type="AnimationPlayer" parent="."]
autoplay = "Neue Animation1"
playback_process_mode = 0
"anims/Neue Animation1" = SubResource( 3 )
"anims/Neue Animation2" = SubResource( 4 )
anims/RESET = SubResource( 5 )
[gd_scene load_steps=6 format=2]
[sub_resource type="RectangleShape2D" id=1]
extents = Vector2( 8, 64 )
[sub_resource type="Curve2D" id=2]
_data = {
"points": PoolVector2Array( 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 4040, 0, 0, 0, 0, 0, 4040, -384, 0, 0, 0, 0, 8, -384 )
}
[sub_resource type="Animation" id=3]
resource_name = "Neue Animation1"
length = 80.0
loop = true
tracks/0/type = "value"
tracks/0/path = NodePath("Path2D/PathFollow2D:unit_offset")
tracks/0/interp = 1
tracks/0/loop_wrap = true
tracks/0/imported = false
tracks/0/enabled = true
tracks/0/keys = {
"times": PoolRealArray( 0, 40 ),
"transitions": PoolRealArray( 1, 1 ),
"update": 0,
"values": [ 0.0, 1.0 ]
}
[sub_resource type="Animation" id=4]
resource_name = "Neue Animation2"
length = 2.0
loop = true
tracks/0/type = "value"
tracks/0/path = NodePath("Path2D/PathFollow2D:unit_offset")
tracks/0/interp = 1
tracks/0/loop_wrap = true
tracks/0/imported = false
tracks/0/enabled = true
tracks/0/keys = {
"times": PoolRealArray( 0, 0.99 ),
"transitions": PoolRealArray( 1, 1 ),
"update": 0,
"values": [ 0.0, 1.0 ]
}
[sub_resource type="Animation" id=5]
length = 0.001
tracks/0/type = "value"
tracks/0/path = NodePath("Path2D/PathFollow2D:unit_offset")
tracks/0/interp = 1
tracks/0/loop_wrap = true
tracks/0/imported = false
tracks/0/enabled = true
tracks/0/keys = {
"times": PoolRealArray( 0 ),
"transitions": PoolRealArray( 1 ),
"update": 0,
"values": [ 1.0 ]
}
[node name="PlatformFunctional" type="Node2D"]
[node name="KinematicBody2D" type="KinematicBody2D" parent="."]
motion/sync_to_physics = true
[node name="CollisionShape2D" type="CollisionShape2D" parent="KinematicBody2D"]
shape = SubResource( 1 )
[node name="Path2D" type="Path2D" parent="."]
curve = SubResource( 2 )
[node name="PathFollow2D" type="PathFollow2D" parent="Path2D"]
rotate = false
[node name="RemoteTransform2D" type="RemoteTransform2D" parent="Path2D/PathFollow2D"]
remote_path = NodePath("../../../KinematicBody2D")
[node name="AnimationPlayer" type="AnimationPlayer" parent="."]
autoplay = "Neue Animation1"
playback_process_mode = 0
"anims/Neue Animation1" = SubResource( 3 )
"anims/Neue Animation2" = SubResource( 4 )
anims/RESET = SubResource( 5 )
[gd_scene load_steps=6 format=2]
[sub_resource type="RectangleShape2D" id=1]
extents = Vector2( 80, 8 )
[sub_resource type="Curve2D" id=2]
_data = {
"points": PoolVector2Array( 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 4032, 0, 0, 0, 0, 0, 4032, -320, 0, 0, 0, 0, 0, -320 )
}
[sub_resource type="Animation" id=3]
resource_name = "Neue Animation1"
length = 80.0
loop = true
tracks/0/type = "value"
tracks/0/path = NodePath("Path2D/PathFollow2D:unit_offset")
tracks/0/interp = 1
tracks/0/loop_wrap = true
tracks/0/imported = false
tracks/0/enabled = true
tracks/0/keys = {
"times": PoolRealArray( 0, 40 ),
"transitions": PoolRealArray( 1, 1 ),
"update": 0,
"values": [ 0.0, 1.0 ]
}
[sub_resource type="Animation" id=4]
resource_name = "Neue Animation2"
length = 2.0
loop = true
tracks/0/type = "value"
tracks/0/path = NodePath("Path2D/PathFollow2D:unit_offset")
tracks/0/interp = 1
tracks/0/loop_wrap = true
tracks/0/imported = false
tracks/0/enabled = true
tracks/0/keys = {
"times": PoolRealArray( 0, 0.99 ),
"transitions": PoolRealArray( 1, 1 ),
"update": 0,
"values": [ 0.0, 1.0 ]
}
[sub_resource type="Animation" id=5]
length = 0.001
tracks/0/type = "value"
tracks/0/path = NodePath("Path2D/PathFollow2D:unit_offset")
tracks/0/interp = 1
tracks/0/loop_wrap = true
tracks/0/imported = false
tracks/0/enabled = true
tracks/0/keys = {
"times": PoolRealArray( 0 ),
"transitions": PoolRealArray( 1 ),
"update": 0,
"values": [ 1.0 ]
}
[node name="PlatformFunctional" type="Node2D"]
[node name="KinematicBody2D" type="KinematicBody2D" parent="."]
motion/sync_to_physics = true
[node name="CollisionShape2D" type="CollisionShape2D" parent="KinematicBody2D"]
shape = SubResource( 1 )
[node name="Path2D" type="Path2D" parent="."]
curve = SubResource( 2 )
[node name="PathFollow2D" type="PathFollow2D" parent="Path2D"]
rotate = false
[node name="RemoteTransform2D" type="RemoteTransform2D" parent="Path2D/PathFollow2D"]
remote_path = NodePath("../../../KinematicBody2D")
[node name="AnimationPlayer" type="AnimationPlayer" parent="."]
autoplay = "Neue Animation1"
playback_process_mode = 0
"anims/Neue Animation1" = SubResource( 3 )
"anims/Neue Animation2" = SubResource( 4 )
anims/RESET = SubResource( 5 )
......@@ -10,7 +10,7 @@ _data = {
"points": PoolVector2Array( 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 264, 0 )
}
[sub_resource type="Animation" id=7]
[sub_resource type="Animation" id=3]
resource_name = "Level4"
length = 2.0
loop = true
......@@ -27,8 +27,7 @@ tracks/0/keys = {
"values": [ 0.0, 0.99 ]
}
[sub_resource type="Animation" id=3]
resource_name = "Neue Animation1"
[sub_resource type="Animation" id=4]
length = 2.0
loop = true
tracks/0/type = "value"
......@@ -44,8 +43,7 @@ tracks/0/keys = {
"values": [ 0.0 ]
}
[sub_resource type="Animation" id=4]
resource_name = "Neue Animation2"
[sub_resource type="Animation" id=5]
length = 2.0
loop = true
tracks/0/type = "value"
......@@ -66,7 +64,7 @@ resource_name = "PFHFast"
length = 2.0
loop = true
[sub_resource type="Animation" id=5]
[sub_resource type="Animation" id=7]
length = 0.001
tracks/0/type = "value"
tracks/0/path = NodePath("Path2D/PathFollow2D:unit_offset")
......@@ -84,7 +82,6 @@ tracks/0/keys = {
[node name="PlatformFunctional" type="Node2D"]
[node name="KinematicBody2D" type="KinematicBody2D" parent="."]
position = Vector2( 200.432, 0 )
motion/sync_to_physics = true
[node name="CollisionShape2D" type="CollisionShape2D" parent="KinematicBody2D"]
......@@ -99,8 +96,6 @@ region_rect = Rect2( 801, 610, 160, 17 )
curve = SubResource( 2 )
[node name="PathFollow2D" type="PathFollow2D" parent="Path2D"]
position = Vector2( 200.432, 0 )
offset = 200.254
rotate = false
[node name="RemoteTransform2D" type="RemoteTransform2D" parent="Path2D/PathFollow2D"]
......@@ -108,10 +103,9 @@ remote_path = NodePath("../../../KinematicBody2D")
[node name="AnimationPlayer" type="AnimationPlayer" parent="."]
autoplay = "Level4"
reset_on_save = false
playback_process_mode = 0
anims/Level4 = SubResource( 7 )
"anims/Neue Animation1" = SubResource( 3 )
"anims/Neue Animation2" = SubResource( 4 )
anims/Level4 = SubResource( 3 )
"anims/Neue Animation1" = SubResource( 4 )
"anims/Neue Animation2" = SubResource( 5 )
anims/PFHFast = SubResource( 6 )
anims/RESET = SubResource( 5 )
anims/RESET = SubResource( 7 )
......@@ -83,7 +83,6 @@ remote_path = NodePath("../../../KinematicBody2D")
[node name="AnimationPlayer" type="AnimationPlayer" parent="."]
autoplay = "Neue Animation1"
reset_on_save = false
playback_process_mode = 0
"anims/Neue Animation1" = SubResource( 3 )
"anims/Neue Animation2" = SubResource( 4 )
......
[gd_scene load_steps=2 format=2]
[sub_resource type="RectangleShape2D" id=1]
extents = Vector2( 8, 208 )
[node name="Node2D" type="Node2D"]
[node name="KinematicBody2D" type="KinematicBody2D" parent="."]
motion/sync_to_physics = true
[node name="CollisionShape2D" type="CollisionShape2D" parent="KinematicBody2D"]
shape = SubResource( 1 )
extends KinematicBody2D
func _on_Area2D_body_entered(body):
if body.is_in_group("player"):
body.take_damage(2)
[gd_scene load_steps=6 format=2]
[ext_resource path="res://src/assets/FreeSciFiPlatformTileSet/png/Objects/Saw.png" type="Texture" id=1]
[ext_resource path="res://src/scenes/Saw.gd" type="Script" id=2]
[ext_resource path="res://src/scenes/SawRotation.gd" type="Script" id=3]
[ext_resource path="res://src/scripts/Saw.gd" type="Script" id=2]
[ext_resource path="res://src/scripts/SawRotation.gd" type="Script" id=3]
[sub_resource type="CircleShape2D" id=1]
radius = 0.0
......
[gd_scene load_steps=8 format=2]
[ext_resource path="res://src/scenes/SawRotationMove.gd" type="Script" id=1]
[ext_resource path="res://src/scripts/SawRotationMove.gd" type="Script" id=1]
[ext_resource path="res://src/assets/FreeSciFiPlatformTileSet/png/Objects/Saw.png" type="Texture" id=3]
[sub_resource type="RectangleShape2D" id=1]
extents = Vector2( 0, 2 )
......
[gd_scene load_steps=9 format=2]
[ext_resource path="res://src/scenes/SawMoveDamage.gd" type="Script" id=1]
[ext_resource path="res://src/scripts/SawMoveDamage.gd" type="Script" id=1]
[ext_resource path="res://src/assets/FreeSciFiPlatformTileSet/png/Objects/Saw.png" type="Texture" id=3]
[sub_resource type="RectangleShape2D" id=1]
extents = Vector2( 0, 2 )
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment