Merging
Update
Merge branch 'postRelease' of https://github.com/Kranchy/Looter into Anim

Conflicts:
	Project/Assets/mapTiled/map10.tmx.meta
	Project/Assets/mapTiled/map9.tmx.meta
	Project/Library/CurrentLayout.dwlt
	Project/Library/ScriptAssemblies/Assembly-CSharp-Editor.dll
	Project/Library/ScriptAssemblies/Assembly-CSharp-Editor.dll.mdb
	Project/Library/ScriptAssemblies/Assembly-CSharp.dll
	Project/Library/ScriptAssemblies/Assembly-CSharp.dll.mdb
	Project/Library/ScriptMapper
	Project/Library/assetDatabase3
	Project/Library/expandedItems
	Project/Library/guidmapper
	Project/Project-csharp.sln
	Project/Project.sln
Merging
Hand-made postRelease merge
Sounds and prefabs.

Merge branch 'postRelease' of https://github.com/Kranchy/Looter into Anim

Conflicts:
	Project/Assets/Scenes/MainScene.unity
	Project/Assets/Sprite/Animationposebombe/Animationposebombedroite/Pose0.png.meta
	Project/Assets/Sprite/Animationposebombe/Animationposebombedroite/Pose1.png.meta
	Project/Assets/Sprite/Animationposebombe/Animationposebombedroite/Pose2.png.meta
	Project/Assets/Sprite/Animationposebombe/Animationposebombedroite/Pose3.png.meta
	Project/Assets/Sprite/Animationposebombe/Animationposebombedroite/Pose4.png.meta
	Project/Assets/Sprite/Animationposebombe/Animationposedebombegauche/pose0.png.meta
	Project/Assets/Sprite/Animationposebombe/Animationposedebombegauche/pose1.png.meta
	Project/Assets/Sprite/Animationposebombe/Animationposedebombegauche/pose2.png.meta
	Project/Assets/Sprite/Animationposebombe/Animationposedebombegauche/pose3.png.meta
	Project/Assets/Sprite/Animationposebombe/Animationposedebombegauche/pose4.png.meta
	Project/Assets/Tiled2Unity/Prefabs/map10.prefab.meta
	Project/Assets/Tiled2Unity/Prefabs/map9.prefab.meta
	Project/Assets/mapTiled/sas.tmx.meta
	Project/Assets/mapTiled/tileSets/Taxe SAS.png.meta
	Project/Library/CurrentLayout.dwlt
	Project/Library/InspectorExpandedItems.asset
	Project/Library/ScriptAssemblies/Assembly-CSharp-Editor.dll
	Project/Library/ScriptAssemblies/Assembly-CSharp-Editor.dll.mdb
	Project/Library/ScriptAssemblies/Assembly-CSharp.dll
	Project/Library/ScriptAssemblies/Assembly-CSharp.dll.mdb
	Project/Library/assetDatabase3
	Project/Library/expandedItems
	Project/Library/guidmapper
	Project/Library/metadata/00/00092793cc3952042a21ccc100bacfba
	Project/Library/metadata/00/00e8ad033462d454983afcda353e5d98
	Project/Library/metadata/00/00fbf055d30d24e419406d96d1a20abe
	Project/Library/metadata/05/057dce51de2108341869903427efec38
	Project/Library/metadata/11/11e991bedcf8540428a95c3dbb95f026
	Project/Library/metadata/42/42495a29214c4ce4dad14d320a63b204
	Project/Library/metadata/61/61ce43efc40617a4f9bfd159f6f979bd
	Project/Library/metadata/6c/6cc706deaa23e43458fe888fee64a9fa
	Project/Library/metadata/9c/9c6ef08519ee72a49b8fbb3a7653f153
	Project/Library/metadata/a3/a3ccb9a800c93e04fb04a869af3b6710
	Project/Library/metadata/ab/ab636176a39e9a9459120e3596885133
	Project/Library/metadata/b5/b5555d3566b4ee647bb4a29a09ed360c
	Project/Library/metadata/b7/b72b490e6860fd04199e969a9bf3c145
	Project/Library/metadata/c1/c1cad1c6d07098c4eb81aa6e111bdfba
	Project/Library/metadata/c2/c2ca50d6297abea409076d93fe8b6500
	Project/Library/metadata/ea/ea9c2f5fb066c264d8eff4283e67138c
	Project/Library/metadata/ea/ead9c23d12bb4de4ba9328d3c3320ecd
	Project/Library/metadata/eb/eba0913da6cb7cd4c98bbdb9861d3c8e
	Project/Library/metadata/fb/fb34392bdde58db49beca05a66738793
	Project/Project-csharp.sln
	Project/Project.sln
