Valcuda/project_teddy
1
0
Fork 0
forked from the_adventures_of_teddy/project_teddy
Code Pull requests Activity

Improved menus

Browse source
This commit is contained in:
Paul Black 2023-03-05 20:15:46 -07:00
parent be613a1615
commit dfa803d503
11 changed files with 25 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
objects/toyland/Wood050_2K_Color.jpg.import
View file

@ -4,16 +4,15 @@ importer="texture"
type="CompressedTexture2D" type="CompressedTexture2D"
uid="uid://dnobq0anmbln8" uid="uid://dnobq0anmbln8"
path.s3tc="res://.godot/imported/Wood050_2K_Color.jpg-e6185de0fa12ff4588e435b3845fb87e.s3tc.ctex" path.s3tc="res://.godot/imported/Wood050_2K_Color.jpg-e6185de0fa12ff4588e435b3845fb87e.s3tc.ctex"
path.etc2="res://.godot/imported/Wood050_2K_Color.jpg-e6185de0fa12ff4588e435b3845fb87e.etc2.ctex"
metadata={ metadata={
"imported_formats": ["s3tc_bptc", "etc2_astc"], "imported_formats": ["s3tc_bptc"],
"vram_texture": true "vram_texture": true
} }
[deps] [deps]
source_file="res://objects/toyland/Wood050_2K_Color.jpg" source_file="res://objects/toyland/Wood050_2K_Color.jpg"
dest_files=["res://.godot/imported/Wood050_2K_Color.jpg-e6185de0fa12ff4588e435b3845fb87e.s3tc.ctex", "res://.godot/imported/Wood050_2K_Color.jpg-e6185de0fa12ff4588e435b3845fb87e.etc2.ctex"] dest_files=["res://.godot/imported/Wood050_2K_Color.jpg-e6185de0fa12ff4588e435b3845fb87e.s3tc.ctex"]
[params] [params]

5
objects/toyland/newplaster.jpg.import
View file

@ -4,16 +4,15 @@ importer="texture"
type="CompressedTexture2D" type="CompressedTexture2D"
uid="uid://cmhq2gjngssxg" uid="uid://cmhq2gjngssxg"
path.s3tc="res://.godot/imported/newplaster.jpg-c0159d01e1a6adffe0c3bf5b8dcfc7a7.s3tc.ctex" path.s3tc="res://.godot/imported/newplaster.jpg-c0159d01e1a6adffe0c3bf5b8dcfc7a7.s3tc.ctex"
path.etc2="res://.godot/imported/newplaster.jpg-c0159d01e1a6adffe0c3bf5b8dcfc7a7.etc2.ctex"
metadata={ metadata={
"imported_formats": ["s3tc_bptc", "etc2_astc"], "imported_formats": ["s3tc_bptc"],
"vram_texture": true "vram_texture": true
} }
[deps] [deps]
source_file="res://objects/toyland/newplaster.jpg" source_file="res://objects/toyland/newplaster.jpg"
dest_files=["res://.godot/imported/newplaster.jpg-c0159d01e1a6adffe0c3bf5b8dcfc7a7.s3tc.ctex", "res://.godot/imported/newplaster.jpg-c0159d01e1a6adffe0c3bf5b8dcfc7a7.etc2.ctex"] dest_files=["res://.godot/imported/newplaster.jpg-c0159d01e1a6adffe0c3bf5b8dcfc7a7.s3tc.ctex"]
[params] [params]

5
objects/toyland/toyland-acc3ec7302587eef6111479be4ff2e5f_Wood050_2K_Color.png.import
View file

