Merge branch 'tiles'

Scenes/bullet.tscn

@@ -7,6 +7,8 @@
 radius = 2.23607
 
 [node name="Bullet" type="Area2D" groups=["bullets"]]
+collision_layer = 8
+collision_mask = 21
 script = ExtResource("1_jvxw3")
 Speed = 200.0
 metadata/_edit_group_ = true

Scenes/fragola.tscn

@@ -69,7 +69,7 @@ radius = 7.0
 
 [node name="Fragola" type="RigidBody2D" groups=["enemies"]]
 collision_layer = 4
-collision_mask = 7
+collision_mask = 11
 mass = 0.03
 gravity_scale = 0.0
 script = ExtResource("1_773fi")

Tilesets/factory.png.import

@@ -0,0 +1,34 @@
+[remap]
+
+importer="texture"
+type="CompressedTexture2D"
+uid="uid://tphqodqyere1"
+path="res://.godot/imported/factory.png-cfcd1328a98fcb6fdb084c282bfedb79.ctex"
+metadata={
+"vram_texture": false
+}
+
+[deps]
+
+source_file="res://Tilesets/factory.png"
+dest_files=["res://.godot/imported/factory.png-cfcd1328a98fcb6fdb084c282bfedb79.ctex"]
+
+[params]
+
+compress/mode=0
+compress/high_quality=false
+compress/lossy_quality=0.7
+compress/hdr_compression=1
+compress/normal_map=0
+compress/channel_pack=0
+mipmaps/generate=false
+mipmaps/limit=-1
+roughness/mode=0
+roughness/src_normal=""
+process/fix_alpha_border=true
+process/premult_alpha=false
+process/normal_map_invert_y=false
+process/hdr_as_srgb=false
+process/hdr_clamp_exposure=false
+process/size_limit=0
+detect_3d/compress_to=1

project.godot

@@ -70,6 +70,8 @@ shoot={
 2d_physics/layer_1="world"
 2d_physics/layer_2="player"
 2d_physics/layer_3="items"
+2d_physics/layer_4="bullets"
+2d_physics/layer_5="enemies"
 
 [physics]