From 403be9bd7ad212d41371511f9690604380d4a0c7 Mon Sep 17 00:00:00 2001
From: Hurlu <mr.hurlu@gmail.com>
Date: Sat, 4 Apr 2020 22:26:00 +0200
Subject: [PATCH] GameMap scene

---
 Assets/Tiling/Tileset.tres | 24 ++++++++++++------------
 Scene/GameMap.tscn         |  9 +--------
 project.godot              |  1 +
 3 files changed, 14 insertions(+), 20 deletions(-)

diff --git a/Assets/Tiling/Tileset.tres b/Assets/Tiling/Tileset.tres
index 9776d12..86b13c6 100644
--- a/Assets/Tiling/Tileset.tres
+++ b/Assets/Tiling/Tileset.tres
@@ -2,16 +2,16 @@
 
 [ext_resource path="res://Assets/Tiling/tileset.png" type="Texture" id=1]
 
-[sub_resource type="ConvexPolygonShape2D" id=5]
+[sub_resource type="ConvexPolygonShape2D" id=1]
 points = PoolVector2Array( 0.257217, 0.262283, 7.93196, 0.262283, 7.93196, 31.659, 0.257217, 31.659 )
 
-[sub_resource type="ConvexPolygonShape2D" id=6]
+[sub_resource type="ConvexPolygonShape2D" id=2]
 points = PoolVector2Array( 0.0246506, 0.894691, 7.93196, 0.894691, 7.93196, 31.5937, 0.0246506, 31.5937 )
 
-[sub_resource type="ConvexPolygonShape2D" id=7]
+[sub_resource type="ConvexPolygonShape2D" id=3]
 points = PoolVector2Array( 32, 32, 24.2623, 32, 24.4949, 0, 32, 0 )
 
-[sub_resource type="ConvexPolygonShape2D" id=8]
+[sub_resource type="ConvexPolygonShape2D" id=4]
 points = PoolVector2Array( 32, 31.0414, 24.0297, 31.0414, 24.0297, 0, 32, 0 )
 
 [resource]
@@ -140,14 +140,14 @@ points = PoolVector2Array( 32, 31.0414, 24.0297, 31.0414, 24.0297, 0, 32, 0 )
 5/navigation_offset = Vector2( 0, 0 )
 5/shape_offset = Vector2( 0, 0 )
 5/shape_transform = Transform2D( 1, 0, 0, 1, 0, 0 )
-5/shape = SubResource( 5 )
+5/shape = SubResource( 1 )
 5/shape_one_way = false
 5/shape_one_way_margin = 1.0
 5/shapes = [ {
 "autotile_coord": Vector2( 0, 0 ),
 "one_way": false,
 "one_way_margin": 1.0,
-"shape": SubResource( 5 ),
+"shape": SubResource( 1 ),
 "shape_transform": Transform2D( 1, 0, 0, 1, 0, 0 )
 } ]
 5/z_index = 0
@@ -161,14 +161,14 @@ points = PoolVector2Array( 32, 31.0414, 24.0297, 31.0414, 24.0297, 0, 32, 0 )
 6/navigation_offset = Vector2( 0, 0 )
 6/shape_offset = Vector2( 0, 0 )
 6/shape_transform = Transform2D( 1, 0, 0, 1, 0, 0 )
-6/shape = SubResource( 6 )
+6/shape = SubResource( 2 )
 6/shape_one_way = false
 6/shape_one_way_margin = 1.0
 6/shapes = [ {
 "autotile_coord": Vector2( 0, 0 ),
 "one_way": false,
 "one_way_margin": 1.0,
-"shape": SubResource( 6 ),
+"shape": SubResource( 2 ),
 "shape_transform": Transform2D( 1, 0, 0, 1, 0, 0 )
 } ]
 6/z_index = 1
@@ -196,14 +196,14 @@ points = PoolVector2Array( 32, 31.0414, 24.0297, 31.0414, 24.0297, 0, 32, 0 )
 8/navigation_offset = Vector2( 0, 0 )
 8/shape_offset = Vector2( 0, 0 )
 8/shape_transform = Transform2D( 1, 0, 0, 1, 0, 0 )
-8/shape = SubResource( 7 )
+8/shape = SubResource( 3 )
 8/shape_one_way = false
 8/shape_one_way_margin = 1.0
 8/shapes = [ {
 "autotile_coord": Vector2( 0, 0 ),
 "one_way": false,
 "one_way_margin": 1.0,
-"shape": SubResource( 7 ),
+"shape": SubResource( 3 ),
 "shape_transform": Transform2D( 1, 0, 0, 1, 0, 0 )
 } ]
 8/z_index = 0
@@ -217,14 +217,14 @@ points = PoolVector2Array( 32, 31.0414, 24.0297, 31.0414, 24.0297, 0, 32, 0 )
 9/navigation_offset = Vector2( 0, 0 )
 9/shape_offset = Vector2( 0, 0 )
 9/shape_transform = Transform2D( 1, 0, 0, 1, 0, 0 )
-9/shape = SubResource( 8 )
+9/shape = SubResource( 4 )
 9/shape_one_way = false
 9/shape_one_way_margin = 1.0
 9/shapes = [ {
 "autotile_coord": Vector2( 0, 0 ),
 "one_way": false,
 "one_way_margin": 1.0,
-"shape": SubResource( 8 ),
+"shape": SubResource( 4 ),
 "shape_transform": Transform2D( 1, 0, 0, 1, 0, 0 )
 } ]
 9/z_index = 1
diff --git a/Scene/GameMap.tscn b/Scene/GameMap.tscn
index b2b5d5b..d6dc85a 100644
--- a/Scene/GameMap.tscn
+++ b/Scene/GameMap.tscn
@@ -1,7 +1,6 @@
-[gd_scene load_steps=4 format=2]
+[gd_scene load_steps=3 format=2]
 
 [ext_resource path="res://Assets/Tiling/Tileset.tres" type="TileSet" id=1]
-[ext_resource path="res://Scene/Player.tscn" type="PackedScene" id=2]
 
 [sub_resource type="RectangleShape2D" id=1]
 extents = Vector2( 991.884, 66.2394 )
@@ -52,9 +51,3 @@ visible = false
 [node name="CollisionShape2D" type="CollisionShape2D" parent="Walls/DownWall"]
 position = Vector2( 937.312, 1151.28 )
 shape = SubResource( 1 )
-
-[node name="Player1" parent="." instance=ExtResource( 2 )]
-position = Vector2( 1275.44, 299.381 )
-
-[node name="Player2" parent="." instance=ExtResource( 2 )]
-position = Vector2( 258.37, 483.931 )
diff --git a/project.godot b/project.godot
index 9f8e181..8a8a72f 100644
--- a/project.godot
+++ b/project.godot
@@ -23,6 +23,7 @@ config/icon="res://icon.png"
 
 window/size/width=1920
 window/size/height=1080
+window/size/borderless=true
 window/size/test_width=1920
 window/size/test_height=1080
 window/stretch/mode="2d"