aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--client/map/palette.png.import5
-rw-r--r--client/map/sounds/plate_up.oggbin11020 -> 7286 bytes
-rw-r--r--client/map/tiles/bark.webp.import5
-rw-r--r--client/map/tiles/bark_normal.webp.import5
-rw-r--r--client/map/tiles/grass_side.webp.import5
-rw-r--r--client/map/tiles/leaves.webp.import5
-rw-r--r--client/menu/circle.svg.import37
-rw-r--r--client/menu/game.gd8
-rw-r--r--client/menu/overlay.gd1
-rw-r--r--client/player/angry.webp.import5
-rw-r--r--client/player/character/circle.png.import5
-rw-r--r--client/player/character/faces.webp.import5
-rw-r--r--client/player/onscreen_controls/controls.tscn2
-rw-r--r--client/player/star.webp.import5
-rw-r--r--client/project.godot2
15 files changed, 74 insertions, 21 deletions
diff --git a/client/map/palette.png.import b/client/map/palette.png.import
index fc6946f3..92840fcf 100644
--- a/client/map/palette.png.import
+++ b/client/map/palette.png.import
@@ -4,15 +4,16 @@ importer="texture"
type="CompressedTexture2D"
uid="uid://dgcs4wkxsxe6a"
path.s3tc="res://.godot/imported/palette.png-3a59900c2345cc4f645d84b8df0a18e7.s3tc.ctex"
+path.etc2="res://.godot/imported/palette.png-3a59900c2345cc4f645d84b8df0a18e7.etc2.ctex"
metadata={
-"imported_formats": ["s3tc_bptc"],
+"imported_formats": ["s3tc_bptc", "etc2_astc"],
"vram_texture": true
}
[deps]
source_file="res://map/palette.png"
-dest_files=["res://.godot/imported/palette.png-3a59900c2345cc4f645d84b8df0a18e7.s3tc.ctex"]
+dest_files=["res://.godot/imported/palette.png-3a59900c2345cc4f645d84b8df0a18e7.s3tc.ctex", "res://.godot/imported/palette.png-3a59900c2345cc4f645d84b8df0a18e7.etc2.ctex"]
[params]
diff --git a/client/map/sounds/plate_up.ogg b/client/map/sounds/plate_up.ogg
index 08ce5bb6..21a96811 100644
--- a/client/map/sounds/plate_up.ogg
+++ b/client/map/sounds/plate_up.ogg
Binary files differ
diff --git a/client/map/tiles/bark.webp.import b/client/map/tiles/bark.webp.import
index c8fa875c..51256c56 100644
--- a/client/map/tiles/bark.webp.import
+++ b/client/map/tiles/bark.webp.import
@@ -4,15 +4,16 @@ importer="texture"
type="CompressedTexture2D"
uid="uid://bgh74bmrp46qc"
path.s3tc="res://.godot/imported/bark.webp-ca303b7b3d58abe022cf53cf86095d8e.s3tc.ctex"
+path.etc2="res://.godot/imported/bark.webp-ca303b7b3d58abe022cf53cf86095d8e.etc2.ctex"
metadata={
-"imported_formats": ["s3tc_bptc"],
+"imported_formats": ["s3tc_bptc", "etc2_astc"],
"vram_texture": true
}
[deps]
source_file="res://map/tiles/bark.webp"
-dest_files=["res://.godot/imported/bark.webp-ca303b7b3d58abe022cf53cf86095d8e.s3tc.ctex"]
+dest_files=["res://.godot/imported/bark.webp-ca303b7b3d58abe022cf53cf86095d8e.s3tc.ctex", "res://.godot/imported/bark.webp-ca303b7b3d58abe022cf53cf86095d8e.etc2.ctex"]
[params]
diff --git a/client/map/tiles/bark_normal.webp.import b/client/map/tiles/bark_normal.webp.import
index 8ec39b6f..1061f591 100644
--- a/client/map/tiles/bark_normal.webp.import
+++ b/client/map/tiles/bark_normal.webp.import
@@ -4,15 +4,16 @@ importer="texture"
type="CompressedTexture2D"
uid="uid://bmvab6kdyccm4"
path.s3tc="res://.godot/imported/bark_normal.webp-a959f1e563d7021f4de54162a0386942.s3tc.ctex"
+path.etc2="res://.godot/imported/bark_normal.webp-a959f1e563d7021f4de54162a0386942.etc2.ctex"
metadata={
-"imported_formats": ["s3tc_bptc"],
+"imported_formats": ["s3tc_bptc", "etc2_astc"],
"vram_texture": true
}
[deps]
source_file="res://map/tiles/bark_normal.webp"
-dest_files=["res://.godot/imported/bark_normal.webp-a959f1e563d7021f4de54162a0386942.s3tc.ctex"]
+dest_files=["res://.godot/imported/bark_normal.webp-a959f1e563d7021f4de54162a0386942.s3tc.ctex", "res://.godot/imported/bark_normal.webp-a959f1e563d7021f4de54162a0386942.etc2.ctex"]
[params]
diff --git a/client/map/tiles/grass_side.webp.import b/client/map/tiles/grass_side.webp.import
index 5c19b024..b233145d 100644
--- a/client/map/tiles/grass_side.webp.import
+++ b/client/map/tiles/grass_side.webp.import
@@ -4,15 +4,16 @@ importer="texture"
type="CompressedTexture2D"
uid="uid://p35o0tkyfmrl"
path.s3tc="res://.godot/imported/grass_side.webp-1886940fb35aab66d976c18e081911f4.s3tc.ctex"
+path.etc2="res://.godot/imported/grass_side.webp-1886940fb35aab66d976c18e081911f4.etc2.ctex"
metadata={
-"imported_formats": ["s3tc_bptc"],
+"imported_formats": ["s3tc_bptc", "etc2_astc"],
"vram_texture": true
}
[deps]
source_file="res://map/tiles/grass_side.webp"
-dest_files=["res://.godot/imported/grass_side.webp-1886940fb35aab66d976c18e081911f4.s3tc.ctex"]
+dest_files=["res://.godot/imported/grass_side.webp-1886940fb35aab66d976c18e081911f4.s3tc.ctex", "res://.godot/imported/grass_side.webp-1886940fb35aab66d976c18e081911f4.etc2.ctex"]
[params]
diff --git a/client/map/tiles/leaves.webp.import b/client/map/tiles/leaves.webp.import
index 4f1c2217..053516c0 100644
--- a/client/map/tiles/leaves.webp.import
+++ b/client/map/tiles/leaves.webp.import
@@ -4,15 +4,16 @@ importer="texture"
type="CompressedTexture2D"
uid="uid://bxxh66na6bumt"
path.s3tc="res://.godot/imported/leaves.webp-74b6f011fe2782672168a48c177030ec.s3tc.ctex"
+path.etc2="res://.godot/imported/leaves.webp-74b6f011fe2782672168a48c177030ec.etc2.ctex"
metadata={
-"imported_formats": ["s3tc_bptc"],
+"imported_formats": ["s3tc_bptc", "etc2_astc"],
"vram_texture": true
}
[deps]
source_file="res://map/tiles/leaves.webp"
-dest_files=["res://.godot/imported/leaves.webp-74b6f011fe2782672168a48c177030ec.s3tc.ctex"]
+dest_files=["res://.godot/imported/leaves.webp-74b6f011fe2782672168a48c177030ec.s3tc.ctex", "res://.godot/imported/leaves.webp-74b6f011fe2782672168a48c177030ec.etc2.ctex"]
[params]
diff --git a/client/menu/circle.svg.import b/client/menu/circle.svg.import
new file mode 100644
index 00000000..dcc19684
--- /dev/null
+++ b/client/menu/circle.svg.import
@@ -0,0 +1,37 @@
+[remap]
+
+importer="texture"
+type="CompressedTexture2D"
+uid="uid://d2xf8qdh01e41"
+path="res://.godot/imported/circle.svg-d0b2fb05ade8e48b77faa1fda965eee3.ctex"
+metadata={
+"vram_texture": false
+}
+
+[deps]
+
+source_file="res://menu/circle.svg"
+dest_files=["res://.godot/imported/circle.svg-d0b2fb05ade8e48b77faa1fda965eee3.ctex"]
+
+[params]
+
+compress/mode=0
+compress/high_quality=false
+compress/lossy_quality=0.7
+compress/hdr_compression=1
+compress/normal_map=0
+compress/channel_pack=0
+mipmaps/generate=false
+mipmaps/limit=-1
+roughness/mode=0
+roughness/src_normal=""
+process/fix_alpha_border=true
+process/premult_alpha=false
+process/normal_map_invert_y=false
+process/hdr_as_srgb=false
+process/hdr_clamp_exposure=false
+process/size_limit=0
+detect_3d/compress_to=1
+svg/scale=1.0
+editor/scale_with_editor_scale=false
+editor/convert_colors_with_editor_theme=false
diff --git a/client/menu/game.gd b/client/menu/game.gd
index ee8743f4..f2526645 100644
--- a/client/menu/game.gd
+++ b/client/menu/game.gd
@@ -1,9 +1,13 @@
extends Menu
func _ready():
+ get_tree().get_root().connect("go_back_requested", open_ingame_menu)
super()
func _input(_event):
if Input.is_action_just_pressed("pause"):
- Sound.play_click()
- submenu("res://menu/ingame.tscn")
+ open_ingame_menu()
+
+func open_ingame_menu():
+ Sound.play_click()
+ submenu("res://menu/ingame.tscn")
diff --git a/client/menu/overlay.gd b/client/menu/overlay.gd
index 92297704..89bbeb24 100644
--- a/client/menu/overlay.gd
+++ b/client/menu/overlay.gd
@@ -15,6 +15,7 @@ var points: int = 0
@onready var decimals_label: Label = $Time/Paper/Line/Decimals
func update(failed_: int, completed_: int, points_: int, time: float):
+ show()
if failed_ - failed:
failed_label.text = str(failed_)
failed_label.scale = LABEL_SCALE
diff --git a/client/player/angry.webp.import b/client/player/angry.webp.import
index 989ff542..2d622e73 100644
--- a/client/player/angry.webp.import
+++ b/client/player/angry.webp.import
@@ -4,15 +4,16 @@ importer="texture"
type="CompressedTexture2D"
uid="uid://unjbxplj845n"
path.s3tc="res://.godot/imported/angry.webp-0f7d45c1cfc32a18650521cc19587d16.s3tc.ctex"
+path.etc2="res://.godot/imported/angry.webp-0f7d45c1cfc32a18650521cc19587d16.etc2.ctex"
metadata={
-"imported_formats": ["s3tc_bptc"],
+"imported_formats": ["s3tc_bptc", "etc2_astc"],
"vram_texture": true
}
[deps]
source_file="res://player/angry.webp"
-dest_files=["res://.godot/imported/angry.webp-0f7d45c1cfc32a18650521cc19587d16.s3tc.ctex"]
+dest_files=["res://.godot/imported/angry.webp-0f7d45c1cfc32a18650521cc19587d16.s3tc.ctex", "res://.godot/imported/angry.webp-0f7d45c1cfc32a18650521cc19587d16.etc2.ctex"]
[params]
diff --git a/client/player/character/circle.png.import b/client/player/character/circle.png.import
index 96e2dcd2..0fab7267 100644
--- a/client/player/character/circle.png.import
+++ b/client/player/character/circle.png.import
@@ -4,15 +4,16 @@ importer="texture"
type="CompressedTexture2D"
uid="uid://cs7fnnb38byq4"
path.s3tc="res://.godot/imported/circle.png-861d62bd7a6981460f3f22a0cea3c33a.s3tc.ctex"
+path.etc2="res://.godot/imported/circle.png-861d62bd7a6981460f3f22a0cea3c33a.etc2.ctex"
metadata={
-"imported_formats": ["s3tc_bptc"],
+"imported_formats": ["s3tc_bptc", "etc2_astc"],
"vram_texture": true
}
[deps]
source_file="res://player/character/circle.png"
-dest_files=["res://.godot/imported/circle.png-861d62bd7a6981460f3f22a0cea3c33a.s3tc.ctex"]
+dest_files=["res://.godot/imported/circle.png-861d62bd7a6981460f3f22a0cea3c33a.s3tc.ctex", "res://.godot/imported/circle.png-861d62bd7a6981460f3f22a0cea3c33a.etc2.ctex"]
[params]
diff --git a/client/player/character/faces.webp.import b/client/player/character/faces.webp.import
index b3fe4e7f..62d68905 100644
--- a/client/player/character/faces.webp.import
+++ b/client/player/character/faces.webp.import
@@ -4,15 +4,16 @@ importer="texture"
type="CompressedTexture2D"
uid="uid://btja0lcsrgeeb"
path.s3tc="res://.godot/imported/faces.webp-32648314b849ceed0e72c2c9927fdb2f.s3tc.ctex"
+path.etc2="res://.godot/imported/faces.webp-32648314b849ceed0e72c2c9927fdb2f.etc2.ctex"
metadata={
-"imported_formats": ["s3tc_bptc"],
+"imported_formats": ["s3tc_bptc", "etc2_astc"],
"vram_texture": true
}
[deps]
source_file="res://player/character/faces.webp"
-dest_files=["res://.godot/imported/faces.webp-32648314b849ceed0e72c2c9927fdb2f.s3tc.ctex"]
+dest_files=["res://.godot/imported/faces.webp-32648314b849ceed0e72c2c9927fdb2f.s3tc.ctex", "res://.godot/imported/faces.webp-32648314b849ceed0e72c2c9927fdb2f.etc2.ctex"]
[params]
diff --git a/client/player/onscreen_controls/controls.tscn b/client/player/onscreen_controls/controls.tscn
index 36505c7b..960a48b1 100644
--- a/client/player/onscreen_controls/controls.tscn
+++ b/client/player/onscreen_controls/controls.tscn
@@ -28,7 +28,7 @@ scale = Vector2(0.5, 0.5)
texture_normal = ExtResource("2_i4ife")
[node name="Interact" type="TouchScreenButton" parent="Buttons"]
-position = Vector2(150, 150)
+position = Vector2(0, 150)
scale = Vector2(0.5, 0.5)
texture_normal = ExtResource("3_37rne")
diff --git a/client/player/star.webp.import b/client/player/star.webp.import
index 7eb2cfbd..ff84dd75 100644
--- a/client/player/star.webp.import
+++ b/client/player/star.webp.import
@@ -4,15 +4,16 @@ importer="texture"
type="CompressedTexture2D"
uid="uid://b10goh4dsa3b0"
path.s3tc="res://.godot/imported/star.webp-4786407830caaa0c9666a30a1d4a05f7.s3tc.ctex"
+path.etc2="res://.godot/imported/star.webp-4786407830caaa0c9666a30a1d4a05f7.etc2.ctex"
metadata={
-"imported_formats": ["s3tc_bptc"],
+"imported_formats": ["s3tc_bptc", "etc2_astc"],
"vram_texture": true
}
[deps]
source_file="res://player/star.webp"
-dest_files=["res://.godot/imported/star.webp-4786407830caaa0c9666a30a1d4a05f7.s3tc.ctex"]
+dest_files=["res://.godot/imported/star.webp-4786407830caaa0c9666a30a1d4a05f7.s3tc.ctex", "res://.godot/imported/star.webp-4786407830caaa0c9666a30a1d4a05f7.etc2.ctex"]
[params]
diff --git a/client/project.godot b/client/project.godot
index 6be4f6b1..48b6523e 100644
--- a/client/project.godot
+++ b/client/project.godot
@@ -12,6 +12,7 @@ config_version=5
config/name="undercooked"
run/main_scene="res://menu/entry.tscn"
+config/quit_on_go_back=false
config/features=PackedStringArray("4.2", "Forward Plus")
boot_splash/bg_color=Color(0.282353, 0.141176, 0.141176, 1)
boot_splash/image="res://icon.png"
@@ -146,6 +147,7 @@ locale/translations_pot_files=PackedStringArray("res://menu/main_menu.tscn", "re
[rendering]
+textures/vram_compression/import_etc2_astc=true
anti_aliasing/quality/msaa_2d=2
anti_aliasing/quality/msaa_3d=2
anti_aliasing/quality/use_taa=true
generated by cgit v1.2.3-70-g09d2 (git 2.51.0) at 2025-10-08 16:25:38 +0000