diff --git a/.import/godot_robot.png-ce351014d2ed04a481b25c4582aaf836.md5 b/.import/godot_robot.png-ce351014d2ed04a481b25c4582aaf836.md5 new file mode 100644 index 0000000000000000000000000000000000000000..62021384fde1e5ff8648548ef4e958d2062c52e2 --- /dev/null +++ b/.import/godot_robot.png-ce351014d2ed04a481b25c4582aaf836.md5 @@ -0,0 +1,3 @@ +source_md5="365887e918a59bbb1ef3d677c1aa7c73" +dest_md5="2ed3a50de91f51744ab35a444cc3e27e" + diff --git a/.import/godot_robot.png-ce351014d2ed04a481b25c4582aaf836.stex b/.import/godot_robot.png-ce351014d2ed04a481b25c4582aaf836.stex new file mode 100644 index 0000000000000000000000000000000000000000..aa3a1017482b46350eff2da4961afa2fe6d8a9ef Binary files /dev/null and b/.import/godot_robot.png-ce351014d2ed04a481b25c4582aaf836.stex differ diff --git a/.import/godot_test_tileset.png-552d53fedc89e794c87c953fc5fd0b53.md5 b/.import/godot_test_tileset.png-552d53fedc89e794c87c953fc5fd0b53.md5 new file mode 100644 index 0000000000000000000000000000000000000000..0a72a4db962c8196079644a24a42fc920fad5b19 --- /dev/null +++ b/.import/godot_test_tileset.png-552d53fedc89e794c87c953fc5fd0b53.md5 @@ -0,0 +1,3 @@ +source_md5="cf5074becf98dc44d406480b29ebf82c" +dest_md5="8e5024cd322d83c2af06d45329370f71" + diff --git a/.import/godot_test_tileset.png-552d53fedc89e794c87c953fc5fd0b53.stex b/.import/godot_test_tileset.png-552d53fedc89e794c87c953fc5fd0b53.stex new file mode 100644 index 0000000000000000000000000000000000000000..7bb1fe8d9fdbc4116607d5106b3995efad15ec5e Binary files /dev/null and b/.import/godot_test_tileset.png-552d53fedc89e794c87c953fc5fd0b53.stex differ diff --git a/.import/main_scifi_tileset.png-65d93a3e2769b8f3bd067b93fdfd5cb3.md5 b/.import/main_scifi_tileset.png-65d93a3e2769b8f3bd067b93fdfd5cb3.md5 new file mode 100644 index 0000000000000000000000000000000000000000..0b4827d7de24758a2336df8e39deee8ed91b028f --- /dev/null +++ b/.import/main_scifi_tileset.png-65d93a3e2769b8f3bd067b93fdfd5cb3.md5 @@ -0,0 +1,3 @@ +source_md5="703c6fc8de9c730dae97bcfd0c37e286" +dest_md5="869c403a3149cd8bb479d2db815c6627" + diff --git a/.import/main_scifi_tileset.png-65d93a3e2769b8f3bd067b93fdfd5cb3.stex b/.import/main_scifi_tileset.png-65d93a3e2769b8f3bd067b93fdfd5cb3.stex new file mode 100644 index 0000000000000000000000000000000000000000..5b3ef73eb8d1f80a7dc18a498a9ff19b6d9f588f Binary files /dev/null and b/.import/main_scifi_tileset.png-65d93a3e2769b8f3bd067b93fdfd5cb3.stex differ diff --git a/SRCGodot/.import/scifi_platformTiles_32x32.png-0333312e6054271fe0eb4eccde5be0d6.md5 b/SRCGodot/.import/scifi_platformTiles_32x32.png-0333312e6054271fe0eb4eccde5be0d6.md5 new file mode 100644 index 0000000000000000000000000000000000000000..ec6364ea9a15af54e9bd68d70718fffa90d3fca0 --- /dev/null +++ b/SRCGodot/.import/scifi_platformTiles_32x32.png-0333312e6054271fe0eb4eccde5be0d6.md5 @@ -0,0 +1,3 @@ +source_md5="703c6fc8de9c730dae97bcfd0c37e286" +dest_md5="b23dab3f32ae5b44dfb527c69db8cd67" + diff --git a/SRCGodot/.import/scifi_platformTiles_32x32.png-0333312e6054271fe0eb4eccde5be0d6.stex b/SRCGodot/.import/scifi_platformTiles_32x32.png-0333312e6054271fe0eb4eccde5be0d6.stex new file mode 100644 index 0000000000000000000000000000000000000000..2291331c1106557c074714640844d50f8915bdc7 Binary files /dev/null and b/SRCGodot/.import/scifi_platformTiles_32x32.png-0333312e6054271fe0eb4eccde5be0d6.stex differ diff --git a/SRCGodot/Assets/graphics/scifi_platformTiles_32x32.png.import b/SRCGodot/Assets/graphics/scifi_platformTiles_32x32.png.import index 411377ce43f74f0a2a8128ce834b0e5cd9062dac..d3423d5b9586847e71f23210bcd03a7083d5cc02 100644 --- a/SRCGodot/Assets/graphics/scifi_platformTiles_32x32.png.import +++ b/SRCGodot/Assets/graphics/scifi_platformTiles_32x32.png.import @@ -2,15 +2,15 @@ importer="texture" type="StreamTexture" -path="res://.import/scifi_platformTiles_32x32.png-96e8db92767ddeae6b6156038970c8c3.stex" +path="res://.import/scifi_platformTiles_32x32.png-0333312e6054271fe0eb4eccde5be0d6.stex" metadata={ "vram_texture": false } [deps] -source_file="res://Assets/scifi_platformTiles_32x32.png" -dest_files=[ "res://.import/scifi_platformTiles_32x32.png-96e8db92767ddeae6b6156038970c8c3.stex" ] +source_file="res://Assets/graphics/scifi_platformTiles_32x32.png" +dest_files=[ "res://.import/scifi_platformTiles_32x32.png-0333312e6054271fe0eb4eccde5be0d6.stex" ] [params] diff --git a/SRCGodot/Map1.tscn b/SRCGodot/Map1.tscn index d78d4f47beba8a794dfd78ea19f4a20e4328e7b1..a469c5e108f1b9b90838f971b96f5d5e25017bca 100644 --- a/SRCGodot/Map1.tscn +++ b/SRCGodot/Map1.tscn @@ -1,11 +1,7 @@ -[gd_scene load_steps=5 format=2] - -[ext_resource path="res://Assets/scifi_platformTiles_32x32.png" type="Texture" id=1] -[ext_resource path="res://Assets/TilesetTest/PNG/Chunk3.png" type="Texture" id=2] +[gd_scene load_steps=2 format=2] [sub_resource type="TileSet" id=1] 0/name = "scifi_platformTiles_32x32.png 0" -0/texture = ExtResource( 1 ) 0/tex_offset = Vector2( 0, 0 ) 0/modulate = Color( 1, 1, 1, 1 ) 0/region = Rect2( 0, 448, 576, 256 ) @@ -19,26 +15,9 @@ 0/shapes = [ ] 0/z_index = 0 -[sub_resource type="TileSet" id=2] -0/name = "Chunk3.png 0" -0/texture = ExtResource( 2 ) -0/tex_offset = Vector2( 0, 0 ) -0/modulate = Color( 1, 1, 1, 1 ) -0/region = Rect2( 96, 64, 32, 32 ) -0/tile_mode = 0 -0/occluder_offset = Vector2( 0, 0 ) -0/navigation_offset = Vector2( 0, 0 ) -0/shape_offset = Vector2( 0, 0 ) -0/shape_transform = Transform2D( 1, 0, 0, 1, 0, 0 ) -0/shape_one_way = false -0/shape_one_way_margin = 0.0 -0/shapes = [ ] -0/z_index = 0 - [node name="Map1" type="Node2D"] [node name="BackGround" type="TileMap" parent="."] -visible = false position = Vector2( 1, 0 ) tile_set = SubResource( 1 ) cell_size = Vector2( 32, 32 ) @@ -51,8 +30,3 @@ position = Vector2( 1, 0 ) tile_set = SubResource( 1 ) cell_size = Vector2( 32, 32 ) format = 1 - -[node name="TileMap" type="TileMap" parent="."] -tile_set = SubResource( 2 ) -cell_size = Vector2( 32, 32 ) -format = 1