Merging
Merge branch 'Anim' of https://github.com/Kranchy/Looter into postRelease

Conflicts:
	Project/Assets/Scenes/MainScene.unity
	Project/Assets/Tiled2Unity/Prefabs/map10.prefab.meta
	Project/Assets/Tiled2Unity/Prefabs/map9.prefab.meta
	Project/Assets/Tiled2Unity/Textures/Taxe SAS.png.meta
	Project/Assets/mapTiled/map10.tmx.meta
	Project/Assets/mapTiled/map9.tmx.meta
	Project/Assets/mapTiled/sas.tmx.meta
	Project/Library/CurrentLayout.dwlt
	Project/Library/InspectorExpandedItems.asset
	Project/Library/ScriptAssemblies/Assembly-CSharp-Editor.dll
	Project/Library/ScriptAssemblies/Assembly-CSharp-Editor.dll.mdb
	Project/Library/ScriptAssemblies/Assembly-CSharp.dll
	Project/Library/ScriptAssemblies/Assembly-CSharp.dll.mdb
	Project/Library/assetDatabase3
	Project/Library/expandedItems
	Project/Library/guidmapper
	Project/Library/metadata/05/057dce51de2108341869903427efec38
	Project/Library/metadata/0e/0e3d65bd6a114ed429d6b59b334a73ed
	Project/Library/metadata/11/11d4706a9dd78674c96a3483af3b900e
	Project/Library/metadata/1b/1b7c350a2683e994fadb46c68ddd4c7b
	Project/Library/metadata/1c/1cc6622a6ffb65747944efc13874db80
	Project/Library/metadata/25/2546ea94beb82c0499d96b51e78de2a7
	Project/Library/metadata/25/25802a6db6bcf6947bbcfde28414f0e3
	Project/Library/metadata/26/268ae8b9f7fb1134b868f8b73e9c620d
	Project/Library/metadata/3c/3cbb9a14215cb614db53c11e8633c0cb
	Project/Library/metadata/40/404405bfc55b9024a8b79a5aa8438b9d
	Project/Library/metadata/43/4321a2cbd4925144198e7fd70d1d698f
	Project/Library/metadata/4d/4d30f9a83357a774a9d721da91bc4410
	Project/Library/metadata/4d/4db9fb8058d36ca42aa40bddabfc3035
	Project/Library/metadata/6c/6cc706deaa23e43458fe888fee64a9fa
	Project/Library/metadata/6f/6f40b6d3b17124b48be597d1f08b9e48
	Project/Library/metadata/79/790236304d0c60f4d8d5cf2697efee5a
	Project/Library/metadata/7b/7b3be5e2f8b4c5245a4eb75ac9b9299f
	Project/Library/metadata/7d/7d62b065f0d09604f899dcb024d26aa8
	Project/Library/metadata/a3/a3ccb9a800c93e04fb04a869af3b6710
	Project/Library/metadata/bb/bb2c077b34e72494486aec00553ce90e
	Project/Library/metadata/c5/c543c6faf2e6faa4b934abac20c76def
	Project/Library/metadata/c9/c97756ffff0cd314a92d860051f739c1
	Project/Library/metadata/cb/cb2655487641895468024d7710055690
	Project/Library/metadata/d9/d993a5fe764f5e847a90e20ef2477b62
	Project/Library/metadata/e6/e603123e464acd8428da8fa8de60502a
	Project/Library/metadata/eb/eba0913da6cb7cd4c98bbdb9861d3c8e
	Project/Library/metadata/f3/f3186cf7328314f4f81dfcfe48310721
	Project/Library/metadata/fa/fa39dcc316925354582513c14a70dd6e
	Project/Library/metadata/fa/fa787b5ab3afe9a46b00c5b935574418
	Project/Library/metadata/fb/fb34392bdde58db49beca05a66738793
	Project/Project-csharp.sln
	Project/Project.sln
Fix collision destructibles