aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Lee <alee14498@protonmail.com>2022-08-05 20:27:02 -0400
committerAndrew Lee <alee14498@protonmail.com>2022-08-05 20:27:02 -0400
commit0fdf6eebba1723f3d05e668d78bdc7669e679486 (patch)
treeea0c7dea2bb5eb756579745381e5abfca95f7fa3
parent931d187c762011cefefe273241e209ef08a58ccf (diff)
downloadfrivolous-run-0fdf6eebba1723f3d05e668d78bdc7669e679486.tar.gz
frivolous-run-0fdf6eebba1723f3d05e668d78bdc7669e679486.tar.bz2
frivolous-run-0fdf6eebba1723f3d05e668d78bdc7669e679486.zip
Fixed switching scene problem
-rw-r--r--game/Game.tscn2
-rw-r--r--game/characters/player/Player.gd (renamed from game/Characters/Player/Player.gd)0
-rw-r--r--game/characters/player/Player.tscn (renamed from game/Characters/Player/Player.tscn)0
-rw-r--r--menu/Menu.gd2
-rw-r--r--menu/Menu.tscn55
5 files changed, 33 insertions, 26 deletions
diff --git a/game/Game.tscn b/game/Game.tscn
index 426b2ae..d46136b 100644
--- a/game/Game.tscn
+++ b/game/Game.tscn
@@ -4,7 +4,7 @@
[ext_resource path="res://game/Interface.tscn" type="PackedScene" id=2]
[ext_resource path="res://assets/tilemap.tres" type="TileSet" id=3]
[ext_resource path="res://assets/images/white.png" type="Texture" id=4]
-[ext_resource path="res://game/Characters/Player/Player.gd" type="Script" id=5]
+[ext_resource path="res://game/characters/player/Player.gd" type="Script" id=5]
[sub_resource type="RectangleShape2D" id=1]
extents = Vector2( 8, 8 )
diff --git a/game/Characters/Player/Player.gd b/game/characters/player/Player.gd
index f764015..f764015 100644
--- a/game/Characters/Player/Player.gd
+++ b/game/characters/player/Player.gd
diff --git a/game/Characters/Player/Player.tscn b/game/characters/player/Player.tscn
index a7ee0e4..a7ee0e4 100644
--- a/game/Characters/Player/Player.tscn
+++ b/game/characters/player/Player.tscn
diff --git a/menu/Menu.gd b/menu/Menu.gd
index d04aad7..fa895da 100644
--- a/menu/Menu.gd
+++ b/menu/Menu.gd
@@ -17,7 +17,7 @@ func _ready():
func _on_Play_button_up():
- if get_tree().change_scene("res://game/game.tscn") != OK:
+ if get_tree().change_scene("res://game/Game.tscn") != OK:
print("There was an error trying to load the scene...")
pass # Replace with function body.
diff --git a/menu/Menu.tscn b/menu/Menu.tscn
index b7d3a05..888312c 100644
--- a/menu/Menu.tscn
+++ b/menu/Menu.tscn
@@ -15,45 +15,52 @@ margin_right = 1280.0
margin_bottom = 720.0
[node name="VBoxContainer" type="VBoxContainer" parent="CenterContainer"]
-margin_left = 448.0
-margin_top = 308.0
-margin_right = 832.0
-margin_bottom = 412.0
-
-[node name="Logo" type="Sprite" parent="CenterContainer/VBoxContainer"]
-position = Vector2( 505, 64 )
-scale = Vector2( 0.991787, 1.0997 )
+margin_left = 429.0
+margin_top = 272.0
+margin_right = 850.0
+margin_bottom = 448.0
+
+[node name="Logo" type="TextureRect" parent="CenterContainer/VBoxContainer"]
+margin_right = 421.0
+margin_bottom = 60.0
texture = ExtResource( 2 )
[node name="Play" type="Button" parent="CenterContainer/VBoxContainer"]
-margin_right = 384.0
-margin_bottom = 20.0
+margin_top = 64.0
+margin_right = 421.0
+margin_bottom = 84.0
text = "Play"
[node name="Credits" type="Button" parent="CenterContainer/VBoxContainer"]
-margin_top = 24.0
-margin_right = 384.0
-margin_bottom = 44.0
+margin_top = 88.0
+margin_right = 421.0
+margin_bottom = 108.0
text = "Credits"
[node name="Quit" type="Button" parent="CenterContainer/VBoxContainer"]
-margin_top = 48.0
-margin_right = 384.0
-margin_bottom = 68.0
+margin_top = 112.0
+margin_right = 421.0
+margin_bottom = 132.0
text = "Quit"
+[node name="HSeparator" type="HSeparator" parent="CenterContainer/VBoxContainer"]
+modulate = Color( 1, 1, 1, 0 )
+margin_top = 136.0
+margin_right = 421.0
+margin_bottom = 140.0
+
[node name="About" type="Label" parent="CenterContainer/VBoxContainer"]
-margin_top = 72.0
-margin_right = 384.0
-margin_bottom = 86.0
-text = "Made for the bits & Bytes Unofficial Game Jam! August 2022"
+margin_top = 144.0
+margin_right = 421.0
+margin_bottom = 158.0
+text = "Made for the bits & Bytes Unofficial Game Jam! August 2022."
align = 1
[node name="Copyright" type="Label" parent="CenterContainer/VBoxContainer"]
-margin_top = 90.0
-margin_right = 384.0
-margin_bottom = 104.0
-text = "Copyright 2022 Andrew Lee. Powered by the Godot Engine"
+margin_top = 162.0
+margin_right = 421.0
+margin_bottom = 176.0
+text = "(c) Copyright 2022 Andrew Lee. Powered by the Godot Engine."
align = 1
[connection signal="button_up" from="CenterContainer/VBoxContainer/Play" to="." method="_on_Play_button_up"]