aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.gitignore1
-rw-r--r--client/game.gd (renamed from client/scripts/game.gd)0
-rw-r--r--client/game.tscn (renamed from client/scenes/game.tscn)0
-rw-r--r--client/map/item.gd (renamed from client/scripts/item.gd)0
-rw-r--r--client/map/map.gd (renamed from client/scripts/map.gd)0
-rw-r--r--client/map/progress.gd (renamed from client/scripts/progress.gd)0
-rw-r--r--client/map/progress.gdshader (renamed from client/textures/progress.gdshader)0
-rw-r--r--client/map/progress.tscn (renamed from client/scenes/progress.tscn)0
-rw-r--r--client/map/tiles/chair.gd (renamed from client/scripts/tiles/chair.gd)0
-rw-r--r--client/map/tiles/counter.gd (renamed from client/scripts/tiles/counter.gd)0
-rw-r--r--client/map/tiles/counter_base.gd (renamed from client/scripts/tiles/counter_base.gd)0
-rw-r--r--client/map/tiles/crate.gd (renamed from client/scripts/tiles/crate.gd)0
-rw-r--r--client/map/tiles/cutting_board.gd (renamed from client/scripts/tiles/cutting_board.gd)0
-rw-r--r--client/map/tiles/door.gd (renamed from client/scripts/tiles/door.gd)0
-rw-r--r--client/map/tiles/floor.gd (renamed from client/scripts/tiles/floor.gd)0
-rw-r--r--client/map/tiles/flour_counter.gd (renamed from client/scripts/tiles/flour_counter.gd)0
-rw-r--r--client/map/tiles/full_tile.gd (renamed from client/scripts/tiles/full_tile.gd)0
-rw-r--r--client/map/tiles/generic_tile.gd (renamed from client/scripts/tiles/generic_tile.gd)0
-rw-r--r--client/map/tiles/oven.gd (renamed from client/scripts/tiles/oven.gd)0
-rw-r--r--client/map/tiles/raw_steak_crate.gd (renamed from client/scripts/tiles/raw_steak_crate.gd)0
-rw-r--r--client/map/tiles/sink.gd (renamed from client/scripts/tiles/sink.gd)0
-rw-r--r--client/map/tiles/stove.gd (renamed from client/scripts/tiles/stove.gd)0
-rw-r--r--client/map/tiles/table.gd (renamed from client/scripts/tiles/table.gd)0
-rw-r--r--client/map/tiles/tomato_crate.gd (renamed from client/scripts/tiles/tomato_crate.gd)0
-rw-r--r--client/map/tiles/trash.gd (renamed from client/scripts/tiles/trash.gd)0
-rw-r--r--client/map/tiles/wall.gd (renamed from client/scripts/tiles/wall.gd)0
-rw-r--r--client/map/tiles/wall_tile.gd (renamed from client/scripts/tiles/wall_tile.gd)0
-rw-r--r--client/map/tiles/window.gd (renamed from client/scripts/tiles/window.gd)0
-rw-r--r--client/menu/credits_menu.gd (renamed from client/scripts/credits_menu.gd)0
-rw-r--r--client/menu/credits_menu.tscn (renamed from client/scenes/credits_menu.tscn)0
-rw-r--r--client/menu/main_menu.gd (renamed from client/scripts/main_menu.gd)0
-rw-r--r--client/menu/main_menu.tscn (renamed from client/scenes/main_menu.tscn)0
-rw-r--r--client/menu/menu_background.gd (renamed from client/scripts/menu_background.gd)0
-rw-r--r--client/menu/scene_transition.gd (renamed from client/scripts/scene_transition.gd)0
-rw-r--r--client/menu/scene_transition.tscn (renamed from client/scenes/scene_transition.tscn)0
-rw-r--r--client/multiplayer.gd (renamed from client/scripts/multiplayer.gd)0
-rw-r--r--client/player/character.gd (renamed from client/scripts/character.gd)0
-rw-r--r--client/player/controllable_player.gd (renamed from client/scripts/controllable_player.gd)0
-rw-r--r--client/player/follow_camera.gd (renamed from client/scripts/follow_camera.gd)0
-rw-r--r--client/player/follow_camera.tscn (renamed from client/scenes/follow_camera.tscn)0
-rw-r--r--client/player/interact_marker.gdshader (renamed from client/textures/interact_marker.gdshader)0
-rw-r--r--client/player/marker.gd (renamed from client/scripts/marker.gd)0
-rw-r--r--client/player/marker.tscn (renamed from client/scenes/marker.tscn)0
-rw-r--r--client/player/mirror.gd (renamed from client/scripts/mirror.gd)0
-rw-r--r--client/player/player.gd (renamed from client/scripts/player.gd)0
-rw-r--r--client/player/player.tscn (renamed from client/scenes/player.tscn)0
-rw-r--r--client/scripts/socket_test.gd22
-rw-r--r--client/themes/styles/focus.tres13
48 files changed, 1 insertions, 35 deletions
diff --git a/.gitignore b/.gitignore
index 9e6b28b8..8849a268 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,4 @@
/test-client/*.js
/specs/*.html
/data/recipes.yaml
+.godot
diff --git a/client/scripts/game.gd b/client/game.gd
index eb338eaa..eb338eaa 100644
--- a/client/scripts/game.gd
+++ b/client/game.gd
diff --git a/client/scenes/game.tscn b/client/game.tscn
index f5c3c0c4..f5c3c0c4 100644
--- a/client/scenes/game.tscn
+++ b/client/game.tscn
diff --git a/client/scripts/item.gd b/client/map/item.gd
index 74e08c48..74e08c48 100644
--- a/client/scripts/item.gd
+++ b/client/map/item.gd
diff --git a/client/scripts/map.gd b/client/map/map.gd
index b5e519a6..b5e519a6 100644
--- a/client/scripts/map.gd
+++ b/client/map/map.gd
diff --git a/client/scripts/progress.gd b/client/map/progress.gd
index 4d6494f6..4d6494f6 100644
--- a/client/scripts/progress.gd
+++ b/client/map/progress.gd
diff --git a/client/textures/progress.gdshader b/client/map/progress.gdshader
index 0bf3e04a..0bf3e04a 100644
--- a/client/textures/progress.gdshader
+++ b/client/map/progress.gdshader
diff --git a/client/scenes/progress.tscn b/client/map/progress.tscn
index 273beb74..273beb74 100644
--- a/client/scenes/progress.tscn
+++ b/client/map/progress.tscn
diff --git a/client/scripts/tiles/chair.gd b/client/map/tiles/chair.gd
index 34735fda..34735fda 100644
--- a/client/scripts/tiles/chair.gd
+++ b/client/map/tiles/chair.gd
diff --git a/client/scripts/tiles/counter.gd b/client/map/tiles/counter.gd
index c3032e4f..c3032e4f 100644
--- a/client/scripts/tiles/counter.gd
+++ b/client/map/tiles/counter.gd
diff --git a/client/scripts/tiles/counter_base.gd b/client/map/tiles/counter_base.gd
index ebeebb3b..ebeebb3b 100644
--- a/client/scripts/tiles/counter_base.gd
+++ b/client/map/tiles/counter_base.gd
diff --git a/client/scripts/tiles/crate.gd b/client/map/tiles/crate.gd
index 21fae60b..21fae60b 100644
--- a/client/scripts/tiles/crate.gd
+++ b/client/map/tiles/crate.gd
diff --git a/client/scripts/tiles/cutting_board.gd b/client/map/tiles/cutting_board.gd
index 944a7a9f..944a7a9f 100644
--- a/client/scripts/tiles/cutting_board.gd
+++ b/client/map/tiles/cutting_board.gd
diff --git a/client/scripts/tiles/door.gd b/client/map/tiles/door.gd
index cfba08b7..cfba08b7 100644
--- a/client/scripts/tiles/door.gd
+++ b/client/map/tiles/door.gd
diff --git a/client/scripts/tiles/floor.gd b/client/map/tiles/floor.gd
index fec68cbd..fec68cbd 100644
--- a/client/scripts/tiles/floor.gd
+++ b/client/map/tiles/floor.gd
diff --git a/client/scripts/tiles/flour_counter.gd b/client/map/tiles/flour_counter.gd
index 4bf2b1f3..4bf2b1f3 100644
--- a/client/scripts/tiles/flour_counter.gd
+++ b/client/map/tiles/flour_counter.gd
diff --git a/client/scripts/tiles/full_tile.gd b/client/map/tiles/full_tile.gd
index 2da54237..2da54237 100644
--- a/client/scripts/tiles/full_tile.gd
+++ b/client/map/tiles/full_tile.gd
diff --git a/client/scripts/tiles/generic_tile.gd b/client/map/tiles/generic_tile.gd
index f7d1b4a7..f7d1b4a7 100644
--- a/client/scripts/tiles/generic_tile.gd
+++ b/client/map/tiles/generic_tile.gd
diff --git a/client/scripts/tiles/oven.gd b/client/map/tiles/oven.gd
index 88da3adb..88da3adb 100644
--- a/client/scripts/tiles/oven.gd
+++ b/client/map/tiles/oven.gd
diff --git a/client/scripts/tiles/raw_steak_crate.gd b/client/map/tiles/raw_steak_crate.gd
index 8ff93d6b..8ff93d6b 100644
--- a/client/scripts/tiles/raw_steak_crate.gd
+++ b/client/map/tiles/raw_steak_crate.gd
diff --git a/client/scripts/tiles/sink.gd b/client/map/tiles/sink.gd
index e4eaff60..e4eaff60 100644
--- a/client/scripts/tiles/sink.gd
+++ b/client/map/tiles/sink.gd
diff --git a/client/scripts/tiles/stove.gd b/client/map/tiles/stove.gd
index 93fad5a3..93fad5a3 100644
--- a/client/scripts/tiles/stove.gd
+++ b/client/map/tiles/stove.gd
diff --git a/client/scripts/tiles/table.gd b/client/map/tiles/table.gd
index 533223a4..533223a4 100644
--- a/client/scripts/tiles/table.gd
+++ b/client/map/tiles/table.gd
diff --git a/client/scripts/tiles/tomato_crate.gd b/client/map/tiles/tomato_crate.gd
index 078d0ba2..078d0ba2 100644
--- a/client/scripts/tiles/tomato_crate.gd
+++ b/client/map/tiles/tomato_crate.gd
diff --git a/client/scripts/tiles/trash.gd b/client/map/tiles/trash.gd
index fed1a502..fed1a502 100644
--- a/client/scripts/tiles/trash.gd
+++ b/client/map/tiles/trash.gd
diff --git a/client/scripts/tiles/wall.gd b/client/map/tiles/wall.gd
index 0201d4d6..0201d4d6 100644
--- a/client/scripts/tiles/wall.gd
+++ b/client/map/tiles/wall.gd
diff --git a/client/scripts/tiles/wall_tile.gd b/client/map/tiles/wall_tile.gd
index 7c9d4305..7c9d4305 100644
--- a/client/scripts/tiles/wall_tile.gd
+++ b/client/map/tiles/wall_tile.gd
diff --git a/client/scripts/tiles/window.gd b/client/map/tiles/window.gd
index b2926080..b2926080 100644
--- a/client/scripts/tiles/window.gd
+++ b/client/map/tiles/window.gd
diff --git a/client/scripts/credits_menu.gd b/client/menu/credits_menu.gd
index a48d5461..a48d5461 100644
--- a/client/scripts/credits_menu.gd
+++ b/client/menu/credits_menu.gd
diff --git a/client/scenes/credits_menu.tscn b/client/menu/credits_menu.tscn
index 65035329..65035329 100644
--- a/client/scenes/credits_menu.tscn
+++ b/client/menu/credits_menu.tscn
diff --git a/client/scripts/main_menu.gd b/client/menu/main_menu.gd
index df09cf7f..df09cf7f 100644
--- a/client/scripts/main_menu.gd
+++ b/client/menu/main_menu.gd
diff --git a/client/scenes/main_menu.tscn b/client/menu/main_menu.tscn
index ea9b31fb..ea9b31fb 100644
--- a/client/scenes/main_menu.tscn
+++ b/client/menu/main_menu.tscn
diff --git a/client/scripts/menu_background.gd b/client/menu/menu_background.gd
index e5b8ac31..e5b8ac31 100644
--- a/client/scripts/menu_background.gd
+++ b/client/menu/menu_background.gd
diff --git a/client/scripts/scene_transition.gd b/client/menu/scene_transition.gd
index b5c89579..b5c89579 100644
--- a/client/scripts/scene_transition.gd
+++ b/client/menu/scene_transition.gd
diff --git a/client/scenes/scene_transition.tscn b/client/menu/scene_transition.tscn
index 0865dddf..0865dddf 100644
--- a/client/scenes/scene_transition.tscn
+++ b/client/menu/scene_transition.tscn
diff --git a/client/scripts/multiplayer.gd b/client/multiplayer.gd
index 534ef663..534ef663 100644
--- a/client/scripts/multiplayer.gd
+++ b/client/multiplayer.gd
diff --git a/client/scripts/character.gd b/client/player/character.gd
index 847bd7b6..847bd7b6 100644
--- a/client/scripts/character.gd
+++ b/client/player/character.gd
diff --git a/client/scripts/controllable_player.gd b/client/player/controllable_player.gd
index 4c157349..4c157349 100644
--- a/client/scripts/controllable_player.gd
+++ b/client/player/controllable_player.gd
diff --git a/client/scripts/follow_camera.gd b/client/player/follow_camera.gd
index 74355688..74355688 100644
--- a/client/scripts/follow_camera.gd
+++ b/client/player/follow_camera.gd
diff --git a/client/scenes/follow_camera.tscn b/client/player/follow_camera.tscn
index 816563ba..816563ba 100644
--- a/client/scenes/follow_camera.tscn
+++ b/client/player/follow_camera.tscn
diff --git a/client/textures/interact_marker.gdshader b/client/player/interact_marker.gdshader
index 94b7323d..94b7323d 100644
--- a/client/textures/interact_marker.gdshader
+++ b/client/player/interact_marker.gdshader
diff --git a/client/scripts/marker.gd b/client/player/marker.gd
index 6e3e6ffa..6e3e6ffa 100644
--- a/client/scripts/marker.gd
+++ b/client/player/marker.gd
diff --git a/client/scenes/marker.tscn b/client/player/marker.tscn
index 7f21e199..7f21e199 100644
--- a/client/scenes/marker.tscn
+++ b/client/player/marker.tscn
diff --git a/client/scripts/mirror.gd b/client/player/mirror.gd
index ccec0e65..ccec0e65 100644
--- a/client/scripts/mirror.gd
+++ b/client/player/mirror.gd
diff --git a/client/scripts/player.gd b/client/player/player.gd
index 423855e9..423855e9 100644
--- a/client/scripts/player.gd
+++ b/client/player/player.gd
diff --git a/client/scenes/player.tscn b/client/player/player.tscn
index 9c633575..9c633575 100644
--- a/client/scenes/player.tscn
+++ b/client/player/player.tscn
diff --git a/client/scripts/socket_test.gd b/client/scripts/socket_test.gd
deleted file mode 100644
index 853dd981..00000000
--- a/client/scripts/socket_test.gd
+++ /dev/null
@@ -1,22 +0,0 @@
-# Undercooked - a game about cooking
-# Copyright 2024 tpart
-#
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Affero General Public License as published by
-# the Free Software Foundation, version 3 of the License only.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU Affero General Public License for more details.
-#
-# You should have received a copy of the GNU Affero General Public License
-# along with this program. If not, see <https://www.gnu.org/licenses/>.
-#
-extends Control
-
-@onready var address = $VBoxContainer/LineEdit
-
-func _on_button_pressed():
- Multiplayer.connectClient(address.text)
- get_tree().change_scene_to_file("res://scenes/game.tscn")
diff --git a/client/themes/styles/focus.tres b/client/themes/styles/focus.tres
deleted file mode 100644
index 4c8385ea..00000000
--- a/client/themes/styles/focus.tres
+++ /dev/null
@@ -1,13 +0,0 @@
-[gd_resource type="StyleBoxFlat" format=3 uid="uid://cakf4liofcocu"]
-
-[resource]
-bg_color = Color(0.47451, 0.580392, 0.917647, 0)
-border_width_left = 3
-border_width_top = 3
-border_width_right = 3
-border_width_bottom = 3
-border_color = Color(0.513726, 0.611765, 0.929412, 1)
-corner_radius_top_left = 10
-corner_radius_top_right = 10
-corner_radius_bottom_right = 10
-corner_radius_bottom_left = 10