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

Merge branch 'main' of https://git.techwizz-emu.com/The_Adventures_of_Teddy/Project_Teddy

Browse source 
merged upstream changes locally
This commit is contained in:
Paul Black 2023-02-24 23:51:36 -07:00
commit b2081c6e6a
10 changed files with 25 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
objects/Bullet/Bullet.gd
View file

@ -39,7 +39,7 @@ func _on_Shell_body_entered(body):
emit_signal("exploded", transform.origin) emit_signal("exploded", transform.origin)
queue_free() queue_free()
@rpc("any_peer", "call_remote", "unreliable") @rpc("any_peer", "call_remote", "reliable")
func damage_player(): func damage_player():
print("A bullet hit me!") print("A bullet hit me!")
Global.playerHealth = Global.playerHealth - 10 Global.playerHealth = Global.playerHealth - 10

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

@ -3,16 +3,16 @@
importer="texture" 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.etc2="res://.godot/imported/Wood050_2K_Color.jpg-e6185de0fa12ff4588e435b3845fb87e.etc2.ctex"
metadata={ metadata={
"imported_formats": ["s3tc_bptc"], "imported_formats": ["etc2_astc"],
"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"] dest_files=["res://.godot/imported/Wood050_2K_Color.jpg-e6185de0fa12ff4588e435b3845fb87e.etc2.ctex"]
[params] [params]

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

@ -3,16 +3,16 @@
importer="texture" importer="texture"
type="CompressedTexture2D" type="CompressedTexture2D"
uid="uid://cmhq2gjngssxg" uid="uid://cmhq2gjngssxg"
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"], "imported_formats": ["etc2_astc"],
"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"] dest_files=["res://.godot/imported/newplaster.jpg-c0159d01e1a6adffe0c3bf5b8dcfc7a7.etc2.ctex"]
[params] [params]

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

@ -3,9 +3,9 @@
importer="texture" 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.etc2="res://.godot/imported/toyland-acc3ec7302587eef6111479be4ff2e5f_Wood050_2K_Color.png-09e60c6431251b5cdad5e7603ca8ef91.etc2.ctex"
metadata={ metadata={
"imported_formats": ["s3tc_bptc"], "imported_formats": ["etc2_astc"],
"vram_texture": true "vram_texture": true
} }
generator_parameters={} generator_parameters={}
@ -13,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"] dest_files=["res://.godot/imported/toyland-acc3ec7302587eef6111479be4ff2e5f_Wood050_2K_Color.png-09e60c6431251b5cdad5e7603ca8ef91.etc2.ctex"]
[params] [params]

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

@ -3,9 +3,9 @@
importer="texture" 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.etc2="res://.godot/imported/toyland-acc3ec7302587eef6111479be4ff2e5f_newplaster.png-56bf5185a878e2d32e5a25ec8c8517fb.etc2.ctex"
metadata={ metadata={
"imported_formats": ["s3tc_bptc"], "imported_formats": ["etc2_astc"],
"vram_texture": true "vram_texture": true
} }
generator_parameters={} generator_parameters={}
@ -13,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"] dest_files=["res://.godot/imported/toyland-acc3ec7302587eef6111479be4ff2e5f_newplaster.png-56bf5185a878e2d32e5a25ec8c8517fb.etc2.ctex"]
[params] [params]

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

@ -3,9 +3,9 @@
importer="texture" 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.etc2="res://.godot/imported/toyland-acc3ec7302587eef6111479be4ff2e5f_windows_xp_bliss-wide.png-c0ea880c9d43e5d1d8d800dd069f83dd.etc2.ctex"
metadata={ metadata={
"imported_formats": ["s3tc_bptc"], "imported_formats": ["etc2_astc"],
"vram_texture": true "vram_texture": true
} }
generator_parameters={} generator_parameters={}
@ -13,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"] dest_files=["res://.godot/imported/toyland-acc3ec7302587eef6111479be4ff2e5f_windows_xp_bliss-wide.png-c0ea880c9d43e5d1d8d800dd069f83dd.etc2.ctex"]
[params] [params]

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

@ -3,16 +3,16 @@
importer="texture" 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.etc2="res://.godot/imported/windows_xp_bliss-wide.jpg-b027b98d80d6be8ceaca628f4dcf54ce.etc2.ctex"
metadata={ metadata={
"imported_formats": ["s3tc_bptc"], "imported_formats": ["etc2_astc"],
"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"] dest_files=["res://.godot/imported/windows_xp_bliss-wide.jpg-b027b98d80d6be8ceaca628f4dcf54ce.etc2.ctex"]
[params] [params]

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

@ -3,16 +3,16 @@
importer="texture" 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.etc2="res://.godot/imported/woodfloor4k.jpg.001.jpg-e2bdf4950350ecebed41e5db675a15f9.etc2.ctex"
metadata={ metadata={
"imported_formats": ["s3tc_bptc"], "imported_formats": ["etc2_astc"],
"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"] dest_files=["res://.godot/imported/woodfloor4k.jpg.001.jpg-e2bdf4950350ecebed41e5db675a15f9.etc2.ctex"]
[params] [params]

2
scripts/console.gd
View file

@ -44,6 +44,8 @@ func run_command(command):
elif command in ["suicide", "kill", "die"]: elif command in ["suicide", "kill", "die"]:
Global.consoleOutput = "Oh you didn't want to die?" Global.consoleOutput = "Oh you didn't want to die?"
Global.playerHealth = 0 Global.playerHealth = 0
elif command == "gps":
Global.consoleOutput = str(Global.get_node(Global.selfTeddy).global_position)
else: else:
Global.consoleOutput = "Unknown cheat code" Global.consoleOutput = "Unknown cheat code"
$output.text = Global.consoleOutput $output.text = Global.consoleOutput

2
scripts/networking.gd
View file

@ -29,7 +29,7 @@ func load_map(map):
Global.multiplayerCurrent = true Global.multiplayerCurrent = true
get_tree().change_scene_to_file(map) get_tree().change_scene_to_file(map)
@rpc("any_peer", "call_remote") @rpc
func add_newly_connected_player_character(new_peer_id): func add_newly_connected_player_character(new_peer_id):
print("Connected to server!") print("Connected to server!")
load_map(SCENE) load_map(SCENE)