@ -4,9 +4,8 @@ importer="texture"
type="CompressedTexture2D" type="CompressedTexture2D"
uid="uid://c4brgjvonnjkr" uid="uid://c4brgjvonnjkr"
path.s3tc="res://.godot/imported/toyland-acc3ec7302587eef6111479be4ff2e5f_Wood050_2K_Color.png-09e60c6431251b5cdad5e7603ca8ef91.s3tc.ctex" path.s3tc="res://.godot/imported/toyland-acc3ec7302587eef6111479be4ff2e5f_Wood050_2K_Color.png-09e60c6431251b5cdad5e7603ca8ef91.s3tc.ctex"
path.etc2="res://.godot/imported/toyland-acc3ec7302587eef6111479be4ff2e5f_Wood050_2K_Color.png-09e60c6431251b5cdad5e7603ca8ef91.etc2.ctex"
metadata={ metadata={
"imported_formats": ["s3tc_bptc", "etc2_astc"], "imported_formats": ["s3tc_bptc"],
"vram_texture": true "vram_texture": true
} }
generator_parameters={} generator_parameters={}
@ -14,7 +13,7 @@ generator_parameters={}
[deps] [deps]
source_file="res://objects/toyland/toyland-acc3ec7302587eef6111479be4ff2e5f_Wood050_2K_Color.png" source_file="res://objects/toyland/toyland-acc3ec7302587eef6111479be4ff2e5f_Wood050_2K_Color.png"
dest_files=["res://.godot/imported/toyland-acc3ec7302587eef6111479be4ff2e5f_Wood050_2K_Color.png-09e60c6431251b5cdad5e7603ca8ef91.s3tc.ctex", "res://.godot/imported/toyland-acc3ec7302587eef6111479be4ff2e5f_Wood050_2K_Color.png-09e60c6431251b5cdad5e7603ca8ef91.etc2.ctex"] dest_files=["res://.godot/imported/toyland-acc3ec7302587eef6111479be4ff2e5f_Wood050_2K_Color.png-09e60c6431251b5cdad5e7603ca8ef91.s3tc.ctex"]
[params] [params]

5
objects/toyland/toyland-acc3ec7302587eef6111479be4ff2e5f_newplaster.png.import
View file

@ -4,9 +4,8 @@ importer="texture"
type="CompressedTexture2D" type="CompressedTexture2D"
uid="uid://ql40b60xucke" uid="uid://ql40b60xucke"
path.s3tc="res://.godot/imported/toyland-acc3ec7302587eef6111479be4ff2e5f_newplaster.png-56bf5185a878e2d32e5a25ec8c8517fb.s3tc.ctex" path.s3tc="res://.godot/imported/toyland-acc3ec7302587eef6111479be4ff2e5f_newplaster.png-56bf5185a878e2d32e5a25ec8c8517fb.s3tc.ctex"
path.etc2="res://.godot/imported/toyland-acc3ec7302587eef6111479be4ff2e5f_newplaster.png-56bf5185a878e2d32e5a25ec8c8517fb.etc2.ctex"
metadata={ metadata={
"imported_formats": ["s3tc_bptc", "etc2_astc"], "imported_formats": ["s3tc_bptc"],
"vram_texture": true "vram_texture": true
} }
generator_parameters={} generator_parameters={}
@ -14,7 +13,7 @@ generator_parameters={}
[deps] [deps]
source_file="res://objects/toyland/toyland-acc3ec7302587eef6111479be4ff2e5f_newplaster.png" source_file="res://objects/toyland/toyland-acc3ec7302587eef6111479be4ff2e5f_newplaster.png"
dest_files=["res://.godot/imported/toyland-acc3ec7302587eef6111479be4ff2e5f_newplaster.png-56bf5185a878e2d32e5a25ec8c8517fb.s3tc.ctex", "res://.godot/imported/toyland-acc3ec7302587eef6111479be4ff2e5f_newplaster.png-56bf5185a878e2d32e5a25ec8c8517fb.etc2.ctex"] dest_files=["res://.godot/imported/toyland-acc3ec7302587eef6111479be4ff2e5f_newplaster.png-56bf5185a878e2d32e5a25ec8c8517fb.s3tc.ctex"]
[params] [params]

5
objects/toyland/toyland-acc3ec7302587eef6111479be4ff2e5f_windows_xp_bliss-wide.png.import
View file

