From 2259cab64891407f54ca0de92d11aafed307cf4a Mon Sep 17 00:00:00 2001 From: Kristofers Solo Date: Thu, 21 Oct 2021 16:40:10 +0300 Subject: [PATCH] changed folder scructure --- .gitignore | 2 +- ...r.svg-297905206d682966af5dba035b7d5368.md5 | 3 - ....svg-297905206d682966af5dba035b7d5368.stex | Bin 602 -> 0 bytes Game_4/code/game.gd | 10 --- Game_4/scenes/game.tscn | 11 --- ...r.png-8870646e23ec8c3ad77089faabc9e773.md5 | 0 ...r.svg-297905206d682966af5dba035b7d5368.md5 | 3 + ....svg-297905206d682966af5dba035b7d5368.stex | Bin 0 -> 606 bytes ...n.png-487276ed1e3a0c39cad0279d744ee560.md5 | 0 ....png-487276ed1e3a0c39cad0279d744ee560.stex | Bin ...e.png-b735a7d58a47546099ef1144a282cd43.md5 | 0 ...e.svg-eb5ce7ff66dca983c1acbf7134c96e32.md5 | 0 ....svg-eb5ce7ff66dca983c1acbf7134c96e32.stex | Bin kristofers/game/code/UI.gd | 9 +++ kristofers/game/code/game.gd | 27 +++++++ {Game_4 => kristofers/game}/code/global.gd | 2 + {Game_4 => kristofers/game}/code/network.gd | 15 ++++ .../game}/code/network_setup.gd | 4 +- {Game_4 => kristofers/game}/code/player.gd | 0 .../game}/code/server_advertiser.gd | 0 .../game}/code/server_browser.gd | 0 .../game}/code/server_display.gd | 0 .../game}/code/server_listener.gd | 0 kristofers/game/code/simple_prompt.gd | 10 +++ .../game}/code/username_text.gd | 0 {Game_1 => kristofers/game}/default_env.tres | 0 .../game}/export_presets.cfg | 0 .../game/font}/Roboto-Regular.ttf | Bin {Game_4 => kristofers/game}/font/roboto.tres | 0 {Game_1 => kristofers/game}/icon.png | Bin {Game_1 => kristofers/game}/icon.png.import | 0 {Game_4 => kristofers/game}/project.godot | 2 +- {Game_4 => kristofers/game}/scenes/floor.tscn | 0 kristofers/game/scenes/game.tscn | 25 +++++++ .../game}/scenes/main_menu.tscn | 12 ++-- .../game}/scenes/player.tscn | 0 .../game}/scenes/players.tscn | 0 .../game}/scenes/server_advertiser.tscn | 0 .../game}/scenes/server_browser.tscn | 0 .../game}/scenes/server_display.tscn | 0 .../game}/scenes/server_listener.tscn | 0 kristofers/game/scenes/simple_prompt.tscn | 68 ++++++++++++++++++ .../game}/scenes/username_text.tscn | 0 {Game_4 => kristofers/game}/sprites/floor.svg | 8 +-- .../game}/sprites/floor.svg.import | 0 .../game}/sprites/square.svg | 0 .../game}/sprites/square.svg.import | 0 ...r.png-bad02a3061f4734a68e01c2ddec9b22e.md5 | 0 ....png-bad02a3061f4734a68e01c2ddec9b22e.stex | Bin ...n.png-487276ed1e3a0c39cad0279d744ee560.md5 | 0 ....png-487276ed1e3a0c39cad0279d744ee560.stex | Bin ...i.png-f9be092cc27114ea04f99ed2335d3100.md5 | 0 ....png-f9be092cc27114ea04f99ed2335d3100.stex | Bin ...a.png-68ab43619d46c5f3cf0fd86b7248d922.md5 | 0 ....png-68ab43619d46c5f3cf0fd86b7248d922.stex | Bin {Game_1 => kristofers/test/Game_1}/Floor.tscn | 0 {Game_1 => kristofers/test/Game_1}/Main.tscn | 0 {Game_1 => kristofers/test/Game_1}/Player.gd | 0 .../test/Game_1}/Player.tscn | 0 .../test/Game_1}/Sprites/floor.png.import | 0 .../test/Game_1}/Sprites/jedi.png | Bin .../test/Game_1}/Sprites/jedi.png.import | 0 .../test/Game_1}/Sprites/lava.png | Bin .../test/Game_1}/Sprites/lava.png.import | 0 .../test/Game_1}/default_env.tres | 0 .../test/Game_1}/export_presets.cfg | 0 {Game_3 => kristofers/test/Game_1}/icon.png | Bin .../test/Game_1}/icon.png.import | 0 .../test/Game_1}/project.godot | 2 +- {Game_2 => kristofers/test/Game_2}/.DS_Store | Bin ...r.png-69b43bef81833a017bb2ad21971dd33c.md5 | 0 ....png-69b43bef81833a017bb2ad21971dd33c.stex | Bin ...ecd940ae64dc916f761c9c67a0e31043.etc2.stex | Bin ...r.png-ecd940ae64dc916f761c9c67a0e31043.md5 | 0 ...ecd940ae64dc916f761c9c67a0e31043.s3tc.stex | Bin ....png-ecd940ae64dc916f761c9c67a0e31043.stex | Bin ...D.png-a75dd0d036ce991406177fdcdd795259.md5 | 0 ....png-a75dd0d036ce991406177fdcdd795259.stex | Bin ...e.png-8a7718f600671e0135cc35a601d6c8c7.md5 | 0 ....png-8a7718f600671e0135cc35a601d6c8c7.stex | Bin ...n.png-05a5f25b7b35b567a640a7daf7751a8e.md5 | 0 ....png-05a5f25b7b35b567a640a7daf7751a8e.stex | Bin ...n.png-ec674acb7f04b1a171404e09471346bb.md5 | 0 ....png-ec674acb7f04b1a171404e09471346bb.stex | Bin ...e.png-28f0e72acd44ad1774e5d6ee860b0ebe.md5 | 0 ....png-28f0e72acd44ad1774e5d6ee860b0ebe.stex | Bin ...t.fbx-30cdc2b91b676d732aee61d457270d56.md5 | 0 ...t.fbx-30cdc2b91b676d732aee61d457270d56.scn | Bin ...e.png-ea36a96acacaeeb29502e40bb1ec09f1.md5 | 0 ....png-ea36a96acacaeeb29502e40bb1ec09f1.stex | Bin ...e.png-e080306be9e3de7b6290ca8557e2f360.md5 | 0 ....png-e080306be9e3de7b6290ca8557e2f360.stex | Bin ...e.png-4a28a95e2aa8a906b989fb8e1a98bd92.md5 | 0 ....png-4a28a95e2aa8a906b989fb8e1a98bd92.stex | Bin ...n.png-487276ed1e3a0c39cad0279d744ee560.md5 | 0 ....png-487276ed1e3a0c39cad0279d744ee560.stex | Bin ....gltf-2c00d1d7d0f6d494d2489c8827633551.md5 | 0 ....gltf-2c00d1d7d0f6d494d2489c8827633551.scn | Bin ...1.png-87772d058110b5d64dbdfb8c04d0f2f5.md5 | 0 ....png-87772d058110b5d64dbdfb8c04d0f2f5.stex | Bin ...e.png-8236f31411ad0c0cd15f77e4aad35ea9.md5 | 0 ....png-8236f31411ad0c0cd15f77e4aad35ea9.stex | Bin .../Game_2}/HTML/Game #2 3D.audio.worklet.js | 0 .../test/Game_2}/HTML/Game #2 3D.html | 0 .../test/Game_2}/HTML/Game #2 3D.js | 0 .../test/Game_2}/HTML/Game #2 3D.png | Bin .../test/Game_2}/HTML/Game #2 3D.png.import | 0 .../test/Game_2}/HTML/Game #2 3D.wasm | Bin .../test/Game_2}/HTML/favicon.png | Bin .../test/Game_2}/HTML/favicon.png.import | 0 {Game_2 => kristofers/test/Game_2}/Main.tscn | 0 {Game_2 => kristofers/test/Game_2}/Player.gd | 0 .../test/Game_2}/cat/DefaultSkin.material | Bin .../test/Game_2}/cat/scene.bin | Bin .../test/Game_2}/cat/scene.gd | 0 .../test/Game_2}/cat/scene.gltf | 0 .../test/Game_2}/cat/scene.gltf.import | 0 .../cat/textures/DefaultSkin_baseColor.png | Bin .../textures/DefaultSkin_baseColor.png.import | 0 .../test/Game_2}/export_presets.cfg | 0 .../test/Game_2}/forest/.DS_Store | Bin .../Game_2}/forest/source/full forest.fbx | Bin .../forest/source/full forest.fbx.import | 0 .../test/Game_2}/forest/source/full forest.gd | 0 .../Game_2}/forest/source/lambert2.material | Bin .../Game_2}/forest/source/lambert3.material | Bin .../Game_2}/forest/source/lambert5.material | Bin .../Game_2}/forest/source/lambert6.material | Bin .../Game_2}/forest/source/lambert7.material | Bin .../Game_2}/forest/source/lambert8.material | Bin .../Game_2}/forest/source/lambert9.material | Bin .../forest/textures/1001_Base_Color.png | Bin .../textures/1001_Base_Color.png.import | 0 .../textures/camping tent_1001_Diffuse.png | Bin .../camping tent_1001_Diffuse.png.import | 0 .../forest/textures/floor_1001_Diffuse.png | Bin .../textures/floor_1001_Diffuse.png.import | 0 .../textures/full forest_arboles_Diffuse.png | Bin .../full forest_arboles_Diffuse.png.import | 0 .../textures/full forest_fogata_Diffuse.png | Bin .../full forest_fogata_Diffuse.png.import | 0 .../textures/full forest_roca_Diffuse.png | Bin .../full forest_roca_Diffuse.png.import | 0 .../forest/textures/trees2_1001_Diffuse.png | Bin .../textures/trees2_1001_Diffuse.png.import | 0 {Game_2 => kristofers/test/Game_2}/icon.png | Bin .../test/Game_2}/icon.png.import | 0 .../test/Game_2}/project.godot | 2 +- ...r.png-bad02a3061f4734a68e01c2ddec9b22e.md5 | 0 ....png-bad02a3061f4734a68e01c2ddec9b22e.stex | Bin ...n.png-487276ed1e3a0c39cad0279d744ee560.md5 | 0 ....png-487276ed1e3a0c39cad0279d744ee560.stex | Bin ...i.png-f9be092cc27114ea04f99ed2335d3100.md5 | 0 ....png-f9be092cc27114ea04f99ed2335d3100.stex | Bin ...a.png-68ab43619d46c5f3cf0fd86b7248d922.md5 | 0 ....png-68ab43619d46c5f3cf0fd86b7248d922.stex | Bin ...e.png-b7490a5e3cfc87a7a150d30e23b12756.md5 | 0 ....png-b7490a5e3cfc87a7a150d30e23b12756.stex | Bin .../test/Game_3}/Roboto-Regular.ttf | Bin .../test/Game_3}/Sprites/floor.png | Bin .../test/Game_3}/Sprites/floor.png.import | 0 .../test/Game_3}/Sprites/jedi.png.import | 0 .../test/Game_3}/Sprites/lava.png.import | 0 .../test/Game_3}/Sprites/sphere.png | Bin .../test/Game_3}/Sprites/sphere.png.import | 0 .../test/Game_3}/Sprites/sphere.png~ | Bin .../test/Game_3}/export_presets.cfg | 0 {Game_3 => kristofers/test/Game_3}/floor.tscn | 0 {Game_3 => kristofers/test/Game_3}/game.gd | 0 {Game_3 => kristofers/test/Game_3}/game.tscn | 0 {Game_4 => kristofers/test/Game_3}/icon.png | Bin .../test/Game_3}/icon.png.import | 0 {Game_3 => kristofers/test/Game_3}/menu.gd | 0 {Game_3 => kristofers/test/Game_3}/menu.tscn | 0 {Game_3 => kristofers/test/Game_3}/player.gd | 0 .../test/Game_3}/player.tscn | 0 .../test/Game_3}/project.godot | 2 +- .../test/Game_3}/roboto.tres | 0 .../test/Game_3}/roboto2.tres | 0 .../test/Game_3}/singleton.gd | 0 kristofers/test/Godot-Multiplayer-Shooter | 1 + 181 files changed, 178 insertions(+), 40 deletions(-) delete mode 100644 Game_4/.import/floor.svg-297905206d682966af5dba035b7d5368.md5 delete mode 100644 Game_4/.import/floor.svg-297905206d682966af5dba035b7d5368.stex delete mode 100644 Game_4/code/game.gd delete mode 100644 Game_4/scenes/game.tscn rename {Game_4 => kristofers/game}/.import/floor.png-8870646e23ec8c3ad77089faabc9e773.md5 (100%) create mode 100644 kristofers/game/.import/floor.svg-297905206d682966af5dba035b7d5368.md5 create mode 100644 kristofers/game/.import/floor.svg-297905206d682966af5dba035b7d5368.stex rename {Game_1 => kristofers/game}/.import/icon.png-487276ed1e3a0c39cad0279d744ee560.md5 (100%) rename {Game_1 => kristofers/game}/.import/icon.png-487276ed1e3a0c39cad0279d744ee560.stex (100%) rename {Game_4 => kristofers/game}/.import/sphere.png-b735a7d58a47546099ef1144a282cd43.md5 (100%) rename {Game_4 => kristofers/game}/.import/square.svg-eb5ce7ff66dca983c1acbf7134c96e32.md5 (100%) rename {Game_4 => kristofers/game}/.import/square.svg-eb5ce7ff66dca983c1acbf7134c96e32.stex (100%) create mode 100644 kristofers/game/code/UI.gd create mode 100644 kristofers/game/code/game.gd rename {Game_4 => kristofers/game}/code/global.gd (96%) rename {Game_4 => kristofers/game}/code/network.gd (75%) rename {Game_4 => kristofers/game}/code/network_setup.gd (94%) rename {Game_4 => kristofers/game}/code/player.gd (100%) rename {Game_4 => kristofers/game}/code/server_advertiser.gd (100%) rename {Game_4 => kristofers/game}/code/server_browser.gd (100%) rename {Game_4 => kristofers/game}/code/server_display.gd (100%) rename {Game_4 => kristofers/game}/code/server_listener.gd (100%) create mode 100644 kristofers/game/code/simple_prompt.gd rename {Game_4 => kristofers/game}/code/username_text.gd (100%) rename {Game_1 => kristofers/game}/default_env.tres (100%) rename {Game_4 => kristofers/game}/export_presets.cfg (100%) rename {Game_3 => kristofers/game/font}/Roboto-Regular.ttf (100%) rename {Game_4 => kristofers/game}/font/roboto.tres (100%) rename {Game_1 => kristofers/game}/icon.png (100%) rename {Game_1 => kristofers/game}/icon.png.import (100%) rename {Game_4 => kristofers/game}/project.godot (99%) rename {Game_4 => kristofers/game}/scenes/floor.tscn (100%) create mode 100644 kristofers/game/scenes/game.tscn rename {Game_4 => kristofers/game}/scenes/main_menu.tscn (84%) rename {Game_4 => kristofers/game}/scenes/player.tscn (100%) rename {Game_4 => kristofers/game}/scenes/players.tscn (100%) rename {Game_4 => kristofers/game}/scenes/server_advertiser.tscn (100%) rename {Game_4 => kristofers/game}/scenes/server_browser.tscn (100%) rename {Game_4 => kristofers/game}/scenes/server_display.tscn (100%) rename {Game_4 => kristofers/game}/scenes/server_listener.tscn (100%) create mode 100644 kristofers/game/scenes/simple_prompt.tscn rename {Game_4 => kristofers/game}/scenes/username_text.tscn (100%) rename {Game_4 => kristofers/game}/sprites/floor.svg (89%) rename {Game_4 => kristofers/game}/sprites/floor.svg.import (100%) rename {Game_4 => kristofers/game}/sprites/square.svg (100%) rename {Game_4 => kristofers/game}/sprites/square.svg.import (100%) rename {Game_1 => kristofers/test/Game_1}/.import/floor.png-bad02a3061f4734a68e01c2ddec9b22e.md5 (100%) rename {Game_1 => kristofers/test/Game_1}/.import/floor.png-bad02a3061f4734a68e01c2ddec9b22e.stex (100%) rename {Game_3 => kristofers/test/Game_1}/.import/icon.png-487276ed1e3a0c39cad0279d744ee560.md5 (100%) rename {Game_3 => kristofers/test/Game_1}/.import/icon.png-487276ed1e3a0c39cad0279d744ee560.stex (100%) rename {Game_1 => kristofers/test/Game_1}/.import/jedi.png-f9be092cc27114ea04f99ed2335d3100.md5 (100%) rename {Game_1 => kristofers/test/Game_1}/.import/jedi.png-f9be092cc27114ea04f99ed2335d3100.stex (100%) rename {Game_1 => kristofers/test/Game_1}/.import/lava.png-68ab43619d46c5f3cf0fd86b7248d922.md5 (100%) rename {Game_1 => kristofers/test/Game_1}/.import/lava.png-68ab43619d46c5f3cf0fd86b7248d922.stex (100%) rename {Game_1 => kristofers/test/Game_1}/Floor.tscn (100%) rename {Game_1 => kristofers/test/Game_1}/Main.tscn (100%) rename {Game_1 => kristofers/test/Game_1}/Player.gd (100%) rename {Game_1 => kristofers/test/Game_1}/Player.tscn (100%) rename {Game_1 => kristofers/test/Game_1}/Sprites/floor.png.import (100%) rename {Game_1 => kristofers/test/Game_1}/Sprites/jedi.png (100%) rename {Game_1 => kristofers/test/Game_1}/Sprites/jedi.png.import (100%) rename {Game_1 => kristofers/test/Game_1}/Sprites/lava.png (100%) rename {Game_1 => kristofers/test/Game_1}/Sprites/lava.png.import (100%) rename {Game_4 => kristofers/test/Game_1}/default_env.tres (100%) rename {Game_1 => kristofers/test/Game_1}/export_presets.cfg (100%) rename {Game_3 => kristofers/test/Game_1}/icon.png (100%) rename {Game_2 => kristofers/test/Game_1}/icon.png.import (100%) rename {Game_1 => kristofers/test/Game_1}/project.godot (99%) rename {Game_2 => kristofers/test/Game_2}/.DS_Store (100%) rename {Game_2 => kristofers/test/Game_2}/.import/1001_Base_Color.png-69b43bef81833a017bb2ad21971dd33c.md5 (100%) rename {Game_2 => kristofers/test/Game_2}/.import/1001_Base_Color.png-69b43bef81833a017bb2ad21971dd33c.stex (100%) rename {Game_2 => kristofers/test/Game_2}/.import/DefaultSkin_baseColor.png-ecd940ae64dc916f761c9c67a0e31043.etc2.stex (100%) rename {Game_2 => kristofers/test/Game_2}/.import/DefaultSkin_baseColor.png-ecd940ae64dc916f761c9c67a0e31043.md5 (100%) rename {Game_2 => kristofers/test/Game_2}/.import/DefaultSkin_baseColor.png-ecd940ae64dc916f761c9c67a0e31043.s3tc.stex (100%) rename {Game_2 => kristofers/test/Game_2}/.import/DefaultSkin_baseColor.png-ecd940ae64dc916f761c9c67a0e31043.stex (100%) rename {Game_2 => kristofers/test/Game_2}/.import/Game #2 3D.png-a75dd0d036ce991406177fdcdd795259.md5 (100%) rename {Game_2 => kristofers/test/Game_2}/.import/Game #2 3D.png-a75dd0d036ce991406177fdcdd795259.stex (100%) rename {Game_2 => kristofers/test/Game_2}/.import/camping tent_1001_Diffuse.png-8a7718f600671e0135cc35a601d6c8c7.md5 (100%) rename {Game_2 => kristofers/test/Game_2}/.import/camping tent_1001_Diffuse.png-8a7718f600671e0135cc35a601d6c8c7.stex (100%) rename {Game_2 => kristofers/test/Game_2}/.import/favicon.png-05a5f25b7b35b567a640a7daf7751a8e.md5 (100%) rename {Game_2 => kristofers/test/Game_2}/.import/favicon.png-05a5f25b7b35b567a640a7daf7751a8e.stex (100%) rename {Game_2 => kristofers/test/Game_2}/.import/favicon.png-ec674acb7f04b1a171404e09471346bb.md5 (100%) rename {Game_2 => kristofers/test/Game_2}/.import/favicon.png-ec674acb7f04b1a171404e09471346bb.stex (100%) rename {Game_2 => kristofers/test/Game_2}/.import/floor_1001_Diffuse.png-28f0e72acd44ad1774e5d6ee860b0ebe.md5 (100%) rename {Game_2 => kristofers/test/Game_2}/.import/floor_1001_Diffuse.png-28f0e72acd44ad1774e5d6ee860b0ebe.stex (100%) rename {Game_2 => kristofers/test/Game_2}/.import/full forest.fbx-30cdc2b91b676d732aee61d457270d56.md5 (100%) rename {Game_2 => kristofers/test/Game_2}/.import/full forest.fbx-30cdc2b91b676d732aee61d457270d56.scn (100%) rename {Game_2 => kristofers/test/Game_2}/.import/full forest_arboles_Diffuse.png-ea36a96acacaeeb29502e40bb1ec09f1.md5 (100%) rename {Game_2 => kristofers/test/Game_2}/.import/full forest_arboles_Diffuse.png-ea36a96acacaeeb29502e40bb1ec09f1.stex (100%) rename {Game_2 => kristofers/test/Game_2}/.import/full forest_fogata_Diffuse.png-e080306be9e3de7b6290ca8557e2f360.md5 (100%) rename {Game_2 => kristofers/test/Game_2}/.import/full forest_fogata_Diffuse.png-e080306be9e3de7b6290ca8557e2f360.stex (100%) rename {Game_2 => kristofers/test/Game_2}/.import/full forest_roca_Diffuse.png-4a28a95e2aa8a906b989fb8e1a98bd92.md5 (100%) rename {Game_2 => kristofers/test/Game_2}/.import/full forest_roca_Diffuse.png-4a28a95e2aa8a906b989fb8e1a98bd92.stex (100%) rename {Game_2 => kristofers/test/Game_2}/.import/icon.png-487276ed1e3a0c39cad0279d744ee560.md5 (100%) rename {Game_2 => kristofers/test/Game_2}/.import/icon.png-487276ed1e3a0c39cad0279d744ee560.stex (100%) rename {Game_2 => kristofers/test/Game_2}/.import/scene.gltf-2c00d1d7d0f6d494d2489c8827633551.md5 (100%) rename {Game_2 => kristofers/test/Game_2}/.import/scene.gltf-2c00d1d7d0f6d494d2489c8827633551.scn (100%) rename {Game_2 => kristofers/test/Game_2}/.import/texture_01.png-87772d058110b5d64dbdfb8c04d0f2f5.md5 (100%) rename {Game_2 => kristofers/test/Game_2}/.import/texture_01.png-87772d058110b5d64dbdfb8c04d0f2f5.stex (100%) rename {Game_2 => kristofers/test/Game_2}/.import/trees2_1001_Diffuse.png-8236f31411ad0c0cd15f77e4aad35ea9.md5 (100%) rename {Game_2 => kristofers/test/Game_2}/.import/trees2_1001_Diffuse.png-8236f31411ad0c0cd15f77e4aad35ea9.stex (100%) rename {Game_2 => kristofers/test/Game_2}/HTML/Game #2 3D.audio.worklet.js (100%) rename {Game_2 => kristofers/test/Game_2}/HTML/Game #2 3D.html (100%) rename {Game_2 => kristofers/test/Game_2}/HTML/Game #2 3D.js (100%) rename {Game_2 => kristofers/test/Game_2}/HTML/Game #2 3D.png (100%) rename {Game_2 => kristofers/test/Game_2}/HTML/Game #2 3D.png.import (100%) rename {Game_2 => kristofers/test/Game_2}/HTML/Game #2 3D.wasm (100%) rename {Game_2 => kristofers/test/Game_2}/HTML/favicon.png (100%) rename {Game_2 => kristofers/test/Game_2}/HTML/favicon.png.import (100%) rename {Game_2 => kristofers/test/Game_2}/Main.tscn (100%) rename {Game_2 => kristofers/test/Game_2}/Player.gd (100%) rename {Game_2 => kristofers/test/Game_2}/cat/DefaultSkin.material (100%) rename {Game_2 => kristofers/test/Game_2}/cat/scene.bin (100%) rename {Game_2 => kristofers/test/Game_2}/cat/scene.gd (100%) rename {Game_2 => kristofers/test/Game_2}/cat/scene.gltf (100%) rename {Game_2 => kristofers/test/Game_2}/cat/scene.gltf.import (100%) rename {Game_2 => kristofers/test/Game_2}/cat/textures/DefaultSkin_baseColor.png (100%) rename {Game_2 => kristofers/test/Game_2}/cat/textures/DefaultSkin_baseColor.png.import (100%) rename {Game_2 => kristofers/test/Game_2}/export_presets.cfg (100%) rename {Game_2 => kristofers/test/Game_2}/forest/.DS_Store (100%) rename {Game_2 => kristofers/test/Game_2}/forest/source/full forest.fbx (100%) rename {Game_2 => kristofers/test/Game_2}/forest/source/full forest.fbx.import (100%) rename {Game_2 => kristofers/test/Game_2}/forest/source/full forest.gd (100%) rename {Game_2 => kristofers/test/Game_2}/forest/source/lambert2.material (100%) rename {Game_2 => kristofers/test/Game_2}/forest/source/lambert3.material (100%) rename {Game_2 => kristofers/test/Game_2}/forest/source/lambert5.material (100%) rename {Game_2 => kristofers/test/Game_2}/forest/source/lambert6.material (100%) rename {Game_2 => kristofers/test/Game_2}/forest/source/lambert7.material (100%) rename {Game_2 => kristofers/test/Game_2}/forest/source/lambert8.material (100%) rename {Game_2 => kristofers/test/Game_2}/forest/source/lambert9.material (100%) rename {Game_2 => kristofers/test/Game_2}/forest/textures/1001_Base_Color.png (100%) rename {Game_2 => kristofers/test/Game_2}/forest/textures/1001_Base_Color.png.import (100%) rename {Game_2 => kristofers/test/Game_2}/forest/textures/camping tent_1001_Diffuse.png (100%) rename {Game_2 => kristofers/test/Game_2}/forest/textures/camping tent_1001_Diffuse.png.import (100%) rename {Game_2 => kristofers/test/Game_2}/forest/textures/floor_1001_Diffuse.png (100%) rename {Game_2 => kristofers/test/Game_2}/forest/textures/floor_1001_Diffuse.png.import (100%) rename {Game_2 => kristofers/test/Game_2}/forest/textures/full forest_arboles_Diffuse.png (100%) rename {Game_2 => kristofers/test/Game_2}/forest/textures/full forest_arboles_Diffuse.png.import (100%) rename {Game_2 => kristofers/test/Game_2}/forest/textures/full forest_fogata_Diffuse.png (100%) rename {Game_2 => kristofers/test/Game_2}/forest/textures/full forest_fogata_Diffuse.png.import (100%) rename {Game_2 => kristofers/test/Game_2}/forest/textures/full forest_roca_Diffuse.png (100%) rename {Game_2 => kristofers/test/Game_2}/forest/textures/full forest_roca_Diffuse.png.import (100%) rename {Game_2 => kristofers/test/Game_2}/forest/textures/trees2_1001_Diffuse.png (100%) rename {Game_2 => kristofers/test/Game_2}/forest/textures/trees2_1001_Diffuse.png.import (100%) rename {Game_2 => kristofers/test/Game_2}/icon.png (100%) rename {Game_3 => kristofers/test/Game_2}/icon.png.import (100%) rename {Game_2 => kristofers/test/Game_2}/project.godot (98%) rename {Game_3 => kristofers/test/Game_3}/.import/floor.png-bad02a3061f4734a68e01c2ddec9b22e.md5 (100%) rename {Game_3 => kristofers/test/Game_3}/.import/floor.png-bad02a3061f4734a68e01c2ddec9b22e.stex (100%) rename {Game_4 => kristofers/test/Game_3}/.import/icon.png-487276ed1e3a0c39cad0279d744ee560.md5 (100%) rename {Game_4 => kristofers/test/Game_3}/.import/icon.png-487276ed1e3a0c39cad0279d744ee560.stex (100%) rename {Game_3 => kristofers/test/Game_3}/.import/jedi.png-f9be092cc27114ea04f99ed2335d3100.md5 (100%) rename {Game_3 => kristofers/test/Game_3}/.import/jedi.png-f9be092cc27114ea04f99ed2335d3100.stex (100%) rename {Game_3 => kristofers/test/Game_3}/.import/lava.png-68ab43619d46c5f3cf0fd86b7248d922.md5 (100%) rename {Game_3 => kristofers/test/Game_3}/.import/lava.png-68ab43619d46c5f3cf0fd86b7248d922.stex (100%) rename {Game_3 => kristofers/test/Game_3}/.import/sphere.png-b7490a5e3cfc87a7a150d30e23b12756.md5 (100%) rename {Game_3 => kristofers/test/Game_3}/.import/sphere.png-b7490a5e3cfc87a7a150d30e23b12756.stex (100%) rename {Game_4/font => kristofers/test/Game_3}/Roboto-Regular.ttf (100%) rename {Game_3 => kristofers/test/Game_3}/Sprites/floor.png (100%) rename {Game_3 => kristofers/test/Game_3}/Sprites/floor.png.import (100%) rename {Game_3 => kristofers/test/Game_3}/Sprites/jedi.png.import (100%) rename {Game_3 => kristofers/test/Game_3}/Sprites/lava.png.import (100%) rename {Game_3 => kristofers/test/Game_3}/Sprites/sphere.png (100%) rename {Game_3 => kristofers/test/Game_3}/Sprites/sphere.png.import (100%) rename {Game_3 => kristofers/test/Game_3}/Sprites/sphere.png~ (100%) rename {Game_3 => kristofers/test/Game_3}/export_presets.cfg (100%) rename {Game_3 => kristofers/test/Game_3}/floor.tscn (100%) rename {Game_3 => kristofers/test/Game_3}/game.gd (100%) rename {Game_3 => kristofers/test/Game_3}/game.tscn (100%) rename {Game_4 => kristofers/test/Game_3}/icon.png (100%) rename {Game_4 => kristofers/test/Game_3}/icon.png.import (100%) rename {Game_3 => kristofers/test/Game_3}/menu.gd (100%) rename {Game_3 => kristofers/test/Game_3}/menu.tscn (100%) rename {Game_3 => kristofers/test/Game_3}/player.gd (100%) rename {Game_3 => kristofers/test/Game_3}/player.tscn (100%) rename {Game_3 => kristofers/test/Game_3}/project.godot (99%) rename {Game_3 => kristofers/test/Game_3}/roboto.tres (100%) rename {Game_3 => kristofers/test/Game_3}/roboto2.tres (100%) rename {Game_3 => kristofers/test/Game_3}/singleton.gd (100%) create mode 160000 kristofers/test/Godot-Multiplayer-Shooter diff --git a/.gitignore b/.gitignore index e12574b..0a6c96f 100644 --- a/.gitignore +++ b/.gitignore @@ -2,5 +2,5 @@ *.pck *.x86_64 *.log -/Godot-Multiplayer-Shooter /.import +/test \ No newline at end of file diff --git a/Game_4/.import/floor.svg-297905206d682966af5dba035b7d5368.md5 b/Game_4/.import/floor.svg-297905206d682966af5dba035b7d5368.md5 deleted file mode 100644 index c543f2c..0000000 --- a/Game_4/.import/floor.svg-297905206d682966af5dba035b7d5368.md5 +++ /dev/null @@ -1,3 +0,0 @@ -source_md5="9c64c312fe0c5859c87280aebe19b452" -dest_md5="7e50e59190bf14295c7cbedc26ee3b24" - diff --git a/Game_4/.import/floor.svg-297905206d682966af5dba035b7d5368.stex b/Game_4/.import/floor.svg-297905206d682966af5dba035b7d5368.stex deleted file mode 100644 index bc3dc9a3cb0dc0468114da58d5de5aeb0669e528..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 602 zcmZ>F2@YvsXJ9a3U|?VYVg?2Qc19p+$Hc%8;ODN;2_$&Aq_}`Wyq+E|K@1G+4M4U5 z2OE(5a6a7@NHG=%xjQkeJ16rJ$o}H#;uumf=j}~L-U9{#2R1}c?EmSuDCp`5w+Z$0 zDxXUO)q}vg?S4R8!C*r>BM*cnkjTIcVYx^gfG`*Y*+5PM0*97SWuR~vgaPvBRvP2| T3%~dAgWTuo>gTe~DWM4fW~4_P diff --git a/Game_4/code/game.gd b/Game_4/code/game.gd deleted file mode 100644 index 8264d8d..0000000 --- a/Game_4/code/game.gd +++ /dev/null @@ -1,10 +0,0 @@ -extends Node2D - -func _ready() -> void: - get_tree().connect("network_peer_disconnected", self, "_player_disconnected") - - -func _player_disconnected(id) -> void: - if Players.has_node(str(id)): - Players.get_node(str(id)).username_text_instance.queue_free() - Players.get_node(str(id)).queue_free() diff --git a/Game_4/scenes/game.tscn b/Game_4/scenes/game.tscn deleted file mode 100644 index efe7e23..0000000 --- a/Game_4/scenes/game.tscn +++ /dev/null @@ -1,11 +0,0 @@ -[gd_scene load_steps=3 format=2] - -[ext_resource path="res://scenes/floor.tscn" type="PackedScene" id=1] -[ext_resource path="res://code/game.gd" type="Script" id=2] - -[node name="game" type="Node2D"] -script = ExtResource( 2 ) - -[node name="floor" parent="." instance=ExtResource( 1 )] -position = Vector2( 960, 1056 ) -scale = Vector2( 2, 1 ) diff --git a/Game_4/.import/floor.png-8870646e23ec8c3ad77089faabc9e773.md5 b/kristofers/game/.import/floor.png-8870646e23ec8c3ad77089faabc9e773.md5 similarity index 100% rename from Game_4/.import/floor.png-8870646e23ec8c3ad77089faabc9e773.md5 rename to kristofers/game/.import/floor.png-8870646e23ec8c3ad77089faabc9e773.md5 diff --git a/kristofers/game/.import/floor.svg-297905206d682966af5dba035b7d5368.md5 b/kristofers/game/.import/floor.svg-297905206d682966af5dba035b7d5368.md5 new file mode 100644 index 0000000..61691d3 --- /dev/null +++ b/kristofers/game/.import/floor.svg-297905206d682966af5dba035b7d5368.md5 @@ -0,0 +1,3 @@ +source_md5="ea99925cae38c148dc6a1c29df4fb92e" +dest_md5="f73af61b19494ec5bf488ba2a748b42b" + diff --git a/kristofers/game/.import/floor.svg-297905206d682966af5dba035b7d5368.stex b/kristofers/game/.import/floor.svg-297905206d682966af5dba035b7d5368.stex new file mode 100644 index 0000000000000000000000000000000000000000..f9dd86dd32099e5f7c950d7812505f14ef267a9c GIT binary patch literal 606 zcmZ>F2@YvsXJ9a3U|?VYVg?2Qc19rS#Kgc5;ODN;2_$&Aq_}`Wyq+E|K@1G+4M4U5 z2OE(5a6a7@NHG=%xjQkeJ16rJ$o}E!;uumf=j}~L-Ub7P0|yNM7d>OPubI)Q+VafL z@&DdyfA=s0^#DP`{n_zAo57%VN XZyNKR?42bb=P`J?`njxgN@xNA7sN;P literal 0 HcmV?d00001 diff --git a/Game_1/.import/icon.png-487276ed1e3a0c39cad0279d744ee560.md5 b/kristofers/game/.import/icon.png-487276ed1e3a0c39cad0279d744ee560.md5 similarity index 100% rename from Game_1/.import/icon.png-487276ed1e3a0c39cad0279d744ee560.md5 rename to kristofers/game/.import/icon.png-487276ed1e3a0c39cad0279d744ee560.md5 diff --git a/Game_1/.import/icon.png-487276ed1e3a0c39cad0279d744ee560.stex b/kristofers/game/.import/icon.png-487276ed1e3a0c39cad0279d744ee560.stex similarity index 100% rename from Game_1/.import/icon.png-487276ed1e3a0c39cad0279d744ee560.stex rename to kristofers/game/.import/icon.png-487276ed1e3a0c39cad0279d744ee560.stex diff --git a/Game_4/.import/sphere.png-b735a7d58a47546099ef1144a282cd43.md5 b/kristofers/game/.import/sphere.png-b735a7d58a47546099ef1144a282cd43.md5 similarity index 100% rename from Game_4/.import/sphere.png-b735a7d58a47546099ef1144a282cd43.md5 rename to kristofers/game/.import/sphere.png-b735a7d58a47546099ef1144a282cd43.md5 diff --git a/Game_4/.import/square.svg-eb5ce7ff66dca983c1acbf7134c96e32.md5 b/kristofers/game/.import/square.svg-eb5ce7ff66dca983c1acbf7134c96e32.md5 similarity index 100% rename from Game_4/.import/square.svg-eb5ce7ff66dca983c1acbf7134c96e32.md5 rename to kristofers/game/.import/square.svg-eb5ce7ff66dca983c1acbf7134c96e32.md5 diff --git a/Game_4/.import/square.svg-eb5ce7ff66dca983c1acbf7134c96e32.stex b/kristofers/game/.import/square.svg-eb5ce7ff66dca983c1acbf7134c96e32.stex similarity index 100% rename from Game_4/.import/square.svg-eb5ce7ff66dca983c1acbf7134c96e32.stex rename to kristofers/game/.import/square.svg-eb5ce7ff66dca983c1acbf7134c96e32.stex diff --git a/kristofers/game/code/UI.gd b/kristofers/game/code/UI.gd new file mode 100644 index 0000000..69c8493 --- /dev/null +++ b/kristofers/game/code/UI.gd @@ -0,0 +1,9 @@ +extends CanvasLayer + + +func _ready() -> void: + Global.ui = self + + +func _exit_tree() -> void: + Global.ui = null diff --git a/kristofers/game/code/game.gd b/kristofers/game/code/game.gd new file mode 100644 index 0000000..4783d8c --- /dev/null +++ b/kristofers/game/code/game.gd @@ -0,0 +1,27 @@ +extends Node2D + +var current_spawn_location_instance_number = 1 +var current_player_location_instance_number = null + + +func _ready() -> void: + get_tree().connect("network_peer_disconnected", self, "_player_disconnected") + + if get_tree().is_network_server(): + setup_player_positions() + + +func setup_player_positions() -> void: + for player in Players.get_children(): + if player.is_in_group("player"): + for spawn_location in $spawn_locations.get_children(): + if int(spawn_location.name) == current_spawn_location_instance_number and current_player_location_instance_number != player: + player.rpc("update_position", spawn_location.global_position) + current_spawn_location_instance_number += 1 + current_player_location_instance_number = player + + +func _player_disconnected(id) -> void: + if Players.has_node(str(id)): + Players.get_node(str(id)).username_text_instance.queue_free() + Players.get_node(str(id)).queue_free() diff --git a/Game_4/code/global.gd b/kristofers/game/code/global.gd similarity index 96% rename from Game_4/code/global.gd rename to kristofers/game/code/global.gd index 52f2229..127368e 100644 --- a/Game_4/code/global.gd +++ b/kristofers/game/code/global.gd @@ -1,5 +1,7 @@ extends Node +var ui = null + func instance_node_at_location(node: Object, parent: Object, location: Vector2) -> Object: var node_instance = instance_node(node, parent) node_instance.global_position = location diff --git a/Game_4/code/network.gd b/kristofers/game/code/network.gd similarity index 75% rename from Game_4/code/network.gd rename to kristofers/game/code/network.gd index d96e2a1..283a1ba 100644 --- a/Game_4/code/network.gd +++ b/kristofers/game/code/network.gd @@ -39,9 +39,24 @@ func join_server() -> void: get_tree().set_network_peer(client) +func reset_network_connections(): + if get_tree().has_network_peer(): + get_tree().network_peer = null + + func _connected_to_server() -> void: print("Successfully connected to the server") func _server_disconnected() -> void: print("Disconnected from the server") + + for child in Players.get_children(): + if child.is_in_group("Net"): + child.queue_free() + + reset_network_connections() + + if Global.ui != null: + var prompt = Global.instance_node(load("res://scenes/simple_prompt.tscn"), Global.ui) + prompt.set_text("Disconnected from server") diff --git a/Game_4/code/network_setup.gd b/kristofers/game/code/network_setup.gd similarity index 94% rename from Game_4/code/network_setup.gd rename to kristofers/game/code/network_setup.gd index f5361ce..8be66d2 100644 --- a/Game_4/code/network_setup.gd +++ b/kristofers/game/code/network_setup.gd @@ -4,8 +4,8 @@ var player = load("res://scenes/player.tscn") onready var multiplayer_config_ui = $multiplayer_configure onready var username_text_edit = $multiplayer_configure/username_text_edit -onready var device_ip_address = $CanvasLayer/device_ip_address -onready var start_game = $CanvasLayer/start_game +onready var device_ip_address = $UI/device_ip_address +onready var start_game = $UI/start_game func _ready(): diff --git a/Game_4/code/player.gd b/kristofers/game/code/player.gd similarity index 100% rename from Game_4/code/player.gd rename to kristofers/game/code/player.gd diff --git a/Game_4/code/server_advertiser.gd b/kristofers/game/code/server_advertiser.gd similarity index 100% rename from Game_4/code/server_advertiser.gd rename to kristofers/game/code/server_advertiser.gd diff --git a/Game_4/code/server_browser.gd b/kristofers/game/code/server_browser.gd similarity index 100% rename from Game_4/code/server_browser.gd rename to kristofers/game/code/server_browser.gd diff --git a/Game_4/code/server_display.gd b/kristofers/game/code/server_display.gd similarity index 100% rename from Game_4/code/server_display.gd rename to kristofers/game/code/server_display.gd diff --git a/Game_4/code/server_listener.gd b/kristofers/game/code/server_listener.gd similarity index 100% rename from Game_4/code/server_listener.gd rename to kristofers/game/code/server_listener.gd diff --git a/kristofers/game/code/simple_prompt.gd b/kristofers/game/code/simple_prompt.gd new file mode 100644 index 0000000..b1e9d1b --- /dev/null +++ b/kristofers/game/code/simple_prompt.gd @@ -0,0 +1,10 @@ +extends Control + + +func _on_ok_pressed(): + get_tree().change_scene("res://scenes/main_menu.tscn") + + + +func set_text(text) -> void: + $Label.text = text diff --git a/Game_4/code/username_text.gd b/kristofers/game/code/username_text.gd similarity index 100% rename from Game_4/code/username_text.gd rename to kristofers/game/code/username_text.gd diff --git a/Game_1/default_env.tres b/kristofers/game/default_env.tres similarity index 100% rename from Game_1/default_env.tres rename to kristofers/game/default_env.tres diff --git a/Game_4/export_presets.cfg b/kristofers/game/export_presets.cfg similarity index 100% rename from Game_4/export_presets.cfg rename to kristofers/game/export_presets.cfg diff --git a/Game_3/Roboto-Regular.ttf b/kristofers/game/font/Roboto-Regular.ttf similarity index 100% rename from Game_3/Roboto-Regular.ttf rename to kristofers/game/font/Roboto-Regular.ttf diff --git a/Game_4/font/roboto.tres b/kristofers/game/font/roboto.tres similarity index 100% rename from Game_4/font/roboto.tres rename to kristofers/game/font/roboto.tres diff --git a/Game_1/icon.png b/kristofers/game/icon.png similarity index 100% rename from Game_1/icon.png rename to kristofers/game/icon.png diff --git a/Game_1/icon.png.import b/kristofers/game/icon.png.import similarity index 100% rename from Game_1/icon.png.import rename to kristofers/game/icon.png.import diff --git a/Game_4/project.godot b/kristofers/game/project.godot similarity index 99% rename from Game_4/project.godot rename to kristofers/game/project.godot index cd1bf4f..88876aa 100644 --- a/Game_4/project.godot +++ b/kristofers/game/project.godot @@ -10,7 +10,7 @@ config_version=4 [application] -config/name="Game #4" +config/name="Game_4" run/main_scene="res://scenes/main_menu.tscn" config/icon="res://icon.png" diff --git a/Game_4/scenes/floor.tscn b/kristofers/game/scenes/floor.tscn similarity index 100% rename from Game_4/scenes/floor.tscn rename to kristofers/game/scenes/floor.tscn diff --git a/kristofers/game/scenes/game.tscn b/kristofers/game/scenes/game.tscn new file mode 100644 index 0000000..bc23185 --- /dev/null +++ b/kristofers/game/scenes/game.tscn @@ -0,0 +1,25 @@ +[gd_scene load_steps=3 format=2] + +[ext_resource path="res://scenes/floor.tscn" type="PackedScene" id=1] +[ext_resource path="res://code/game.gd" type="Script" id=2] + +[node name="game" type="Node2D"] +script = ExtResource( 2 ) + +[node name="floor" parent="." instance=ExtResource( 1 )] +position = Vector2( 960, 1056 ) +scale = Vector2( 2, 1 ) + +[node name="spawn_locations" type="Node" parent="."] + +[node name="1" type="Position2D" parent="spawn_locations"] +position = Vector2( 512, 810 ) + +[node name="2" type="Position2D" parent="spawn_locations"] +position = Vector2( 1408, 810 ) + +[node name="3" type="Position2D" parent="spawn_locations"] +position = Vector2( 512, 270 ) + +[node name="4" type="Position2D" parent="spawn_locations"] +position = Vector2( 1408, 270 ) diff --git a/Game_4/scenes/main_menu.tscn b/kristofers/game/scenes/main_menu.tscn similarity index 84% rename from Game_4/scenes/main_menu.tscn rename to kristofers/game/scenes/main_menu.tscn index 939bad0..06e6ab9 100644 --- a/Game_4/scenes/main_menu.tscn +++ b/kristofers/game/scenes/main_menu.tscn @@ -1,7 +1,8 @@ -[gd_scene load_steps=3 format=2] +[gd_scene load_steps=4 format=2] [ext_resource path="res://font/roboto.tres" type="DynamicFont" id=1] [ext_resource path="res://code/network_setup.gd" type="Script" id=2] +[ext_resource path="res://code/UI.gd" type="Script" id=3] [node name="network_setup" type="Control"] anchor_right = 1.0 @@ -62,9 +63,10 @@ __meta__ = { "_edit_use_anchors_": false } -[node name="CanvasLayer" type="CanvasLayer" parent="."] +[node name="UI" type="CanvasLayer" parent="."] +script = ExtResource( 3 ) -[node name="start_game" type="Button" parent="CanvasLayer"] +[node name="start_game" type="Button" parent="UI"] margin_left = 27.0 margin_top = 27.0 margin_right = 391.0 @@ -75,7 +77,7 @@ __meta__ = { "_edit_use_anchors_": false } -[node name="device_ip_address" type="Label" parent="CanvasLayer"] +[node name="device_ip_address" type="Label" parent="UI"] anchor_top = 1.0 anchor_right = 1.0 anchor_bottom = 1.0 @@ -89,4 +91,4 @@ __meta__ = { [connection signal="pressed" from="multiplayer_configure/create_server" to="." method="_on_create_server_pressed"] [connection signal="pressed" from="multiplayer_configure/join_server" to="." method="_on_join_server_pressed"] -[connection signal="pressed" from="CanvasLayer/start_game" to="." method="_on_start_game_pressed"] +[connection signal="pressed" from="UI/start_game" to="." method="_on_start_game_pressed"] diff --git a/Game_4/scenes/player.tscn b/kristofers/game/scenes/player.tscn similarity index 100% rename from Game_4/scenes/player.tscn rename to kristofers/game/scenes/player.tscn diff --git a/Game_4/scenes/players.tscn b/kristofers/game/scenes/players.tscn similarity index 100% rename from Game_4/scenes/players.tscn rename to kristofers/game/scenes/players.tscn diff --git a/Game_4/scenes/server_advertiser.tscn b/kristofers/game/scenes/server_advertiser.tscn similarity index 100% rename from Game_4/scenes/server_advertiser.tscn rename to kristofers/game/scenes/server_advertiser.tscn diff --git a/Game_4/scenes/server_browser.tscn b/kristofers/game/scenes/server_browser.tscn similarity index 100% rename from Game_4/scenes/server_browser.tscn rename to kristofers/game/scenes/server_browser.tscn diff --git a/Game_4/scenes/server_display.tscn b/kristofers/game/scenes/server_display.tscn similarity index 100% rename from Game_4/scenes/server_display.tscn rename to kristofers/game/scenes/server_display.tscn diff --git a/Game_4/scenes/server_listener.tscn b/kristofers/game/scenes/server_listener.tscn similarity index 100% rename from Game_4/scenes/server_listener.tscn rename to kristofers/game/scenes/server_listener.tscn diff --git a/kristofers/game/scenes/simple_prompt.tscn b/kristofers/game/scenes/simple_prompt.tscn new file mode 100644 index 0000000..9500bad --- /dev/null +++ b/kristofers/game/scenes/simple_prompt.tscn @@ -0,0 +1,68 @@ +[gd_scene load_steps=5 format=2] + +[ext_resource path="res://font/Roboto-Regular.ttf" type="DynamicFontData" id=1] +[ext_resource path="res://code/simple_prompt.gd" type="Script" id=2] + +[sub_resource type="DynamicFont" id=1] +size = 100 +use_mipmaps = true +use_filter = true +font_data = ExtResource( 1 ) + +[sub_resource type="DynamicFont" id=2] +size = 100 +use_mipmaps = true +use_filter = true +font_data = ExtResource( 1 ) + +[node name="simple_prompt" type="Control"] +anchor_right = 1.0 +anchor_bottom = 1.0 +script = ExtResource( 2 ) +__meta__ = { +"_edit_use_anchors_": false +} + +[node name="Panel" type="Panel" parent="."] +anchor_left = 0.5 +anchor_top = 0.5 +anchor_right = 0.5 +anchor_bottom = 0.5 +margin_left = -704.0 +margin_top = -330.0 +margin_right = 704.0 +margin_bottom = 330.0 +__meta__ = { +"_edit_use_anchors_": false +} + +[node name="ok" type="Button" parent="Panel"] +anchor_left = 0.5 +anchor_top = 1.0 +anchor_right = 0.5 +anchor_bottom = 1.0 +margin_left = -257.0 +margin_top = -310.0 +margin_right = 257.0 +margin_bottom = -113.0 +custom_fonts/font = SubResource( 1 ) +text = "OK" +__meta__ = { +"_edit_use_anchors_": false +} + +[node name="Label" type="Label" parent="."] +anchor_left = 0.5 +anchor_top = 0.5 +anchor_right = 0.5 +anchor_bottom = 0.5 +margin_left = -516.0 +margin_top = -155.5 +margin_right = 516.0 +margin_bottom = -68.5 +custom_fonts/font = SubResource( 2 ) +text = "Simple prompt" +align = 1 +valign = 1 + +[connection signal="pressed" from="Panel/ok" to="." method="_on_ok_pressed"] diff --git a/Game_4/scenes/username_text.tscn b/kristofers/game/scenes/username_text.tscn similarity index 100% rename from Game_4/scenes/username_text.tscn rename to kristofers/game/scenes/username_text.tscn diff --git a/Game_4/sprites/floor.svg b/kristofers/game/sprites/floor.svg similarity index 89% rename from Game_4/sprites/floor.svg rename to kristofers/game/sprites/floor.svg index 37a5ab5..4d53002 100644 --- a/Game_4/sprites/floor.svg +++ b/kristofers/game/sprites/floor.svg @@ -25,9 +25,9 @@ showgrid="false" width="7256.6929px" units="px" - inkscape:zoom="1.1224747" - inkscape:cx="959.93251" - inkscape:cy="109.5793" + inkscape:zoom="0.14030934" + inkscape:cx="416.9359" + inkscape:cy="1297.1339" inkscape:window-width="1920" inkscape:window-height="1006" inkscape:window-x="1920" @@ -41,7 +41,7 @@ inkscape:groupmode="layer" id="layer1">