Merge branch 'main' of https://github.com/MarcEricMartel/GameJam-Vanier
This commit is contained in:
		
										
											
												File diff suppressed because one or more lines are too long
											
										
									
								
							| @@ -11,9 +11,9 @@ tile_data = PackedInt32Array(65536, 196609, 0, 131072, 131073, 0, 196608, 196609 | |||||||
| [sub_resource type="TileMapPattern" id="TileMapPattern_pir2t"] | [sub_resource type="TileMapPattern" id="TileMapPattern_pir2t"] | ||||||
| tile_data = PackedInt32Array(0, 131073, 196611, 65536, 131073, 3, 1, 131073, 131075, 65537, 131073, 65539) | tile_data = PackedInt32Array(0, 131073, 196611, 65536, 131073, 3, 1, 131073, 131075, 65537, 131073, 65539) | ||||||
|  |  | ||||||
| [sub_resource type="PhysicsMaterial" id="PhysicsMaterial_06ibd"] | [sub_resource type="PhysicsMaterial" id="PhysicsMaterial_w88vo"] | ||||||
|  |  | ||||||
| [sub_resource type="TileSetAtlasSource" id="TileSetAtlasSource_nfq7o"] | [sub_resource type="TileSetAtlasSource" id="TileSetAtlasSource_4qill"] | ||||||
| resource_name = "<null>" | resource_name = "<null>" | ||||||
| texture = ExtResource("1_kka1l") | texture = ExtResource("1_kka1l") | ||||||
| texture_region_size = Vector2i(64, 64) | texture_region_size = Vector2i(64, 64) | ||||||
| @@ -216,7 +216,7 @@ texture_region_size = Vector2i(64, 64) | |||||||
| 1:3/1/transpose = true | 1:3/1/transpose = true | ||||||
| 1:3/1/physics_layer_0/linear_velocity = Vector2(0, 0) | 1:3/1/physics_layer_0/linear_velocity = Vector2(0, 0) | ||||||
| 1:3/1/physics_layer_0/angular_velocity = 0.0 | 1:3/1/physics_layer_0/angular_velocity = 0.0 | ||||||
| 1:3/1/physics_layer_0/polygon_0/points = PackedVector2Array(-32, -32, 32, -32, 32, 32, -32, 32) | 1:3/1/physics_layer_0/polygon_0/points = PackedVector2Array(-32, -32, -32, 32, 32, 32, 32, -32) | ||||||
| 1:3/2 = 2 | 1:3/2 = 2 | ||||||
| 1:3/2/flip_h = true | 1:3/2/flip_h = true | ||||||
| 1:3/2/transpose = true | 1:3/2/transpose = true | ||||||
| @@ -232,33 +232,33 @@ texture_region_size = Vector2i(64, 64) | |||||||
| 2:3/0 = 0 | 2:3/0 = 0 | ||||||
| 2:3/0/physics_layer_0/linear_velocity = Vector2(0, 0) | 2:3/0/physics_layer_0/linear_velocity = Vector2(0, 0) | ||||||
| 2:3/0/physics_layer_0/angular_velocity = 0.0 | 2:3/0/physics_layer_0/angular_velocity = 0.0 | ||||||
| 2:3/0/physics_layer_0/polygon_0/points = PackedVector2Array(9.5, -8.5, 9.5, -32, 32, -32, 32, -8.5) | 2:3/0/physics_layer_0/polygon_0/points = PackedVector2Array(9.5, -9, 32, -9, 32, -32, 10, -32) | ||||||
| 2:3/1 = 1 | 2:3/1 = 1 | ||||||
| 2:3/1/flip_h = true | 2:3/1/flip_h = true | ||||||
| 2:3/1/physics_layer_0/linear_velocity = Vector2(0, 0) | 2:3/1/physics_layer_0/linear_velocity = Vector2(0, 0) | ||||||
| 2:3/1/physics_layer_0/angular_velocity = 0.0 | 2:3/1/physics_layer_0/angular_velocity = 0.0 | ||||||
| 2:3/1/physics_layer_0/polygon_0/points = PackedVector2Array(-8.5, -9.5, -8.5, -32, -32, -32, -32, -9) | 2:3/1/physics_layer_0/polygon_0/points = PackedVector2Array(-8, -8.5, -8, -32, -32, -32, -32, -9) | ||||||
| 2:3/2 = 2 | 2:3/2 = 2 | ||||||
| 2:3/2/flip_h = true | 2:3/2/flip_h = true | ||||||
| 2:3/2/flip_v = true | 2:3/2/flip_v = true | ||||||
| 2:3/2/physics_layer_0/linear_velocity = Vector2(0, 0) | 2:3/2/physics_layer_0/linear_velocity = Vector2(0, 0) | ||||||
| 2:3/2/physics_layer_0/angular_velocity = 0.0 | 2:3/2/physics_layer_0/angular_velocity = 0.0 | ||||||
| 2:3/2/physics_layer_0/polygon_0/points = PackedVector2Array(-32, 9.5, -32, 32, -9.5, 32, -9, 9) | 2:3/2/physics_layer_0/polygon_0/points = PackedVector2Array(-32, 9, -32, 32, -9.5, 32, -9, 9) | ||||||
| 2:3/3 = 3 | 2:3/3 = 3 | ||||||
| 2:3/3/flip_v = true | 2:3/3/flip_v = true | ||||||
| 2:3/3/physics_layer_0/linear_velocity = Vector2(0, 0) | 2:3/3/physics_layer_0/linear_velocity = Vector2(0, 0) | ||||||
| 2:3/3/physics_layer_0/angular_velocity = 0.0 | 2:3/3/physics_layer_0/angular_velocity = 0.0 | ||||||
| 2:3/3/physics_layer_0/polygon_0/points = PackedVector2Array(32, 32, 9, 32, 8.5, 9.5, 32, 9.5) | 2:3/3/physics_layer_0/polygon_0/points = PackedVector2Array(9, 9, 9.5, 32, 32, 32, 32, 9.5) | ||||||
| 3:3/next_alternative_id = 4 | 3:3/next_alternative_id = 4 | ||||||
| 3:3/0 = 0 | 3:3/0 = 0 | ||||||
| 3:3/0/physics_layer_0/linear_velocity = Vector2(0, 0) | 3:3/0/physics_layer_0/linear_velocity = Vector2(0, 0) | ||||||
| 3:3/0/physics_layer_0/angular_velocity = 0.0 | 3:3/0/physics_layer_0/angular_velocity = 0.0 | ||||||
| 3:3/0/physics_layer_0/polygon_0/points = PackedVector2Array(-32, -8.5, -32, -32, 32, -32, 32, -9) | 3:3/0/physics_layer_0/polygon_0/points = PackedVector2Array(-32, -32, -32, -9, 32, -9.5, 32, -32) | ||||||
| 3:3/1 = 1 | 3:3/1 = 1 | ||||||
| 3:3/1/flip_v = true | 3:3/1/flip_v = true | ||||||
| 3:3/1/physics_layer_0/linear_velocity = Vector2(0, 0) | 3:3/1/physics_layer_0/linear_velocity = Vector2(0, 0) | ||||||
| 3:3/1/physics_layer_0/angular_velocity = 0.0 | 3:3/1/physics_layer_0/angular_velocity = 0.0 | ||||||
| 3:3/1/physics_layer_0/polygon_0/points = PackedVector2Array(-32, 9, 32, 9, 32, 32, -32, 32) | 3:3/1/physics_layer_0/polygon_0/points = PackedVector2Array(-32, 9, -32, 32, 32, 32, 32, 9.5) | ||||||
| 3:3/2 = 2 | 3:3/2 = 2 | ||||||
| 3:3/2/transpose = true | 3:3/2/transpose = true | ||||||
| 3:3/2/physics_layer_0/linear_velocity = Vector2(0, 0) | 3:3/2/physics_layer_0/linear_velocity = Vector2(0, 0) | ||||||
| @@ -269,33 +269,50 @@ texture_region_size = Vector2i(64, 64) | |||||||
| 3:3/3/transpose = true | 3:3/3/transpose = true | ||||||
| 3:3/3/physics_layer_0/linear_velocity = Vector2(0, 0) | 3:3/3/physics_layer_0/linear_velocity = Vector2(0, 0) | ||||||
| 3:3/3/physics_layer_0/angular_velocity = 0.0 | 3:3/3/physics_layer_0/angular_velocity = 0.0 | ||||||
| 3:3/3/physics_layer_0/polygon_0/points = PackedVector2Array(9.5, -32, 9.5, 32, 32, 32, 32, -32) | 3:3/3/physics_layer_0/polygon_0/points = PackedVector2Array(10, -32, 9.5, 32, 32, 32, 32, -32) | ||||||
| 4:3/next_alternative_id = 4 | 4:3/next_alternative_id = 4 | ||||||
| 4:3/0 = 0 | 4:3/0 = 0 | ||||||
| 4:3/0/physics_layer_0/linear_velocity = Vector2(0, 0) | 4:3/0/physics_layer_0/linear_velocity = Vector2(0, 0) | ||||||
| 4:3/0/physics_layer_0/angular_velocity = 0.0 | 4:3/0/physics_layer_0/angular_velocity = 0.0 | ||||||
| 4:3/0/physics_layer_0/polygon_0/points = PackedVector2Array(-8.5, -8.5, 32, -9.5, 32, -32, -32, -32, -32, 32, -8.5, 32) | 4:3/0/physics_layer_0/polygon_0/points = PackedVector2Array(32, -9.5, -8, -9.5, -8.5, 32, -32, 32, -32, -32, 32, -32) | ||||||
| 4:3/1 = 1 | 4:3/1 = 1 | ||||||
| 4:3/1/flip_h = true | 4:3/1/flip_h = true | ||||||
| 4:3/1/physics_layer_0/linear_velocity = Vector2(0, 0) | 4:3/1/physics_layer_0/linear_velocity = Vector2(0, 0) | ||||||
| 4:3/1/physics_layer_0/angular_velocity = 0.0 | 4:3/1/physics_layer_0/angular_velocity = 0.0 | ||||||
| 4:3/1/physics_layer_0/polygon_0/points = PackedVector2Array(9, -8.5, -32, -8.5, -32, -32, 32, -32, 32, 32, 9, 32) | 4:3/1/physics_layer_0/polygon_0/points = PackedVector2Array(-32, -32, -32, -9, 8.5, -9, 8, 32, 32, 32, 32, -32) | ||||||
| 4:3/2 = 2 | 4:3/2 = 2 | ||||||
| 4:3/2/flip_h = true | 4:3/2/flip_h = true | ||||||
| 4:3/2/flip_v = true | 4:3/2/flip_v = true | ||||||
| 4:3/2/physics_layer_0/linear_velocity = Vector2(0, 0) | 4:3/2/physics_layer_0/linear_velocity = Vector2(0, 0) | ||||||
| 4:3/2/physics_layer_0/angular_velocity = 0.0 | 4:3/2/physics_layer_0/angular_velocity = 0.0 | ||||||
| 4:3/2/physics_layer_0/polygon_0/points = PackedVector2Array(9.5, -32, 9, 8.5, -32, 8, -32, 32, 32, 32, 32, -32) | 4:3/2/physics_layer_0/polygon_0/points = PackedVector2Array(-32, 8, -32, 32, 32, 32, 32, -32, 9, -32, 9, 8) | ||||||
| 4:3/3 = 3 | 4:3/3 = 3 | ||||||
| 4:3/3/flip_v = true | 4:3/3/flip_v = true | ||||||
| 4:3/3/physics_layer_0/linear_velocity = Vector2(0, 0) | 4:3/3/physics_layer_0/linear_velocity = Vector2(0, 0) | ||||||
| 4:3/3/physics_layer_0/angular_velocity = 0.0 | 4:3/3/physics_layer_0/angular_velocity = 0.0 | ||||||
| 4:3/3/physics_layer_0/polygon_0/points = PackedVector2Array(-9, -32, -8, 9, 32, 9, 32, 32, -32, 32, -32, -32) | 4:3/3/physics_layer_0/polygon_0/points = PackedVector2Array(-32, -32, -32, 32, 32, 32, 32, 10, -9, 9, -8.5, -32) | ||||||
|  | 5:3/next_alternative_id = 4 | ||||||
| 5:3/0 = 0 | 5:3/0 = 0 | ||||||
| 5:3/0/physics_layer_0/linear_velocity = Vector2(0, 0) | 5:3/0/physics_layer_0/linear_velocity = Vector2(0, 0) | ||||||
| 5:3/0/physics_layer_0/angular_velocity = 0.0 | 5:3/0/physics_layer_0/angular_velocity = 0.0 | ||||||
| 5:3/0/physics_layer_0/polygon_0/points = PackedVector2Array(-32, -32, -32, 32, 32, 32, 32, -32) | 5:3/0/physics_layer_0/polygon_0/points = PackedVector2Array(-32, -32, -32, 32, 32, 32, 32, -32) | ||||||
| 6:3/next_alternative_id = 2 | 5:3/1 = 1 | ||||||
|  | 5:3/1/flip_v = true | ||||||
|  | 5:3/1/physics_layer_0/linear_velocity = Vector2(0, 0) | ||||||
|  | 5:3/1/physics_layer_0/angular_velocity = 0.0 | ||||||
|  | 5:3/1/physics_layer_0/polygon_0/points = PackedVector2Array(-32, -32, -32, 32, 32, 32, 32, -32) | ||||||
|  | 5:3/2 = 2 | ||||||
|  | 5:3/2/flip_h = true | ||||||
|  | 5:3/2/flip_v = true | ||||||
|  | 5:3/2/physics_layer_0/linear_velocity = Vector2(0, 0) | ||||||
|  | 5:3/2/physics_layer_0/angular_velocity = 0.0 | ||||||
|  | 5:3/2/physics_layer_0/polygon_0/points = PackedVector2Array(-32, -32, -32, 32, 32, 32, 32, -32) | ||||||
|  | 5:3/3 = 3 | ||||||
|  | 5:3/3/flip_h = true | ||||||
|  | 5:3/3/physics_layer_0/linear_velocity = Vector2(0, 0) | ||||||
|  | 5:3/3/physics_layer_0/angular_velocity = 0.0 | ||||||
|  | 5:3/3/physics_layer_0/polygon_0/points = PackedVector2Array(-32, -32, -32, 32, 32, 32, 32, -32) | ||||||
|  | 6:3/next_alternative_id = 4 | ||||||
| 6:3/0 = 0 | 6:3/0 = 0 | ||||||
| 6:3/0/physics_layer_0/linear_velocity = Vector2(0, 0) | 6:3/0/physics_layer_0/linear_velocity = Vector2(0, 0) | ||||||
| 6:3/0/physics_layer_0/angular_velocity = 0.0 | 6:3/0/physics_layer_0/angular_velocity = 0.0 | ||||||
| @@ -303,6 +320,15 @@ texture_region_size = Vector2i(64, 64) | |||||||
| 6:3/1/flip_v = true | 6:3/1/flip_v = true | ||||||
| 6:3/1/physics_layer_0/linear_velocity = Vector2(0, 0) | 6:3/1/physics_layer_0/linear_velocity = Vector2(0, 0) | ||||||
| 6:3/1/physics_layer_0/angular_velocity = 0.0 | 6:3/1/physics_layer_0/angular_velocity = 0.0 | ||||||
|  | 6:3/2 = 2 | ||||||
|  | 6:3/2/transpose = true | ||||||
|  | 6:3/2/physics_layer_0/linear_velocity = Vector2(0, 0) | ||||||
|  | 6:3/2/physics_layer_0/angular_velocity = 0.0 | ||||||
|  | 6:3/3 = 3 | ||||||
|  | 6:3/3/flip_h = true | ||||||
|  | 6:3/3/transpose = true | ||||||
|  | 6:3/3/physics_layer_0/linear_velocity = Vector2(0, 0) | ||||||
|  | 6:3/3/physics_layer_0/angular_velocity = 0.0 | ||||||
| 7:3/0 = 0 | 7:3/0 = 0 | ||||||
| 7:3/0/physics_layer_0/linear_velocity = Vector2(0, 0) | 7:3/0/physics_layer_0/linear_velocity = Vector2(0, 0) | ||||||
| 7:3/0/physics_layer_0/angular_velocity = 0.0 | 7:3/0/physics_layer_0/angular_velocity = 0.0 | ||||||
| @@ -336,9 +362,9 @@ texture_region_size = Vector2i(64, 64) | |||||||
| [resource] | [resource] | ||||||
| tile_size = Vector2i(64, 64) | tile_size = Vector2i(64, 64) | ||||||
| physics_layer_0/collision_layer = 1 | physics_layer_0/collision_layer = 1 | ||||||
| physics_layer_0/physics_material = SubResource("PhysicsMaterial_06ibd") | physics_layer_0/physics_material = SubResource("PhysicsMaterial_w88vo") | ||||||
| navigation_layer_0/layers = 1 | navigation_layer_0/layers = 1 | ||||||
| sources/1 = SubResource("TileSetAtlasSource_nfq7o") | sources/1 = SubResource("TileSetAtlasSource_4qill") | ||||||
| pattern_0 = SubResource("TileMapPattern_xl1q3") | pattern_0 = SubResource("TileMapPattern_xl1q3") | ||||||
| pattern_1 = SubResource("TileMapPattern_vdc73") | pattern_1 = SubResource("TileMapPattern_vdc73") | ||||||
| pattern_2 = SubResource("TileMapPattern_pir2t") | pattern_2 = SubResource("TileMapPattern_pir2t") | ||||||
|   | |||||||
		Reference in New Issue
	
	Block a user