@ -4,9 +4,8 @@ importer="texture"
type="CompressedTexture2D" type="CompressedTexture2D"
uid="uid://cj28kq4i36gcg" uid="uid://cj28kq4i36gcg"
path.s3tc="res://.godot/imported/toyland-acc3ec7302587eef6111479be4ff2e5f_windows_xp_bliss-wide.png-c0ea880c9d43e5d1d8d800dd069f83dd.s3tc.ctex" path.s3tc="res://.godot/imported/toyland-acc3ec7302587eef6111479be4ff2e5f_windows_xp_bliss-wide.png-c0ea880c9d43e5d1d8d800dd069f83dd.s3tc.ctex"
path.etc2="res://.godot/imported/toyland-acc3ec7302587eef6111479be4ff2e5f_windows_xp_bliss-wide.png-c0ea880c9d43e5d1d8d800dd069f83dd.etc2.ctex"
metadata={ metadata={
"imported_formats": ["s3tc_bptc", "etc2_astc"], "imported_formats": ["s3tc_bptc"],
"vram_texture": true "vram_texture": true
} }
generator_parameters={} generator_parameters={}
@ -14,7 +13,7 @@ generator_parameters={}
[deps] [deps]
source_file="res://objects/toyland/toyland-acc3ec7302587eef6111479be4ff2e5f_windows_xp_bliss-wide.png" source_file="res://objects/toyland/toyland-acc3ec7302587eef6111479be4ff2e5f_windows_xp_bliss-wide.png"
dest_files=["res://.godot/imported/toyland-acc3ec7302587eef6111479be4ff2e5f_windows_xp_bliss-wide.png-c0ea880c9d43e5d1d8d800dd069f83dd.s3tc.ctex", "res://.godot/imported/toyland-acc3ec7302587eef6111479be4ff2e5f_windows_xp_bliss-wide.png-c0ea880c9d43e5d1d8d800dd069f83dd.etc2.ctex"] dest_files=["res://.godot/imported/toyland-acc3ec7302587eef6111479be4ff2e5f_windows_xp_bliss-wide.png-c0ea880c9d43e5d1d8d800dd069f83dd.s3tc.ctex"]
[params] [params]

5
objects/toyland/windows_xp_bliss-wide.jpg.import
View file

@ -4,16 +4,15 @@ importer="texture"
type="CompressedTexture2D" type="CompressedTexture2D"
uid="uid://co6sxyhce6s7" uid="uid://co6sxyhce6s7"
path.s3tc="res://.godot/imported/windows_xp_bliss-wide.jpg-b027b98d80d6be8ceaca628f4dcf54ce.s3tc.ctex" path.s3tc="res://.godot/imported/windows_xp_bliss-wide.jpg-b027b98d80d6be8ceaca628f4dcf54ce.s3tc.ctex"
path.etc2="res://.godot/imported/windows_xp_bliss-wide.jpg-b027b98d80d6be8ceaca628f4dcf54ce.etc2.ctex"
metadata={ metadata={
"imported_formats": ["s3tc_bptc", "etc2_astc"], "imported_formats": ["s3tc_bptc"],
"vram_texture": true "vram_texture": true
} }
[deps] [deps]
source_file="res://objects/toyland/windows_xp_bliss-wide.jpg" source_file="res://objects/toyland/windows_xp_bliss-wide.jpg"
dest_files=["res://.godot/imported/windows_xp_bliss-wide.jpg-b027b98d80d6be8ceaca628f4dcf54ce.s3tc.ctex", "res://.godot/imported/windows_xp_bliss-wide.jpg-b027b98d80d6be8ceaca628f4dcf54ce.etc2.ctex"] dest_files=["res://.godot/imported/windows_xp_bliss-wide.jpg-b027b98d80d6be8ceaca628f4dcf54ce.s3tc.ctex"]
[params] [params]

5
objects/toyland/woodfloor4k.jpg.001.jpg.import
View file

