diff --git a/Game #1/export_presets.cfg b/Game #1/export_presets.cfg deleted file mode 100644 index 8d5d8be..0000000 --- a/Game #1/export_presets.cfg +++ /dev/null @@ -1,65 +0,0 @@ -[preset.0] - -name="Test Game Linux" -platform="Linux/X11" -runnable=true -custom_features="" -export_filter="all_resources" -include_filter="" -exclude_filter="" -export_path="./Game #1.x86_64" -script_export_mode=1 -script_encryption_key="" - -[preset.0.options] - -custom_template/debug="" -custom_template/release="" -binary_format/64_bits=true -binary_format/embed_pck=false -texture_format/bptc=false -texture_format/s3tc=true -texture_format/etc=false -texture_format/etc2=false -texture_format/no_bptc_fallbacks=true - -[preset.1] - -name="Test Game Windows" -platform="Windows Desktop" -runnable=true -custom_features="" -export_filter="all_resources" -include_filter="" -exclude_filter="" -export_path="./Game #1.exe" -script_export_mode=1 -script_encryption_key="" - -[preset.1.options] - -custom_template/debug="" -custom_template/release="" -binary_format/64_bits=true -binary_format/embed_pck=false -texture_format/bptc=false -texture_format/s3tc=true -texture_format/etc=false -texture_format/etc2=false -texture_format/no_bptc_fallbacks=true -codesign/enable=false -codesign/identity="" -codesign/password="" -codesign/timestamp=true -codesign/timestamp_server_url="" -codesign/digest_algorithm=1 -codesign/description="" -codesign/custom_options=PoolStringArray( ) -application/icon="" -application/file_version="" -application/product_version="" -application/company_name="" -application/product_name="" -application/file_description="" -application/copyright="" -application/trademarks="" diff --git a/Game #3/.import/floor.png-bad02a3061f4734a68e01c2ddec9b22e.md5 b/Game_1/.import/floor.png-bad02a3061f4734a68e01c2ddec9b22e.md5 similarity index 100% rename from Game #3/.import/floor.png-bad02a3061f4734a68e01c2ddec9b22e.md5 rename to Game_1/.import/floor.png-bad02a3061f4734a68e01c2ddec9b22e.md5 diff --git a/Game #3/.import/floor.png-bad02a3061f4734a68e01c2ddec9b22e.stex b/Game_1/.import/floor.png-bad02a3061f4734a68e01c2ddec9b22e.stex similarity index 100% rename from Game #3/.import/floor.png-bad02a3061f4734a68e01c2ddec9b22e.stex rename to Game_1/.import/floor.png-bad02a3061f4734a68e01c2ddec9b22e.stex diff --git a/Game #1/.import/icon.png-487276ed1e3a0c39cad0279d744ee560.md5 b/Game_1/.import/icon.png-487276ed1e3a0c39cad0279d744ee560.md5 similarity index 100% rename from Game #1/.import/icon.png-487276ed1e3a0c39cad0279d744ee560.md5 rename to Game_1/.import/icon.png-487276ed1e3a0c39cad0279d744ee560.md5 diff --git a/Game #1/.import/icon.png-487276ed1e3a0c39cad0279d744ee560.stex b/Game_1/.import/icon.png-487276ed1e3a0c39cad0279d744ee560.stex similarity index 100% rename from Game #1/.import/icon.png-487276ed1e3a0c39cad0279d744ee560.stex rename to Game_1/.import/icon.png-487276ed1e3a0c39cad0279d744ee560.stex diff --git a/Game #1/.import/jedi.png-f9be092cc27114ea04f99ed2335d3100.md5 b/Game_1/.import/jedi.png-f9be092cc27114ea04f99ed2335d3100.md5 similarity index 100% rename from Game #1/.import/jedi.png-f9be092cc27114ea04f99ed2335d3100.md5 rename to Game_1/.import/jedi.png-f9be092cc27114ea04f99ed2335d3100.md5 diff --git a/Game #1/.import/jedi.png-f9be092cc27114ea04f99ed2335d3100.stex b/Game_1/.import/jedi.png-f9be092cc27114ea04f99ed2335d3100.stex similarity index 100% rename from Game #1/.import/jedi.png-f9be092cc27114ea04f99ed2335d3100.stex rename to Game_1/.import/jedi.png-f9be092cc27114ea04f99ed2335d3100.stex diff --git a/Game #1/.import/lava.png-68ab43619d46c5f3cf0fd86b7248d922.md5 b/Game_1/.import/lava.png-68ab43619d46c5f3cf0fd86b7248d922.md5 similarity index 100% rename from Game #1/.import/lava.png-68ab43619d46c5f3cf0fd86b7248d922.md5 rename to Game_1/.import/lava.png-68ab43619d46c5f3cf0fd86b7248d922.md5 diff --git a/Game #1/.import/lava.png-68ab43619d46c5f3cf0fd86b7248d922.stex b/Game_1/.import/lava.png-68ab43619d46c5f3cf0fd86b7248d922.stex similarity index 100% rename from Game #1/.import/lava.png-68ab43619d46c5f3cf0fd86b7248d922.stex rename to Game_1/.import/lava.png-68ab43619d46c5f3cf0fd86b7248d922.stex diff --git a/Game #1/Floor.tscn b/Game_1/Floor.tscn similarity index 100% rename from Game #1/Floor.tscn rename to Game_1/Floor.tscn diff --git a/Game #1/Main.tscn b/Game_1/Main.tscn similarity index 53% rename from Game #1/Main.tscn rename to Game_1/Main.tscn index 56358ee..443ab97 100644 --- a/Game #1/Main.tscn +++ b/Game_1/Main.tscn @@ -1,54 +1,60 @@ -[gd_scene load_steps=3 format=2] +[gd_scene load_steps=4 format=2] [ext_resource path="res://Player.tscn" type="PackedScene" id=1] [ext_resource path="res://Floor.tscn" type="PackedScene" id=2] +[ext_resource path="res://floor.tscn" type="PackedScene" id=3] [node name="Main" type="Node2D"] [node name="Player" parent="." instance=ExtResource( 1 )] -position = Vector2( 52.0742, 458.515 ) +position = Vector2( 559.976, 757.874 ) [node name="Floor" parent="." instance=ExtResource( 2 )] -position = Vector2( 32, 544 ) +position = Vector2( 539.901, 843.359 ) [node name="Floor2" parent="." instance=ExtResource( 2 )] -position = Vector2( 80, 544 ) +position = Vector2( 587.901, 843.359 ) [node name="Floor3" parent="." instance=ExtResource( 2 )] -position = Vector2( 128, 544 ) +position = Vector2( 635.901, 843.359 ) [node name="Floor4" parent="." instance=ExtResource( 2 )] -position = Vector2( 248, 488 ) +position = Vector2( 755.901, 787.359 ) [node name="Floor5" parent="." instance=ExtResource( 2 )] -position = Vector2( 296, 472 ) +position = Vector2( 803.901, 771.359 ) [node name="Floor8" parent="." instance=ExtResource( 2 )] -position = Vector2( 520, 368 ) +position = Vector2( 1027.9, 667.359 ) [node name="Floor11" parent="." instance=ExtResource( 2 )] -position = Vector2( 128, 248 ) +position = Vector2( 635.901, 547.359 ) [node name="Floor12" parent="." instance=ExtResource( 2 )] -position = Vector2( 176, 248 ) +position = Vector2( 683.901, 547.359 ) [node name="Floor14" parent="." instance=ExtResource( 2 )] -position = Vector2( 272, 248 ) +position = Vector2( 779.901, 547.359 ) [node name="Floor15" parent="." instance=ExtResource( 2 )] -position = Vector2( 320, 248 ) +position = Vector2( 827.901, 547.359 ) [node name="Floor13" parent="." instance=ExtResource( 2 )] -position = Vector2( 224, 248 ) +position = Vector2( 731.901, 547.359 ) [node name="Floor9" parent="." instance=ExtResource( 2 )] -position = Vector2( 640, 296 ) +position = Vector2( 1147.9, 595.359 ) [node name="Floor10" parent="." instance=ExtResource( 2 )] -position = Vector2( 760, 240 ) +position = Vector2( 1267.9, 539.359 ) [node name="Floor6" parent="." instance=ExtResource( 2 )] -position = Vector2( 344, 488 ) +position = Vector2( 851.901, 787.359 ) -[node name="Floor7" parent="." instance=ExtResource( 2 )] -position = Vector2( 392, 464 ) +[node name="floor" parent="." instance=ExtResource( 3 )] +position = Vector2( 962.745, 26.6196 ) +scale = Vector2( 2, 1 ) + +[node name="floor2" parent="." instance=ExtResource( 3 )] +position = Vector2( 1003.11, 1052.51 ) +scale = Vector2( 2, 1 ) diff --git a/Game #1/Player.gd b/Game_1/Player.gd similarity index 100% rename from Game #1/Player.gd rename to Game_1/Player.gd diff --git a/Game #1/Player.tscn b/Game_1/Player.tscn similarity index 100% rename from Game #1/Player.tscn rename to Game_1/Player.tscn diff --git a/Game #3/Sprites/floor.png.import b/Game_1/Sprites/floor.png.import similarity index 100% rename from Game #3/Sprites/floor.png.import rename to Game_1/Sprites/floor.png.import diff --git a/Game #1/Sprites/jedi.png b/Game_1/Sprites/jedi.png similarity index 100% rename from Game #1/Sprites/jedi.png rename to Game_1/Sprites/jedi.png diff --git a/Game #1/Sprites/jedi.png.import b/Game_1/Sprites/jedi.png.import similarity index 100% rename from Game #1/Sprites/jedi.png.import rename to Game_1/Sprites/jedi.png.import diff --git a/Game #1/Sprites/lava.png b/Game_1/Sprites/lava.png similarity index 100% rename from Game #1/Sprites/lava.png rename to Game_1/Sprites/lava.png diff --git a/Game #1/Sprites/lava.png.import b/Game_1/Sprites/lava.png.import similarity index 100% rename from Game #1/Sprites/lava.png.import rename to Game_1/Sprites/lava.png.import diff --git a/Game #1/default_env.tres b/Game_1/default_env.tres similarity index 100% rename from Game #1/default_env.tres rename to Game_1/default_env.tres diff --git a/Game_1/export_presets.cfg b/Game_1/export_presets.cfg new file mode 100644 index 0000000..b92fca5 --- /dev/null +++ b/Game_1/export_presets.cfg @@ -0,0 +1,24 @@ +[preset.0] + +name="Test Game Linux" +platform="Linux/X11" +runnable=true +custom_features="" +export_filter="all_resources" +include_filter="" +exclude_filter="" +export_path="./Game #1.x86_64" +script_export_mode=1 +script_encryption_key="" + +[preset.0.options] + +custom_template/debug="" +custom_template/release="" +binary_format/64_bits=true +binary_format/embed_pck=false +texture_format/bptc=false +texture_format/s3tc=true +texture_format/etc=false +texture_format/etc2=false +texture_format/no_bptc_fallbacks=true diff --git a/Game #1/icon.png b/Game_1/icon.png similarity index 100% rename from Game #1/icon.png rename to Game_1/icon.png diff --git a/Game #1/icon.png.import b/Game_1/icon.png.import similarity index 100% rename from Game #1/icon.png.import rename to Game_1/icon.png.import diff --git a/Game #1/project.godot b/Game_1/project.godot similarity index 92% rename from Game #1/project.godot rename to Game_1/project.godot index 4e2760a..d6c8690 100644 --- a/Game #1/project.godot +++ b/Game_1/project.godot @@ -14,6 +14,15 @@ config/name="Game #1" run/main_scene="res://Main.tscn" config/icon="res://icon.png" +[display] + +window/size/width=1920 +window/size/height=1080 +window/size/test_width=1024 +window/size/test_height=600 +window/stretch/mode="2d" +window/stretch/aspect="keep" + [input] player_left={ diff --git a/Game #2/.DS_Store b/Game_2/.DS_Store similarity index 100% rename from Game #2/.DS_Store rename to Game_2/.DS_Store diff --git a/Game #2/.import/1001_Base_Color.png-69b43bef81833a017bb2ad21971dd33c.md5 b/Game_2/.import/1001_Base_Color.png-69b43bef81833a017bb2ad21971dd33c.md5 similarity index 100% rename from Game #2/.import/1001_Base_Color.png-69b43bef81833a017bb2ad21971dd33c.md5 rename to Game_2/.import/1001_Base_Color.png-69b43bef81833a017bb2ad21971dd33c.md5 diff --git a/Game #2/.import/1001_Base_Color.png-69b43bef81833a017bb2ad21971dd33c.stex b/Game_2/.import/1001_Base_Color.png-69b43bef81833a017bb2ad21971dd33c.stex similarity index 100% rename from Game #2/.import/1001_Base_Color.png-69b43bef81833a017bb2ad21971dd33c.stex rename to Game_2/.import/1001_Base_Color.png-69b43bef81833a017bb2ad21971dd33c.stex diff --git a/Game #2/.import/DefaultSkin_baseColor.png-ecd940ae64dc916f761c9c67a0e31043.etc2.stex b/Game_2/.import/DefaultSkin_baseColor.png-ecd940ae64dc916f761c9c67a0e31043.etc2.stex similarity index 100% rename from Game #2/.import/DefaultSkin_baseColor.png-ecd940ae64dc916f761c9c67a0e31043.etc2.stex rename to Game_2/.import/DefaultSkin_baseColor.png-ecd940ae64dc916f761c9c67a0e31043.etc2.stex diff --git a/Game #2/.import/DefaultSkin_baseColor.png-ecd940ae64dc916f761c9c67a0e31043.md5 b/Game_2/.import/DefaultSkin_baseColor.png-ecd940ae64dc916f761c9c67a0e31043.md5 similarity index 100% rename from Game #2/.import/DefaultSkin_baseColor.png-ecd940ae64dc916f761c9c67a0e31043.md5 rename to Game_2/.import/DefaultSkin_baseColor.png-ecd940ae64dc916f761c9c67a0e31043.md5 diff --git a/Game #2/.import/DefaultSkin_baseColor.png-ecd940ae64dc916f761c9c67a0e31043.s3tc.stex b/Game_2/.import/DefaultSkin_baseColor.png-ecd940ae64dc916f761c9c67a0e31043.s3tc.stex similarity index 100% rename from Game #2/.import/DefaultSkin_baseColor.png-ecd940ae64dc916f761c9c67a0e31043.s3tc.stex rename to Game_2/.import/DefaultSkin_baseColor.png-ecd940ae64dc916f761c9c67a0e31043.s3tc.stex diff --git a/Game #2/.import/DefaultSkin_baseColor.png-ecd940ae64dc916f761c9c67a0e31043.stex b/Game_2/.import/DefaultSkin_baseColor.png-ecd940ae64dc916f761c9c67a0e31043.stex similarity index 100% rename from Game #2/.import/DefaultSkin_baseColor.png-ecd940ae64dc916f761c9c67a0e31043.stex rename to Game_2/.import/DefaultSkin_baseColor.png-ecd940ae64dc916f761c9c67a0e31043.stex diff --git a/Game #2/.import/Game #2 3D.png-a75dd0d036ce991406177fdcdd795259.md5 b/Game_2/.import/Game #2 3D.png-a75dd0d036ce991406177fdcdd795259.md5 similarity index 100% rename from Game #2/.import/Game #2 3D.png-a75dd0d036ce991406177fdcdd795259.md5 rename to Game_2/.import/Game #2 3D.png-a75dd0d036ce991406177fdcdd795259.md5 diff --git a/Game #2/.import/Game #2 3D.png-a75dd0d036ce991406177fdcdd795259.stex b/Game_2/.import/Game #2 3D.png-a75dd0d036ce991406177fdcdd795259.stex similarity index 100% rename from Game #2/.import/Game #2 3D.png-a75dd0d036ce991406177fdcdd795259.stex rename to Game_2/.import/Game #2 3D.png-a75dd0d036ce991406177fdcdd795259.stex diff --git a/Game #2/.import/camping tent_1001_Diffuse.png-8a7718f600671e0135cc35a601d6c8c7.md5 b/Game_2/.import/camping tent_1001_Diffuse.png-8a7718f600671e0135cc35a601d6c8c7.md5 similarity index 100% rename from Game #2/.import/camping tent_1001_Diffuse.png-8a7718f600671e0135cc35a601d6c8c7.md5 rename to Game_2/.import/camping tent_1001_Diffuse.png-8a7718f600671e0135cc35a601d6c8c7.md5 diff --git a/Game #2/.import/camping tent_1001_Diffuse.png-8a7718f600671e0135cc35a601d6c8c7.stex b/Game_2/.import/camping tent_1001_Diffuse.png-8a7718f600671e0135cc35a601d6c8c7.stex similarity index 100% rename from Game #2/.import/camping tent_1001_Diffuse.png-8a7718f600671e0135cc35a601d6c8c7.stex rename to Game_2/.import/camping tent_1001_Diffuse.png-8a7718f600671e0135cc35a601d6c8c7.stex diff --git a/Game #2/.import/favicon.png-05a5f25b7b35b567a640a7daf7751a8e.md5 b/Game_2/.import/favicon.png-05a5f25b7b35b567a640a7daf7751a8e.md5 similarity index 100% rename from Game #2/.import/favicon.png-05a5f25b7b35b567a640a7daf7751a8e.md5 rename to Game_2/.import/favicon.png-05a5f25b7b35b567a640a7daf7751a8e.md5 diff --git a/Game #2/.import/favicon.png-05a5f25b7b35b567a640a7daf7751a8e.stex b/Game_2/.import/favicon.png-05a5f25b7b35b567a640a7daf7751a8e.stex similarity index 100% rename from Game #2/.import/favicon.png-05a5f25b7b35b567a640a7daf7751a8e.stex rename to Game_2/.import/favicon.png-05a5f25b7b35b567a640a7daf7751a8e.stex diff --git a/Game #2/.import/favicon.png-ec674acb7f04b1a171404e09471346bb.md5 b/Game_2/.import/favicon.png-ec674acb7f04b1a171404e09471346bb.md5 similarity index 100% rename from Game #2/.import/favicon.png-ec674acb7f04b1a171404e09471346bb.md5 rename to Game_2/.import/favicon.png-ec674acb7f04b1a171404e09471346bb.md5 diff --git a/Game #2/.import/favicon.png-ec674acb7f04b1a171404e09471346bb.stex b/Game_2/.import/favicon.png-ec674acb7f04b1a171404e09471346bb.stex similarity index 100% rename from Game #2/.import/favicon.png-ec674acb7f04b1a171404e09471346bb.stex rename to Game_2/.import/favicon.png-ec674acb7f04b1a171404e09471346bb.stex diff --git a/Game #2/.import/floor_1001_Diffuse.png-28f0e72acd44ad1774e5d6ee860b0ebe.md5 b/Game_2/.import/floor_1001_Diffuse.png-28f0e72acd44ad1774e5d6ee860b0ebe.md5 similarity index 100% rename from Game #2/.import/floor_1001_Diffuse.png-28f0e72acd44ad1774e5d6ee860b0ebe.md5 rename to Game_2/.import/floor_1001_Diffuse.png-28f0e72acd44ad1774e5d6ee860b0ebe.md5 diff --git a/Game #2/.import/floor_1001_Diffuse.png-28f0e72acd44ad1774e5d6ee860b0ebe.stex b/Game_2/.import/floor_1001_Diffuse.png-28f0e72acd44ad1774e5d6ee860b0ebe.stex similarity index 100% rename from Game #2/.import/floor_1001_Diffuse.png-28f0e72acd44ad1774e5d6ee860b0ebe.stex rename to Game_2/.import/floor_1001_Diffuse.png-28f0e72acd44ad1774e5d6ee860b0ebe.stex diff --git a/Game #2/.import/full forest.fbx-30cdc2b91b676d732aee61d457270d56.md5 b/Game_2/.import/full forest.fbx-30cdc2b91b676d732aee61d457270d56.md5 similarity index 100% rename from Game #2/.import/full forest.fbx-30cdc2b91b676d732aee61d457270d56.md5 rename to Game_2/.import/full forest.fbx-30cdc2b91b676d732aee61d457270d56.md5 diff --git a/Game #2/.import/full forest.fbx-30cdc2b91b676d732aee61d457270d56.scn b/Game_2/.import/full forest.fbx-30cdc2b91b676d732aee61d457270d56.scn similarity index 100% rename from Game #2/.import/full forest.fbx-30cdc2b91b676d732aee61d457270d56.scn rename to Game_2/.import/full forest.fbx-30cdc2b91b676d732aee61d457270d56.scn diff --git a/Game #2/.import/full forest_arboles_Diffuse.png-ea36a96acacaeeb29502e40bb1ec09f1.md5 b/Game_2/.import/full forest_arboles_Diffuse.png-ea36a96acacaeeb29502e40bb1ec09f1.md5 similarity index 100% rename from Game #2/.import/full forest_arboles_Diffuse.png-ea36a96acacaeeb29502e40bb1ec09f1.md5 rename to Game_2/.import/full forest_arboles_Diffuse.png-ea36a96acacaeeb29502e40bb1ec09f1.md5 diff --git a/Game #2/.import/full forest_arboles_Diffuse.png-ea36a96acacaeeb29502e40bb1ec09f1.stex b/Game_2/.import/full forest_arboles_Diffuse.png-ea36a96acacaeeb29502e40bb1ec09f1.stex similarity index 100% rename from Game #2/.import/full forest_arboles_Diffuse.png-ea36a96acacaeeb29502e40bb1ec09f1.stex rename to Game_2/.import/full forest_arboles_Diffuse.png-ea36a96acacaeeb29502e40bb1ec09f1.stex diff --git a/Game #2/.import/full forest_fogata_Diffuse.png-e080306be9e3de7b6290ca8557e2f360.md5 b/Game_2/.import/full forest_fogata_Diffuse.png-e080306be9e3de7b6290ca8557e2f360.md5 similarity index 100% rename from Game #2/.import/full forest_fogata_Diffuse.png-e080306be9e3de7b6290ca8557e2f360.md5 rename to Game_2/.import/full forest_fogata_Diffuse.png-e080306be9e3de7b6290ca8557e2f360.md5 diff --git a/Game #2/.import/full forest_fogata_Diffuse.png-e080306be9e3de7b6290ca8557e2f360.stex b/Game_2/.import/full forest_fogata_Diffuse.png-e080306be9e3de7b6290ca8557e2f360.stex similarity index 100% rename from Game #2/.import/full forest_fogata_Diffuse.png-e080306be9e3de7b6290ca8557e2f360.stex rename to Game_2/.import/full forest_fogata_Diffuse.png-e080306be9e3de7b6290ca8557e2f360.stex diff --git a/Game #2/.import/full forest_roca_Diffuse.png-4a28a95e2aa8a906b989fb8e1a98bd92.md5 b/Game_2/.import/full forest_roca_Diffuse.png-4a28a95e2aa8a906b989fb8e1a98bd92.md5 similarity index 100% rename from Game #2/.import/full forest_roca_Diffuse.png-4a28a95e2aa8a906b989fb8e1a98bd92.md5 rename to Game_2/.import/full forest_roca_Diffuse.png-4a28a95e2aa8a906b989fb8e1a98bd92.md5 diff --git a/Game #2/.import/full forest_roca_Diffuse.png-4a28a95e2aa8a906b989fb8e1a98bd92.stex b/Game_2/.import/full forest_roca_Diffuse.png-4a28a95e2aa8a906b989fb8e1a98bd92.stex similarity index 100% rename from Game #2/.import/full forest_roca_Diffuse.png-4a28a95e2aa8a906b989fb8e1a98bd92.stex rename to Game_2/.import/full forest_roca_Diffuse.png-4a28a95e2aa8a906b989fb8e1a98bd92.stex diff --git a/Game #2/.import/icon.png-487276ed1e3a0c39cad0279d744ee560.md5 b/Game_2/.import/icon.png-487276ed1e3a0c39cad0279d744ee560.md5 similarity index 100% rename from Game #2/.import/icon.png-487276ed1e3a0c39cad0279d744ee560.md5 rename to Game_2/.import/icon.png-487276ed1e3a0c39cad0279d744ee560.md5 diff --git a/Game #2/.import/icon.png-487276ed1e3a0c39cad0279d744ee560.stex b/Game_2/.import/icon.png-487276ed1e3a0c39cad0279d744ee560.stex similarity index 100% rename from Game #2/.import/icon.png-487276ed1e3a0c39cad0279d744ee560.stex rename to Game_2/.import/icon.png-487276ed1e3a0c39cad0279d744ee560.stex diff --git a/Game #2/.import/scene.gltf-2c00d1d7d0f6d494d2489c8827633551.md5 b/Game_2/.import/scene.gltf-2c00d1d7d0f6d494d2489c8827633551.md5 similarity index 100% rename from Game #2/.import/scene.gltf-2c00d1d7d0f6d494d2489c8827633551.md5 rename to Game_2/.import/scene.gltf-2c00d1d7d0f6d494d2489c8827633551.md5 diff --git a/Game #2/.import/scene.gltf-2c00d1d7d0f6d494d2489c8827633551.scn b/Game_2/.import/scene.gltf-2c00d1d7d0f6d494d2489c8827633551.scn similarity index 100% rename from Game #2/.import/scene.gltf-2c00d1d7d0f6d494d2489c8827633551.scn rename to Game_2/.import/scene.gltf-2c00d1d7d0f6d494d2489c8827633551.scn diff --git a/Game #2/.import/texture_01.png-87772d058110b5d64dbdfb8c04d0f2f5.md5 b/Game_2/.import/texture_01.png-87772d058110b5d64dbdfb8c04d0f2f5.md5 similarity index 100% rename from Game #2/.import/texture_01.png-87772d058110b5d64dbdfb8c04d0f2f5.md5 rename to Game_2/.import/texture_01.png-87772d058110b5d64dbdfb8c04d0f2f5.md5 diff --git a/Game #2/.import/texture_01.png-87772d058110b5d64dbdfb8c04d0f2f5.stex b/Game_2/.import/texture_01.png-87772d058110b5d64dbdfb8c04d0f2f5.stex similarity index 100% rename from Game #2/.import/texture_01.png-87772d058110b5d64dbdfb8c04d0f2f5.stex rename to Game_2/.import/texture_01.png-87772d058110b5d64dbdfb8c04d0f2f5.stex diff --git a/Game #2/.import/trees2_1001_Diffuse.png-8236f31411ad0c0cd15f77e4aad35ea9.md5 b/Game_2/.import/trees2_1001_Diffuse.png-8236f31411ad0c0cd15f77e4aad35ea9.md5 similarity index 100% rename from Game #2/.import/trees2_1001_Diffuse.png-8236f31411ad0c0cd15f77e4aad35ea9.md5 rename to Game_2/.import/trees2_1001_Diffuse.png-8236f31411ad0c0cd15f77e4aad35ea9.md5 diff --git a/Game #2/.import/trees2_1001_Diffuse.png-8236f31411ad0c0cd15f77e4aad35ea9.stex b/Game_2/.import/trees2_1001_Diffuse.png-8236f31411ad0c0cd15f77e4aad35ea9.stex similarity index 100% rename from Game #2/.import/trees2_1001_Diffuse.png-8236f31411ad0c0cd15f77e4aad35ea9.stex rename to Game_2/.import/trees2_1001_Diffuse.png-8236f31411ad0c0cd15f77e4aad35ea9.stex diff --git a/Game #2/HTML/Game #2 3D.audio.worklet.js b/Game_2/HTML/Game #2 3D.audio.worklet.js similarity index 100% rename from Game #2/HTML/Game #2 3D.audio.worklet.js rename to Game_2/HTML/Game #2 3D.audio.worklet.js diff --git a/Game #2/HTML/Game #2 3D.html b/Game_2/HTML/Game #2 3D.html similarity index 100% rename from Game #2/HTML/Game #2 3D.html rename to Game_2/HTML/Game #2 3D.html diff --git a/Game #2/HTML/Game #2 3D.js b/Game_2/HTML/Game #2 3D.js similarity index 100% rename from Game #2/HTML/Game #2 3D.js rename to Game_2/HTML/Game #2 3D.js diff --git a/Game #2/HTML/Game #2 3D.png b/Game_2/HTML/Game #2 3D.png similarity index 100% rename from Game #2/HTML/Game #2 3D.png rename to Game_2/HTML/Game #2 3D.png diff --git a/Game #2/HTML/Game #2 3D.png.import b/Game_2/HTML/Game #2 3D.png.import similarity index 100% rename from Game #2/HTML/Game #2 3D.png.import rename to Game_2/HTML/Game #2 3D.png.import diff --git a/Game #2/HTML/Game #2 3D.wasm b/Game_2/HTML/Game #2 3D.wasm similarity index 100% rename from Game #2/HTML/Game #2 3D.wasm rename to Game_2/HTML/Game #2 3D.wasm diff --git a/Game #2/HTML/favicon.png b/Game_2/HTML/favicon.png similarity index 100% rename from Game #2/HTML/favicon.png rename to Game_2/HTML/favicon.png diff --git a/Game #2/HTML/favicon.png.import b/Game_2/HTML/favicon.png.import similarity index 100% rename from Game #2/HTML/favicon.png.import rename to Game_2/HTML/favicon.png.import diff --git a/Game #2/Main.tscn b/Game_2/Main.tscn similarity index 100% rename from Game #2/Main.tscn rename to Game_2/Main.tscn diff --git a/Game #2/Player.gd b/Game_2/Player.gd similarity index 100% rename from Game #2/Player.gd rename to Game_2/Player.gd diff --git a/Game #2/cat/DefaultSkin.material b/Game_2/cat/DefaultSkin.material similarity index 100% rename from Game #2/cat/DefaultSkin.material rename to Game_2/cat/DefaultSkin.material diff --git a/Game #2/cat/scene.bin b/Game_2/cat/scene.bin similarity index 100% rename from Game #2/cat/scene.bin rename to Game_2/cat/scene.bin diff --git a/Game #2/cat/scene.gd b/Game_2/cat/scene.gd similarity index 100% rename from Game #2/cat/scene.gd rename to Game_2/cat/scene.gd diff --git a/Game #2/cat/scene.gltf b/Game_2/cat/scene.gltf similarity index 100% rename from Game #2/cat/scene.gltf rename to Game_2/cat/scene.gltf diff --git a/Game #2/cat/scene.gltf.import b/Game_2/cat/scene.gltf.import similarity index 100% rename from Game #2/cat/scene.gltf.import rename to Game_2/cat/scene.gltf.import diff --git a/Game #2/cat/textures/DefaultSkin_baseColor.png b/Game_2/cat/textures/DefaultSkin_baseColor.png similarity index 100% rename from Game #2/cat/textures/DefaultSkin_baseColor.png rename to Game_2/cat/textures/DefaultSkin_baseColor.png diff --git a/Game #2/cat/textures/DefaultSkin_baseColor.png.import b/Game_2/cat/textures/DefaultSkin_baseColor.png.import similarity index 100% rename from Game #2/cat/textures/DefaultSkin_baseColor.png.import rename to Game_2/cat/textures/DefaultSkin_baseColor.png.import diff --git a/Game #2/export_presets.cfg b/Game_2/export_presets.cfg similarity index 100% rename from Game #2/export_presets.cfg rename to Game_2/export_presets.cfg diff --git a/Game #2/forest/.DS_Store b/Game_2/forest/.DS_Store similarity index 100% rename from Game #2/forest/.DS_Store rename to Game_2/forest/.DS_Store diff --git a/Game #2/forest/source/full forest.fbx b/Game_2/forest/source/full forest.fbx similarity index 100% rename from Game #2/forest/source/full forest.fbx rename to Game_2/forest/source/full forest.fbx diff --git a/Game #2/forest/source/full forest.fbx.import b/Game_2/forest/source/full forest.fbx.import similarity index 100% rename from Game #2/forest/source/full forest.fbx.import rename to Game_2/forest/source/full forest.fbx.import diff --git a/Game #2/forest/source/full forest.gd b/Game_2/forest/source/full forest.gd similarity index 100% rename from Game #2/forest/source/full forest.gd rename to Game_2/forest/source/full forest.gd diff --git a/Game #2/forest/source/lambert2.material b/Game_2/forest/source/lambert2.material similarity index 100% rename from Game #2/forest/source/lambert2.material rename to Game_2/forest/source/lambert2.material diff --git a/Game #2/forest/source/lambert3.material b/Game_2/forest/source/lambert3.material similarity index 100% rename from Game #2/forest/source/lambert3.material rename to Game_2/forest/source/lambert3.material diff --git a/Game #2/forest/source/lambert5.material b/Game_2/forest/source/lambert5.material similarity index 100% rename from Game #2/forest/source/lambert5.material rename to Game_2/forest/source/lambert5.material diff --git a/Game #2/forest/source/lambert6.material b/Game_2/forest/source/lambert6.material similarity index 100% rename from Game #2/forest/source/lambert6.material rename to Game_2/forest/source/lambert6.material diff --git a/Game #2/forest/source/lambert7.material b/Game_2/forest/source/lambert7.material similarity index 100% rename from Game #2/forest/source/lambert7.material rename to Game_2/forest/source/lambert7.material diff --git a/Game #2/forest/source/lambert8.material b/Game_2/forest/source/lambert8.material similarity index 100% rename from Game #2/forest/source/lambert8.material rename to Game_2/forest/source/lambert8.material diff --git a/Game #2/forest/source/lambert9.material b/Game_2/forest/source/lambert9.material similarity index 100% rename from Game #2/forest/source/lambert9.material rename to Game_2/forest/source/lambert9.material diff --git a/Game #2/forest/textures/1001_Base_Color.png b/Game_2/forest/textures/1001_Base_Color.png similarity index 100% rename from Game #2/forest/textures/1001_Base_Color.png rename to Game_2/forest/textures/1001_Base_Color.png diff --git a/Game #2/forest/textures/1001_Base_Color.png.import b/Game_2/forest/textures/1001_Base_Color.png.import similarity index 100% rename from Game #2/forest/textures/1001_Base_Color.png.import rename to Game_2/forest/textures/1001_Base_Color.png.import diff --git a/Game #2/forest/textures/camping tent_1001_Diffuse.png b/Game_2/forest/textures/camping tent_1001_Diffuse.png similarity index 100% rename from Game #2/forest/textures/camping tent_1001_Diffuse.png rename to Game_2/forest/textures/camping tent_1001_Diffuse.png diff --git a/Game #2/forest/textures/camping tent_1001_Diffuse.png.import b/Game_2/forest/textures/camping tent_1001_Diffuse.png.import similarity index 100% rename from Game #2/forest/textures/camping tent_1001_Diffuse.png.import rename to Game_2/forest/textures/camping tent_1001_Diffuse.png.import diff --git a/Game #2/forest/textures/floor_1001_Diffuse.png b/Game_2/forest/textures/floor_1001_Diffuse.png similarity index 100% rename from Game #2/forest/textures/floor_1001_Diffuse.png rename to Game_2/forest/textures/floor_1001_Diffuse.png diff --git a/Game #2/forest/textures/floor_1001_Diffuse.png.import b/Game_2/forest/textures/floor_1001_Diffuse.png.import similarity index 100% rename from Game #2/forest/textures/floor_1001_Diffuse.png.import rename to Game_2/forest/textures/floor_1001_Diffuse.png.import diff --git a/Game #2/forest/textures/full forest_arboles_Diffuse.png b/Game_2/forest/textures/full forest_arboles_Diffuse.png similarity index 100% rename from Game #2/forest/textures/full forest_arboles_Diffuse.png rename to Game_2/forest/textures/full forest_arboles_Diffuse.png diff --git a/Game #2/forest/textures/full forest_arboles_Diffuse.png.import b/Game_2/forest/textures/full forest_arboles_Diffuse.png.import similarity index 100% rename from Game #2/forest/textures/full forest_arboles_Diffuse.png.import rename to Game_2/forest/textures/full forest_arboles_Diffuse.png.import diff --git a/Game #2/forest/textures/full forest_fogata_Diffuse.png b/Game_2/forest/textures/full forest_fogata_Diffuse.png similarity index 100% rename from Game #2/forest/textures/full forest_fogata_Diffuse.png rename to Game_2/forest/textures/full forest_fogata_Diffuse.png diff --git a/Game #2/forest/textures/full forest_fogata_Diffuse.png.import b/Game_2/forest/textures/full forest_fogata_Diffuse.png.import similarity index 100% rename from Game #2/forest/textures/full forest_fogata_Diffuse.png.import rename to Game_2/forest/textures/full forest_fogata_Diffuse.png.import diff --git a/Game #2/forest/textures/full forest_roca_Diffuse.png b/Game_2/forest/textures/full forest_roca_Diffuse.png similarity index 100% rename from Game #2/forest/textures/full forest_roca_Diffuse.png rename to Game_2/forest/textures/full forest_roca_Diffuse.png diff --git a/Game #2/forest/textures/full forest_roca_Diffuse.png.import b/Game_2/forest/textures/full forest_roca_Diffuse.png.import similarity index 100% rename from Game #2/forest/textures/full forest_roca_Diffuse.png.import rename to Game_2/forest/textures/full forest_roca_Diffuse.png.import diff --git a/Game #2/forest/textures/trees2_1001_Diffuse.png b/Game_2/forest/textures/trees2_1001_Diffuse.png similarity index 100% rename from Game #2/forest/textures/trees2_1001_Diffuse.png rename to Game_2/forest/textures/trees2_1001_Diffuse.png diff --git a/Game #2/forest/textures/trees2_1001_Diffuse.png.import b/Game_2/forest/textures/trees2_1001_Diffuse.png.import similarity index 100% rename from Game #2/forest/textures/trees2_1001_Diffuse.png.import rename to Game_2/forest/textures/trees2_1001_Diffuse.png.import diff --git a/Game #2/icon.png b/Game_2/icon.png similarity index 100% rename from Game #2/icon.png rename to Game_2/icon.png diff --git a/Game #2/icon.png.import b/Game_2/icon.png.import similarity index 100% rename from Game #2/icon.png.import rename to Game_2/icon.png.import diff --git a/Game #2/project.godot b/Game_2/project.godot similarity index 100% rename from Game #2/project.godot rename to Game_2/project.godot diff --git a/Game #4/.import/floor.png-8870646e23ec8c3ad77089faabc9e773.md5 b/Game_3/.import/floor.png-bad02a3061f4734a68e01c2ddec9b22e.md5 similarity index 100% rename from Game #4/.import/floor.png-8870646e23ec8c3ad77089faabc9e773.md5 rename to Game_3/.import/floor.png-bad02a3061f4734a68e01c2ddec9b22e.md5 diff --git a/Game #4/.import/floor.png-8870646e23ec8c3ad77089faabc9e773.stex b/Game_3/.import/floor.png-bad02a3061f4734a68e01c2ddec9b22e.stex similarity index 100% rename from Game #4/.import/floor.png-8870646e23ec8c3ad77089faabc9e773.stex rename to Game_3/.import/floor.png-bad02a3061f4734a68e01c2ddec9b22e.stex diff --git a/Game #3/.import/icon.png-487276ed1e3a0c39cad0279d744ee560.md5 b/Game_3/.import/icon.png-487276ed1e3a0c39cad0279d744ee560.md5 similarity index 100% rename from Game #3/.import/icon.png-487276ed1e3a0c39cad0279d744ee560.md5 rename to Game_3/.import/icon.png-487276ed1e3a0c39cad0279d744ee560.md5 diff --git a/Game #3/.import/icon.png-487276ed1e3a0c39cad0279d744ee560.stex b/Game_3/.import/icon.png-487276ed1e3a0c39cad0279d744ee560.stex similarity index 100% rename from Game #3/.import/icon.png-487276ed1e3a0c39cad0279d744ee560.stex rename to Game_3/.import/icon.png-487276ed1e3a0c39cad0279d744ee560.stex diff --git a/Game #3/.import/jedi.png-f9be092cc27114ea04f99ed2335d3100.md5 b/Game_3/.import/jedi.png-f9be092cc27114ea04f99ed2335d3100.md5 similarity index 100% rename from Game #3/.import/jedi.png-f9be092cc27114ea04f99ed2335d3100.md5 rename to Game_3/.import/jedi.png-f9be092cc27114ea04f99ed2335d3100.md5 diff --git a/Game #3/.import/jedi.png-f9be092cc27114ea04f99ed2335d3100.stex b/Game_3/.import/jedi.png-f9be092cc27114ea04f99ed2335d3100.stex similarity index 100% rename from Game #3/.import/jedi.png-f9be092cc27114ea04f99ed2335d3100.stex rename to Game_3/.import/jedi.png-f9be092cc27114ea04f99ed2335d3100.stex diff --git a/Game #3/.import/lava.png-68ab43619d46c5f3cf0fd86b7248d922.md5 b/Game_3/.import/lava.png-68ab43619d46c5f3cf0fd86b7248d922.md5 similarity index 100% rename from Game #3/.import/lava.png-68ab43619d46c5f3cf0fd86b7248d922.md5 rename to Game_3/.import/lava.png-68ab43619d46c5f3cf0fd86b7248d922.md5 diff --git a/Game #3/.import/lava.png-68ab43619d46c5f3cf0fd86b7248d922.stex b/Game_3/.import/lava.png-68ab43619d46c5f3cf0fd86b7248d922.stex similarity index 100% rename from Game #3/.import/lava.png-68ab43619d46c5f3cf0fd86b7248d922.stex rename to Game_3/.import/lava.png-68ab43619d46c5f3cf0fd86b7248d922.stex diff --git a/Game #3/.import/sphere.png-b7490a5e3cfc87a7a150d30e23b12756.md5 b/Game_3/.import/sphere.png-b7490a5e3cfc87a7a150d30e23b12756.md5 similarity index 100% rename from Game #3/.import/sphere.png-b7490a5e3cfc87a7a150d30e23b12756.md5 rename to Game_3/.import/sphere.png-b7490a5e3cfc87a7a150d30e23b12756.md5 diff --git a/Game #3/.import/sphere.png-b7490a5e3cfc87a7a150d30e23b12756.stex b/Game_3/.import/sphere.png-b7490a5e3cfc87a7a150d30e23b12756.stex similarity index 100% rename from Game #3/.import/sphere.png-b7490a5e3cfc87a7a150d30e23b12756.stex rename to Game_3/.import/sphere.png-b7490a5e3cfc87a7a150d30e23b12756.stex diff --git a/Game #3/Roboto-Regular.ttf b/Game_3/Roboto-Regular.ttf similarity index 100% rename from Game #3/Roboto-Regular.ttf rename to Game_3/Roboto-Regular.ttf diff --git a/Game #3/Sprites/floor.png b/Game_3/Sprites/floor.png similarity index 100% rename from Game #3/Sprites/floor.png rename to Game_3/Sprites/floor.png diff --git a/Game_3/Sprites/floor.png.import b/Game_3/Sprites/floor.png.import new file mode 100644 index 0000000..93b2b73 --- /dev/null +++ b/Game_3/Sprites/floor.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/floor.png-bad02a3061f4734a68e01c2ddec9b22e.stex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://Sprites/floor.png" +dest_files=[ "res://.import/floor.png-bad02a3061f4734a68e01c2ddec9b22e.stex" ] + +[params] + +compress/mode=0 +compress/lossy_quality=0.7 +compress/hdr_mode=0 +compress/bptc_ldr=0 +compress/normal_map=0 +flags/repeat=0 +flags/filter=true +flags/mipmaps=false +flags/anisotropic=false +flags/srgb=2 +process/fix_alpha_border=true +process/premult_alpha=false +process/HDR_as_SRGB=false +process/invert_color=false +stream=false +size_limit=0 +detect_3d=true +svg/scale=1.0 diff --git a/Game #3/Sprites/jedi.png.import b/Game_3/Sprites/jedi.png.import similarity index 100% rename from Game #3/Sprites/jedi.png.import rename to Game_3/Sprites/jedi.png.import diff --git a/Game #3/Sprites/lava.png.import b/Game_3/Sprites/lava.png.import similarity index 100% rename from Game #3/Sprites/lava.png.import rename to Game_3/Sprites/lava.png.import diff --git a/Game #3/Sprites/sphere.png b/Game_3/Sprites/sphere.png similarity index 100% rename from Game #3/Sprites/sphere.png rename to Game_3/Sprites/sphere.png diff --git a/Game #3/Sprites/sphere.png.import b/Game_3/Sprites/sphere.png.import similarity index 100% rename from Game #3/Sprites/sphere.png.import rename to Game_3/Sprites/sphere.png.import diff --git a/Game #3/Sprites/sphere.png~ b/Game_3/Sprites/sphere.png~ similarity index 100% rename from Game #3/Sprites/sphere.png~ rename to Game_3/Sprites/sphere.png~ diff --git a/Game #3/export_presets.cfg b/Game_3/export_presets.cfg similarity index 100% rename from Game #3/export_presets.cfg rename to Game_3/export_presets.cfg diff --git a/Game #3/floor.tscn b/Game_3/floor.tscn similarity index 100% rename from Game #3/floor.tscn rename to Game_3/floor.tscn diff --git a/Game #3/game.gd b/Game_3/game.gd similarity index 100% rename from Game #3/game.gd rename to Game_3/game.gd diff --git a/Game #3/game.tscn b/Game_3/game.tscn similarity index 100% rename from Game #3/game.tscn rename to Game_3/game.tscn diff --git a/Game #3/icon.png b/Game_3/icon.png similarity index 100% rename from Game #3/icon.png rename to Game_3/icon.png diff --git a/Game #3/icon.png.import b/Game_3/icon.png.import similarity index 100% rename from Game #3/icon.png.import rename to Game_3/icon.png.import diff --git a/Game #3/menu.gd b/Game_3/menu.gd similarity index 100% rename from Game #3/menu.gd rename to Game_3/menu.gd diff --git a/Game #3/menu.tscn b/Game_3/menu.tscn similarity index 100% rename from Game #3/menu.tscn rename to Game_3/menu.tscn diff --git a/Game #3/player.gd b/Game_3/player.gd similarity index 100% rename from Game #3/player.gd rename to Game_3/player.gd diff --git a/Game #3/player.tscn b/Game_3/player.tscn similarity index 100% rename from Game #3/player.tscn rename to Game_3/player.tscn diff --git a/Game #3/project.godot b/Game_3/project.godot similarity index 100% rename from Game #3/project.godot rename to Game_3/project.godot diff --git a/Game #3/roboto.tres b/Game_3/roboto.tres similarity index 100% rename from Game #3/roboto.tres rename to Game_3/roboto.tres diff --git a/Game #3/roboto2.tres b/Game_3/roboto2.tres similarity index 100% rename from Game #3/roboto2.tres rename to Game_3/roboto2.tres diff --git a/Game #3/singleton.gd b/Game_3/singleton.gd similarity index 100% rename from Game #3/singleton.gd rename to Game_3/singleton.gd diff --git a/Game_4/.import/floor.png-8870646e23ec8c3ad77089faabc9e773.md5 b/Game_4/.import/floor.png-8870646e23ec8c3ad77089faabc9e773.md5 new file mode 100644 index 0000000..ca30529 --- /dev/null +++ b/Game_4/.import/floor.png-8870646e23ec8c3ad77089faabc9e773.md5 @@ -0,0 +1,3 @@ +source_md5="9750ca6557519b87fc4520d712122db2" +dest_md5="5eb6e761bb9e4397cd2a5caa6c18dc5a" + diff --git a/Game_4/.import/floor.png-8870646e23ec8c3ad77089faabc9e773.stex b/Game_4/.import/floor.png-8870646e23ec8c3ad77089faabc9e773.stex new file mode 100644 index 0000000..c133fd4 Binary files /dev/null and b/Game_4/.import/floor.png-8870646e23ec8c3ad77089faabc9e773.stex differ diff --git a/Game #4/.import/icon.png-487276ed1e3a0c39cad0279d744ee560.md5 b/Game_4/.import/icon.png-487276ed1e3a0c39cad0279d744ee560.md5 similarity index 100% rename from Game #4/.import/icon.png-487276ed1e3a0c39cad0279d744ee560.md5 rename to Game_4/.import/icon.png-487276ed1e3a0c39cad0279d744ee560.md5 diff --git a/Game #4/.import/icon.png-487276ed1e3a0c39cad0279d744ee560.stex b/Game_4/.import/icon.png-487276ed1e3a0c39cad0279d744ee560.stex similarity index 100% rename from Game #4/.import/icon.png-487276ed1e3a0c39cad0279d744ee560.stex rename to Game_4/.import/icon.png-487276ed1e3a0c39cad0279d744ee560.stex diff --git a/Game #4/.import/sphere.png-b735a7d58a47546099ef1144a282cd43.md5 b/Game_4/.import/sphere.png-b735a7d58a47546099ef1144a282cd43.md5 similarity index 100% rename from Game #4/.import/sphere.png-b735a7d58a47546099ef1144a282cd43.md5 rename to Game_4/.import/sphere.png-b735a7d58a47546099ef1144a282cd43.md5 diff --git a/Game #4/.import/sphere.png-b735a7d58a47546099ef1144a282cd43.stex b/Game_4/.import/sphere.png-b735a7d58a47546099ef1144a282cd43.stex similarity index 100% rename from Game #4/.import/sphere.png-b735a7d58a47546099ef1144a282cd43.stex rename to Game_4/.import/sphere.png-b735a7d58a47546099ef1144a282cd43.stex diff --git a/Game #4/code/global.gd b/Game_4/code/global.gd similarity index 100% rename from Game #4/code/global.gd rename to Game_4/code/global.gd diff --git a/Game #4/code/network.gd b/Game_4/code/network.gd similarity index 89% rename from Game #4/code/network.gd rename to Game_4/code/network.gd index 94b4ad4..d96e2a1 100644 --- a/Game #4/code/network.gd +++ b/Game_4/code/network.gd @@ -7,6 +7,8 @@ var server = null var client = null var ip_address = "" +var current_player_username = "" + func _ready() -> void: if OS.get_name() == "Windows": @@ -23,16 +25,20 @@ func _ready() -> void: get_tree().connect("connected_to_server", self, "_connected_to_server") get_tree().connect("server_disconnected", self, "_server_disconnected") + func create_server() -> void: server = NetworkedMultiplayerENet.new() server.create_server(DEFAULT_PORT, MAX_CLIENTS) get_tree().set_network_peer(server) + Global.instance_node(load("res://scenes/server_advertiser.tscn"), get_tree().current_scene) + func join_server() -> void: client = NetworkedMultiplayerENet.new() client.create_client(ip_address, DEFAULT_PORT) get_tree().set_network_peer(client) + func _connected_to_server() -> void: print("Successfully connected to the server") diff --git a/Game #4/code/network_setup.gd b/Game_4/code/network_setup.gd similarity index 74% rename from Game #4/code/network_setup.gd rename to Game_4/code/network_setup.gd index 052eb5c..b962c0f 100644 --- a/Game #4/code/network_setup.gd +++ b/Game_4/code/network_setup.gd @@ -3,7 +3,7 @@ extends Control var player = load("res://scenes/player.tscn") onready var multiplayer_config_ui = $multiplayer_configure -onready var server_ip_address = $multiplayer_configure/server_ip_address +onready var username_text_edit = $multiplayer_configure/username_text_edit onready var device_ip_address = $CanvasLayer/device_ip_address @@ -26,16 +26,18 @@ func _player_disconnected(id) -> void: func _on_create_server_pressed(): - multiplayer_config_ui.hide() - Network.create_server() - instance_player(get_tree().get_network_unique_id()) + if username_text_edit.text != "": + Network.current_player_username = username_text_edit.text + multiplayer_config_ui.hide() + Network.create_server() + instance_player(get_tree().get_network_unique_id()) func _on_join_server_pressed(): - if server_ip_address.text != "": + if username_text_edit.text != "": multiplayer_config_ui.hide() - Network.ip_address = server_ip_address.text - Network.join_server() + username_text_edit.hide() + Global.instance_node(load("res://scenes/server_browser.tscn"), self) func _connected_to_server() -> void: diff --git a/Game #4/code/player.gd b/Game_4/code/player.gd similarity index 87% rename from Game #4/code/player.gd rename to Game_4/code/player.gd index 632d0e2..6916eb8 100644 --- a/Game #4/code/player.gd +++ b/Game_4/code/player.gd @@ -2,9 +2,10 @@ extends KinematicBody2D const JUMP_FORCE = 500 const GRAVITY = 500 -const MAX_SPEED = 10000 +const MAX_SPEED = 5000 +const ACCELERATION = 10 -var speed = 15 +var speed = 50 var velocity = Vector2() var fly = false @@ -42,17 +43,18 @@ func movement(delta): if velocity.x < MAX_SPEED: velocity.x += speed - if !Input.is_action_pressed("move_left") and !Input.is_action_pressed("move_right") and is_on_floor(): - velocity.x = 0 + #if !Input.is_action_pressed("move_left") and !Input.is_action_pressed("move_right") and is_on_floor(): + # velocity.x = 0 velocity.y += GRAVITY * delta if Input.is_action_pressed("jump") and is_on_floor(): velocity.y -= JUMP_FORCE velocity = move_and_slide(velocity, Vector2.UP) + print(velocity) func flying(): - speed = 1000 + var fly_speed = 1000 var velocity = Vector2() if Input.is_action_pressed("move_right"): velocity.x += 1 @@ -62,7 +64,7 @@ func flying(): velocity.y += 1 if Input.is_action_pressed("move_up"): velocity.y -= 1 - velocity = velocity.normalized() * speed + velocity = velocity.normalized() * fly_speed print(velocity) velocity = move_and_slide(velocity) diff --git a/Game_4/code/server_advertiser.gd b/Game_4/code/server_advertiser.gd new file mode 100644 index 0000000..4632e00 --- /dev/null +++ b/Game_4/code/server_advertiser.gd @@ -0,0 +1,35 @@ +extends Node + + +export (float) var broadcast_interval = 1.0 +var server_info = {"name": "LAN Game"} +var socket_udp +var broadcast_timer = Timer.new() +var broadcast_port = Network.DEFAULT_PORT + + +func _enter_tree(): + broadcast_timer.wait_time = broadcast_interval + broadcast_timer.one_shot = false + broadcast_timer.autostart = true + + if get_tree().is_network_server(): + add_child(broadcast_timer) + broadcast_timer.connect("timeout", self, "broadcast") + + socket_udp = PacketPeerUDP.new() + socket_udp.set_broadcast_enabled(true) + socket_udp.set_dest_address('255.255.255.255', broadcast_port) + + +func broadcast(): + server_info.name = Network.current_player_username + var packet_message = to_json(server_info) + var packet = packet_message.to_ascii() + socket_udp.put_packet(packet) + + +func _exit_tree(): + broadcast_timer.stop() + if socket_udp != null: + socket_udp.close() diff --git a/Game_4/code/server_browser.gd b/Game_4/code/server_browser.gd new file mode 100644 index 0000000..47484a9 --- /dev/null +++ b/Game_4/code/server_browser.gd @@ -0,0 +1,46 @@ +extends Control + +onready var server_listener = $server_listener +onready var server_ip_text_edit = $background_panel/server_ip_text_edit +onready var server_container = $background_panel/VBoxContainer +onready var manual_setup_button = $background_panel/manual_setup + + +func _ready() -> void: + server_ip_text_edit.hide() + + +func _on_server_listener_new_server(serverInfo): + var server_node = Global.instance_node(load("res://scenes/server_display.tscn"), server_container) + server_node.text = "%s - %s" % [serverInfo.ip, serverInfo.name] + server_node.ip_address = str(serverInfo.ip) + + +func _on_server_listener_remove_server(serverIp): + for serverNode in server_container.get_children(): + if serverNode.is_in_group("server_display"): + if serverNode.ip_address == serverIp: + serverNode.queue_free() + break + + +func _on_manual_setup_pressed(): + if manual_setup_button.text != "exit setup": + server_ip_text_edit.show() + manual_setup_button.text = "exit setup" + server_container.hide() + server_ip_text_edit.call_deferred("grab_focus") + else: + server_ip_text_edit.text = "" + server_ip_text_edit.hide() + server_container.show() + + +func _on_join_server_pressed(): + Network.ip_address = server_ip_text_edit.text + hide() + Network.join_server() + + +func _on_go_back_pressed(): + get_tree().reload_current_scene() diff --git a/Game_4/code/server_display.gd b/Game_4/code/server_display.gd new file mode 100644 index 0000000..ad0ed27 --- /dev/null +++ b/Game_4/code/server_display.gd @@ -0,0 +1,9 @@ +extends Label + +var ip_address = "" + + +func _on_join_button_pressed(): + Network.ip_address = ip_address + Network.join_server() + get_parent().get_parent().queue_free() diff --git a/Game_4/code/server_listener.gd b/Game_4/code/server_listener.gd new file mode 100644 index 0000000..09b67cb --- /dev/null +++ b/Game_4/code/server_listener.gd @@ -0,0 +1,66 @@ +extends Node + + +signal new_server +signal remove_server + +var cleanup_timer = Timer.new() +var socket_udp = PacketPeerUDP.new() +var listen_port = Network.DEFAULT_PORT +var known_servers = {} + +export (int) var server_cleanup_threshold = 3 + + +func _init(): + cleanup_timer.wait_time = server_cleanup_threshold + cleanup_timer.one_shot = false + cleanup_timer.autostart = true + cleanup_timer.connect("timeout", self, 'clean_up') + add_child(cleanup_timer) + + +func ready(): + known_servers.clear() + + if socket_udp.listen(listen_port) != OK: + print("GameServer LAN service: Error listening port: " + str(listen_port)) + else: + print("GameServer LAN service: Llistening port: " + str(listen_port)) + + +func _process(delta): + if socket_udp.get_available_packet_count() > 0: + var server_ip = socket_udp.get_packet_ip() + var server_port = socket_udp.get_packet_port() + var array_bytes = socket_udp.get_packet() + + if server_ip != "" and server_port > 0: + if not known_servers.has(server_ip): + var serverMessage = array_bytes.get_string_from_ascii() + var gameInfo = parse_json(serverMessage) + gameInfo.ip = server_ip + gameInfo.lastSeen = OS.get_unix_time() + known_servers[server_ip] = gameInfo + emit_signal("new_server", gameInfo) + print(socket_udp.get_packet_ip()) + else: + var gameInfo = known_servers[server_ip] + gameInfo.lastSeen = OS.get_unix_time() + + +func cleanup(): + var now = OS.get_unix_time() + for server_ip in known_servers: + var serverInfo = known_servers[server_ip] + if (now - serverInfo.lastSeen) > server_cleanup_threshold: + known_servers.erase(server_ip) + print("Remove old server: %s" % server_ip) + emit_signal("remove_server", server_ip) + + +func _exit_tree(): + socket_udp.close() + + + diff --git a/Game #4/default_env.tres b/Game_4/default_env.tres similarity index 100% rename from Game #4/default_env.tres rename to Game_4/default_env.tres diff --git a/Game #4/export_presets.cfg b/Game_4/export_presets.cfg similarity index 96% rename from Game #4/export_presets.cfg rename to Game_4/export_presets.cfg index 897dfa1..7b03d8e 100644 --- a/Game #4/export_presets.cfg +++ b/Game_4/export_presets.cfg @@ -1,6 +1,6 @@ [preset.0] -name="Linux/X11" +name="game" platform="Linux/X11" runnable=true custom_features="" diff --git a/Game #4/font/Roboto-Regular.ttf b/Game_4/font/Roboto-Regular.ttf similarity index 100% rename from Game #4/font/Roboto-Regular.ttf rename to Game_4/font/Roboto-Regular.ttf diff --git a/Game #4/font/roboto.tres b/Game_4/font/roboto.tres similarity index 100% rename from Game #4/font/roboto.tres rename to Game_4/font/roboto.tres diff --git a/Game #4/icon.png b/Game_4/icon.png similarity index 100% rename from Game #4/icon.png rename to Game_4/icon.png diff --git a/Game #4/icon.png.import b/Game_4/icon.png.import similarity index 100% rename from Game #4/icon.png.import rename to Game_4/icon.png.import diff --git a/Game #4/project.godot b/Game_4/project.godot similarity index 100% rename from Game #4/project.godot rename to Game_4/project.godot diff --git a/Game #4/scenes/floor.tscn b/Game_4/scenes/floor.tscn similarity index 100% rename from Game #4/scenes/floor.tscn rename to Game_4/scenes/floor.tscn diff --git a/Game #4/scenes/main_menu.tscn b/Game_4/scenes/main_menu.tscn similarity index 94% rename from Game #4/scenes/main_menu.tscn rename to Game_4/scenes/main_menu.tscn index de4f3f2..2fb5d09 100644 --- a/Game #4/scenes/main_menu.tscn +++ b/Game_4/scenes/main_menu.tscn @@ -46,7 +46,7 @@ __meta__ = { "_edit_use_anchors_": false } -[node name="server_ip_address" type="LineEdit" parent="multiplayer_configure"] +[node name="username_text_edit" type="LineEdit" parent="multiplayer_configure"] anchor_left = 0.5 anchor_right = 0.5 margin_left = -422.5 @@ -55,7 +55,7 @@ margin_right = 422.5 margin_bottom = 221.0 custom_fonts/font = ExtResource( 1 ) align = 1 -placeholder_text = "Enter IP address" +placeholder_text = "Enter username" __meta__ = { "_edit_use_anchors_": false } diff --git a/Game #4/scenes/player.tscn b/Game_4/scenes/player.tscn similarity index 100% rename from Game #4/scenes/player.tscn rename to Game_4/scenes/player.tscn diff --git a/Game #4/scenes/players.tscn b/Game_4/scenes/players.tscn similarity index 100% rename from Game #4/scenes/players.tscn rename to Game_4/scenes/players.tscn diff --git a/Game_4/scenes/server_advertiser.tscn b/Game_4/scenes/server_advertiser.tscn new file mode 100644 index 0000000..6c6dc44 --- /dev/null +++ b/Game_4/scenes/server_advertiser.tscn @@ -0,0 +1,6 @@ +[gd_scene load_steps=2 format=2] + +[ext_resource path="res://code/server_advertiser.gd" type="Script" id=1] + +[node name="server_advertiser" type="Node"] +script = ExtResource( 1 ) diff --git a/Game_4/scenes/server_browser.tscn b/Game_4/scenes/server_browser.tscn new file mode 100644 index 0000000..ff1fc14 --- /dev/null +++ b/Game_4/scenes/server_browser.tscn @@ -0,0 +1,139 @@ +[gd_scene load_steps=5 format=2] + +[ext_resource path="res://font/roboto.tres" type="DynamicFont" id=1] +[ext_resource path="res://scenes/server_listener.tscn" type="PackedScene" id=2] +[ext_resource path="res://code/server_browser.gd" type="Script" id=3] + +[sub_resource type="Animation" id=1] +resource_name = "searching_for_servers" +length = 0.8 +loop = true +tracks/0/type = "value" +tracks/0/path = NodePath(".:text") +tracks/0/interp = 1 +tracks/0/loop_wrap = true +tracks/0/imported = false +tracks/0/enabled = true +tracks/0/keys = { +"times": PoolRealArray( 0, 0.2, 0.4, 0.6 ), +"transitions": PoolRealArray( 1, 1, 1, 1 ), +"update": 1, +"values": [ "Searching for servers", "Searching for servers.", "Searching for servers..", "Searching for servers..." ] +} + +[node name="server_browser" type="Control"] +anchor_right = 1.0 +anchor_bottom = 1.0 +script = ExtResource( 3 ) +__meta__ = { +"_edit_use_anchors_": false +} + +[node name="background_panel" type="Panel" parent="."] +anchor_right = 1.0 +anchor_bottom = 1.0 +margin_left = 96.0 +margin_top = 162.0 +margin_right = -96.0 +margin_bottom = -54.0 +__meta__ = { +"_edit_use_anchors_": false +} + +[node name="manual_setup" type="Button" parent="background_panel"] +anchor_left = 1.0 +anchor_top = 1.0 +anchor_right = 1.0 +anchor_bottom = 1.0 +margin_left = -473.0 +margin_top = -175.0 +margin_right = -30.0 +margin_bottom = -30.0 +custom_fonts/font = ExtResource( 1 ) +text = "Manual setup" +__meta__ = { +"_edit_use_anchors_": false +} + +[node name="go_back" type="Button" parent="background_panel"] +anchor_top = 1.0 +anchor_bottom = 1.0 +margin_left = 30.0 +margin_top = -170.0 +margin_right = 473.0 +margin_bottom = -25.0 +custom_fonts/font = ExtResource( 1 ) +text = "Go back" + +[node name="server_ip_text_edit" type="LineEdit" parent="background_panel"] +anchor_left = 0.5 +anchor_top = 0.5 +anchor_right = 0.5 +anchor_bottom = 0.5 +margin_left = -403.0 +margin_top = -243.0 +margin_right = 403.0 +margin_bottom = -138.0 +custom_fonts/font = ExtResource( 1 ) +align = 1 + +[node name="type_in_server_ip" type="Label" parent="background_panel/server_ip_text_edit"] +anchor_right = 1.0 +margin_top = -105.0 +custom_fonts/font = ExtResource( 1 ) +text = "Type in server IP" +align = 1 +valign = 1 + +[node name="join_server" type="Button" parent="background_panel/server_ip_text_edit"] +anchor_left = 0.5 +anchor_top = 0.5 +anchor_right = 0.5 +anchor_bottom = 0.5 +margin_left = -221.5 +margin_top = 94.5 +margin_right = 221.5 +margin_bottom = 239.5 +custom_fonts/font = ExtResource( 1 ) +text = "Join server" +__meta__ = { +"_edit_use_anchors_": false +} + +[node name="VBoxContainer" type="VBoxContainer" parent="background_panel"] +anchor_right = 1.0 +anchor_bottom = 1.0 +margin_left = 70.0 +margin_top = 40.0 +margin_right = -70.0 +margin_bottom = -175.0 + +[node name="searching_for_servers" type="Label" parent="background_panel/VBoxContainer"] +margin_right = 1588.0 +margin_bottom = 76.0 +rect_min_size = Vector2( 0, 70 ) +custom_fonts/font = ExtResource( 1 ) +text = "Searching for servers.." +align = 1 +valign = 1 + +[node name="AnimationPlayer" type="AnimationPlayer" parent="background_panel/VBoxContainer/searching_for_servers"] +autoplay = "searching_for_servers" +playback_speed = 0.5 +anims/searching_for_servers = SubResource( 1 ) + +[node name="server_browser_label" type="Label" parent="background_panel"] +anchor_right = 1.0 +margin_top = -176.0 +custom_fonts/font = ExtResource( 1 ) +text = "Server Browser" +align = 1 +valign = 1 + +[node name="server_listener" parent="." instance=ExtResource( 2 )] + +[connection signal="pressed" from="background_panel/manual_setup" to="." method="_on_manual_setup_pressed"] +[connection signal="pressed" from="background_panel/go_back" to="." method="_on_go_back_pressed"] +[connection signal="pressed" from="background_panel/server_ip_text_edit/join_server" to="." method="_on_join_server_pressed"] +[connection signal="new_server" from="server_listener" to="." method="_on_server_listener_new_server"] +[connection signal="remove_server" from="server_listener" to="." method="_on_server_listener_remove_server"] diff --git a/Game_4/scenes/server_display.tscn b/Game_4/scenes/server_display.tscn new file mode 100644 index 0000000..3252bdb --- /dev/null +++ b/Game_4/scenes/server_display.tscn @@ -0,0 +1,32 @@ +[gd_scene load_steps=3 format=2] + +[ext_resource path="res://font/roboto.tres" type="DynamicFont" id=1] +[ext_resource path="res://code/server_display.gd" type="Script" id=2] + +[node name="server_display" type="Label"] +anchor_right = 1.0 +margin_right = -220.0 +margin_bottom = 130.0 +rect_min_size = Vector2( 0, 130 ) +custom_fonts/font = ExtResource( 1 ) +text = "N/A: 000.000.000" +align = 1 +valign = 1 +script = ExtResource( 2 ) +__meta__ = { +"_edit_use_anchors_": false +} + +[node name="join_button" type="Button" parent="." groups=[ +"server_display", +]] +anchor_left = 1.0 +anchor_right = 1.0 +anchor_bottom = 1.0 +margin_left = -302.0 +margin_top = 13.0 +margin_bottom = -13.0 +custom_fonts/font = ExtResource( 1 ) +text = "Join" + +[connection signal="pressed" from="join_button" to="." method="_on_join_button_pressed"] diff --git a/Game_4/scenes/server_listener.tscn b/Game_4/scenes/server_listener.tscn new file mode 100644 index 0000000..8e0df2b --- /dev/null +++ b/Game_4/scenes/server_listener.tscn @@ -0,0 +1,6 @@ +[gd_scene load_steps=2 format=2] + +[ext_resource path="res://code/server_listener.gd" type="Script" id=1] + +[node name="server_listener" type="Node"] +script = ExtResource( 1 ) diff --git a/Game #4/sprites/floor.png b/Game_4/sprites/floor.png similarity index 100% rename from Game #4/sprites/floor.png rename to Game_4/sprites/floor.png diff --git a/Game #4/sprites/floor.png.import b/Game_4/sprites/floor.png.import similarity index 100% rename from Game #4/sprites/floor.png.import rename to Game_4/sprites/floor.png.import diff --git a/Game #4/sprites/sphere.png b/Game_4/sprites/sphere.png similarity index 100% rename from Game #4/sprites/sphere.png rename to Game_4/sprites/sphere.png diff --git a/Game #4/sprites/sphere.png.import b/Game_4/sprites/sphere.png.import similarity index 100% rename from Game #4/sprites/sphere.png.import rename to Game_4/sprites/sphere.png.import