diff --git a/.gitignore b/.gitignore index e60d61a..de0184c 100644 --- a/.gitignore +++ b/.gitignore @@ -3,6 +3,8 @@ *.swo .fscache .import +*.import +*.blend1 ._* ehthumbs.db diff --git a/default_env.tres b/assets/default_env.tres similarity index 100% rename from default_env.tres rename to assets/default_env.tres diff --git a/maze.blend b/assets/maze.blend similarity index 100% rename from maze.blend rename to assets/maze.blend diff --git a/maze.mtl b/assets/maze.mtl similarity index 100% rename from maze.mtl rename to assets/maze.mtl diff --git a/maze.obj b/assets/maze.obj similarity index 100% rename from maze.obj rename to assets/maze.obj diff --git a/player.blend b/assets/player.blend similarity index 100% rename from player.blend rename to assets/player.blend diff --git a/player.mtl b/assets/player.mtl similarity index 100% rename from player.mtl rename to assets/player.mtl diff --git a/player.obj b/assets/player.obj similarity index 100% rename from player.obj rename to assets/player.obj diff --git a/icon.png.import b/icon.png.import deleted file mode 100644 index 8b1c012..0000000 --- a/icon.png.import +++ /dev/null @@ -1,28 +0,0 @@ -[remap] - -importer="texture" -type="StreamTexture" -path="res://.import/icon.png-487276ed1e3a0c39cad0279d744ee560.stex" - -[deps] - -source_md5="ae7e641067601e2184afcade49abd283" - -[params] - -compress/mode=0 -compress/lossy_quality=0.7 -compress/hdr_mode=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 -stream=false -size_limit=0 -detect_3d=true -svg/scale=1.0 diff --git a/maze.obj.import b/maze.obj.import deleted file mode 100644 index 6c63466..0000000 --- a/maze.obj.import +++ /dev/null @@ -1,19 +0,0 @@ -[remap] - -importer="wavefront_obj" -type="Mesh" -path="res://.import/maze.obj-c0bc716dc2eec47dec52eafdca72e5fb.mesh" - -[deps] - -files=[ "res://.import/maze.obj-c0bc716dc2eec47dec52eafdca72e5fb.mesh" ] - -source_file="res://maze.obj" -source_md5="ddfc0e190f5bf69c7973c00c0ca8efc0" - -dest_files=[ "res://.import/maze.obj-c0bc716dc2eec47dec52eafdca72e5fb.mesh", "res://.import/maze.obj-c0bc716dc2eec47dec52eafdca72e5fb.mesh" ] -dest_md5="215d956c276d47023447d0730fbed508" - -[params] - -generate_tangents=true diff --git a/player.blend1 b/player.blend1 deleted file mode 100644 index 7c88d47..0000000 Binary files a/player.blend1 and /dev/null differ diff --git a/player.obj.import b/player.obj.import deleted file mode 100644 index 8121ba8..0000000 --- a/player.obj.import +++ /dev/null @@ -1,15 +0,0 @@ -[remap] - -importer="wavefront_obj" -type="Mesh" -path="res://.import/player.obj-6e2f17c0007f45d03dba8b8cecc6f696.mesh" - -[deps] - -files=[ "res://.import/player.obj-6e2f17c0007f45d03dba8b8cecc6f696.mesh" ] - -source_md5="7074ae8221d3b083f4f95e70e1ee446f" - -[params] - -generate_tangents=true diff --git a/project.godot b/project.godot index 3ab2d2e..ae0f0be 100644 --- a/project.godot +++ b/project.godot @@ -11,7 +11,7 @@ config_version=3 [application] config/name="mv-moba" -run/main_scene="res://lobby.tscn" +run/main_scene="res://scenes/lobby.tscn" config/icon="res://icon.png" [input] diff --git a/hero_0.tscn b/scenes/heroes/0.tscn similarity index 96% rename from hero_0.tscn rename to scenes/heroes/0.tscn index c6a5f89..4e4fbd3 100644 --- a/hero_0.tscn +++ b/scenes/heroes/0.tscn @@ -1,6 +1,6 @@ [gd_scene load_steps=5 format=2] -[ext_resource path="res://hero_0.gd" type="Script" id=1] +[ext_resource path="res://scripts/heroes/0.gd" type="Script" id=1] [sub_resource type="CapsuleShape" id=1] @@ -20,7 +20,7 @@ radial_segments = 64 rings = 8 _sections_unfolded = [ "Resource" ] -[node name="RigidBody" type="KinematicBody" index="0"] +[node name="RigidBody" type="KinematicBody"] input_ray_pickable = true input_capture_on_drag = false diff --git a/lobby.tscn b/scenes/lobby.tscn similarity index 96% rename from lobby.tscn rename to scenes/lobby.tscn index 34eef56..8e876cd 100644 --- a/lobby.tscn +++ b/scenes/lobby.tscn @@ -1,9 +1,9 @@ [gd_scene load_steps=3 format=2] -[ext_resource path="res://lobby.gd" type="Script" id=1] -[ext_resource path="res://hero_select.gd" type="Script" id=2] +[ext_resource path="res://scripts/lobby.gd" type="Script" id=1] +[ext_resource path="res://scripts/hero_select.gd" type="Script" id=2] -[node name="Control" type="Control"] +[node name="Control" type="Control" index="0"] anchor_left = 0.0 anchor_top = 0.0 diff --git a/player.tscn b/scenes/player.tscn similarity index 97% rename from player.tscn rename to scenes/player.tscn index 6b0cba5..960a528 100644 --- a/player.tscn +++ b/scenes/player.tscn @@ -1,6 +1,6 @@ [gd_scene load_steps=5 format=2] -[ext_resource path="res://player.gd" type="Script" id=1] +[ext_resource path="res://scripts/player.gd" type="Script" id=1] [sub_resource type="CapsuleShape" id=1] diff --git a/world.tscn b/scenes/world.tscn similarity index 99% rename from world.tscn rename to scenes/world.tscn index 45105a8..cb3288e 100644 --- a/world.tscn +++ b/scenes/world.tscn @@ -1,7 +1,7 @@ [gd_scene load_steps=4 format=2] -[ext_resource path="res://player.obj" type="ArrayMesh" id=1] -[ext_resource path="res://maze.obj" type="ArrayMesh" id=2] +[ext_resource path="res://assets/player.obj" type="ArrayMesh" id=1] +[ext_resource path="res://assets/maze.obj" type="ArrayMesh" id=2] [sub_resource type="ConcavePolygonShape" id=1] diff --git a/hero_select.gd b/scripts/hero_select.gd similarity index 100% rename from hero_select.gd rename to scripts/hero_select.gd diff --git a/hero_0.gd b/scripts/heroes/0.gd similarity index 95% rename from hero_0.gd rename to scripts/heroes/0.gd index dcfc647..0c6b078 100644 --- a/hero_0.gd +++ b/scripts/heroes/0.gd @@ -1,4 +1,4 @@ -extends "res://player.gd" +extends "res://scripts/player.gd" const wallride_speed = 0.5 const wallride_speed_necessary = 15 diff --git a/lobby.gd b/scripts/lobby.gd similarity index 95% rename from lobby.gd rename to scripts/lobby.gd index 8372e7b..0ebd837 100644 --- a/lobby.gd +++ b/scripts/lobby.gd @@ -18,7 +18,7 @@ func _ready(): get_node("ServerStart").connect("pressed", self, "start_game") get_node("Client").connect("pressed", self, "_client_init") get_node("Singleplayer").connect("pressed", self, "_singleplayer_init") - + get_tree().connect("network_peer_connected", self, "_player_connected") get_tree().connect("connected_to_server", self, "_connected_ok") @@ -28,7 +28,7 @@ func _client_init(): peer.create_client(SERVER_IP, SERVER_PORT) get_tree().set_network_peer(peer) get_node("Client").set_text("Clienting!") - + func _singleplayer_init(): collect_info() var peer = NetworkedMultiplayerENet.new() @@ -79,19 +79,19 @@ remote func done_preconfiguring(who): remote func pre_configure_game(): var self_peer_id = get_tree().get_network_unique_id() - + get_node("/root/Control").queue_free() - var world = load("res://world.tscn").instance() + var world = load("res://scenes/world.tscn").instance() get_node("/root").add_child(world) - + # Load all players (including self) for p in player_info: var hero = player_info[p].hero - var player = load("res://hero_" + str(hero) + ".tscn").instance() + var player = load("res://scenes/heroes/" + str(hero) + ".tscn").instance() player.set_name(str(p)) player.set_network_master(p) get_node("/root/world/players").call_deferred("add_child", player) - + rpc_id(1, "done_preconfiguring", self_peer_id) #func _process(delta): diff --git a/player.gd b/scripts/player.gd similarity index 100% rename from player.gd rename to scripts/player.gd