@ -4,16 +4,15 @@ importer="texture"
type="CompressedTexture2D" type="CompressedTexture2D"
uid="uid://b6f2baaxv23qx" uid="uid://b6f2baaxv23qx"
path.s3tc="res://.godot/imported/woodfloor4k.jpg.001.jpg-e2bdf4950350ecebed41e5db675a15f9.s3tc.ctex" path.s3tc="res://.godot/imported/woodfloor4k.jpg.001.jpg-e2bdf4950350ecebed41e5db675a15f9.s3tc.ctex"
path.etc2="res://.godot/imported/woodfloor4k.jpg.001.jpg-e2bdf4950350ecebed41e5db675a15f9.etc2.ctex"
metadata={ metadata={
"imported_formats": ["s3tc_bptc", "etc2_astc"], "imported_formats": ["s3tc_bptc"],
"vram_texture": true "vram_texture": true
} }
[deps] [deps]
source_file="res://objects/toyland/woodfloor4k.jpg.001.jpg" source_file="res://objects/toyland/woodfloor4k.jpg.001.jpg"
dest_files=["res://.godot/imported/woodfloor4k.jpg.001.jpg-e2bdf4950350ecebed41e5db675a15f9.s3tc.ctex", "res://.godot/imported/woodfloor4k.jpg.001.jpg-e2bdf4950350ecebed41e5db675a15f9.etc2.ctex"] dest_files=["res://.godot/imported/woodfloor4k.jpg.001.jpg-e2bdf4950350ecebed41e5db675a15f9.s3tc.ctex"]
[params] [params]

4
project.godot
View file

@ -74,7 +74,3 @@ console_send={
"events": [Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":-1,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":4194309,"key_label":0,"unicode":0,"echo":false,"script":null) "events": [Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":-1,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":4194309,"key_label":0,"unicode":0,"echo":false,"script":null)
] ]
} }
[rendering]
textures/vram_compression/import_s3tc_bptc=true

2
scenes/mainmenu.tscn
View file

@ -36,6 +36,8 @@ offset_left = 245.0
offset_top = 577.0 offset_top = 577.0
offset_right = 436.0 offset_right = 436.0
offset_bottom = 640.0 offset_bottom = 640.0
tooltip_text = "Coming soon"
disabled = true
text = "TUTORIAL" text = "TUTORIAL"
[node name="playButton" type="Button" parent="."] [node name="playButton" type="Button" parent="."]

7
scripts/mainmenu.gd
View file

@ -5,8 +5,11 @@ var mainMenuScene = "res://scenes/mainmenu.tscn"
func _ready(): func _ready():
if Global.playingGame == true: if Global.playingGame == true:
$Button.text = "RESUME" $Button.text = "RESUME"
$Button3.text = "MAIN MENU"
$Background.visible = false $Background.visible = false
$playButton.visible = false $playButton.visible = false
$OurTimeIsNowSolo.visible = false
$Button.disabled = false
func _process(delta): func _process(delta):
pass pass
@ -26,6 +29,10 @@ func _on_button_2_pressed():
add_child(scene) add_child(scene)
func _on_button_3_pressed(): func _on_button_3_pressed():
if Global.playingGame == true:
get_tree().change_scene_to_file("res://scenes/mainmenu.tscn")
Global.playingGame = false
elif Global.playingGame == false:
get_tree().quit() get_tree().quit()

1
scripts/networking.gd
View file

@ -5,6 +5,7 @@ var SCENE = "res://scenes/toyland.tscn"
var connected_peers = [] var connected_peers = []
func create_server(port, maxPlayers): func create_server(port, maxPlayers):
peer.close()
var result = peer.create_server(port, maxPlayers) # Second paramater specifies the player limit. Can be anything between 1 and 4095 var result = peer.create_server(port, maxPlayers) # Second paramater specifies the player limit. Can be anything between 1 and 4095
multiplayer.multiplayer_peer = peer multiplayer.multiplayer_peer = peer
prints("Creating server result:", result) prints("Creating server result:", result)