Integrations Objets + interactions + detructions + animations + perte vies + particules
Merge branch 'master' of https://github.com/BabacarPlusPlus/TER-2014

Conflicts:
	Assembly-CSharp-Editor-vs.csproj
	Assembly-CSharp-Editor.csproj
	Assembly-CSharp-firstpass-vs.csproj
	Assembly-CSharp-firstpass.csproj
	Assembly-CSharp-vs.csproj
	Assembly-CSharp.csproj
	Assembly-UnityScript-firstpass-vs.unityproj
	Assembly-UnityScript-firstpass.unityproj
	Assembly-UnityScript-vs.unityproj
	Assembly-UnityScript.unityproj
	Assets/Bots.meta
	Assets/Bots/Ennemis 1.meta
	Assets/Scene/Jeu.unity
	Library/CurrentLayout.dwlt
	Library/InspectorExpandedItems.asset
	Library/ScriptAssemblies/Assembly-CSharp-Editor.dll
	Library/ScriptAssemblies/Assembly-CSharp-Editor.dll.mdb
	Library/ScriptAssemblies/Assembly-CSharp.dll
	Library/ScriptAssemblies/Assembly-CSharp.dll.mdb
	Library/assetDatabase3
	Library/expandedItems
	Library/guidmapper
	Library/metadata/03/035b2e5f427eac146b62ce9fb489c1fb
	Library/metadata/05/051449f345f143c45a4b80e864a4e1e3
	Library/metadata/08/08461cca86b9048138255f6c5953ebe7
	Library/metadata/0a/0ac951d11b2c14744bc1fd599000fa75
	Library/metadata/0f/0f3582081e9c049efb5151c7112b8531
	Library/metadata/14/1403d3ec36747924795437dea48e3713
	Library/metadata/15/15458d8fb11d44015bd27a5f0ce5c996
	Library/metadata/15/15c802e9ee9b047999773f62d95ebf5a
	Library/metadata/23/236d8614978b4404e88884b70bbbcc4b
	Library/metadata/26/26bda7d3eb9d548889125900a39f3dcf
	Library/metadata/2a/2aa811473b25f534e8373a9dd2bf56f6
	Library/metadata/36/36c2f146878c64b9c9447d49c1fb6a6e
	Library/metadata/39/39c7d532982f34c72834b95194b6125e
	Library/metadata/3b/3b291a3f2d1b07141a0ccc031bf0fb34
	Library/metadata/40/4073a5312503fda4e99df9c93c91e3be
	Library/metadata/43/43207a9eb8ee14812a4d893de4932413
	Library/metadata/45/45b0f0cd0261747ba8acc563be9806fc
	Library/metadata/4e/4e9ed547b0086492f9518bf28ceba2e8
	Library/metadata/54/543b2d17b73ac374bba5fecf93d953d2
	Library/metadata/58/586d66ce82e5a40a5bc93efd06cdf190
	Library/metadata/5f/5f62c1ebb1f08471781bc0c6a9515f02
	Library/metadata/6a/6a7a4f512234c4c5299145191d2302f6
	Library/metadata/6b/6b8aa179bd85148478d607650511332e
	Library/metadata/6d/6d12ee12ac1e8477a97ba34e20414063
	Library/metadata/6e/6ee739aec81944ee2a875dfc6fee98d0
	Library/metadata/6f/6f292452d76d74b4495877ba709263c9
	Library/metadata/77/77a3166c5f61b4d1686fa63dfb37498f
	Library/metadata/7e/7ec8f0a4dd4bc4cd2987c415ce705c65
	Library/metadata/7f/7f7850f24249e4056b2189de03ae584c
	Library/metadata/80/803b23ba464be41a9a5253e9af8baae7
	Library/metadata/82/820c5ed819b004f2a8779686ef343597
	Library/metadata/84/844224bddc68c4bc8a005a7a5e57bcc3
	Library/metadata/8c/8c34f961081107947b7d127050aae29a
	Library/metadata/8d/8d488452d7902495fbd9ea00ac7571fa
	Library/metadata/90/907ed66748665ff4695d96decccba7a4
	Library/metadata/92/92be144c7c85afc43bd1b3bdd0f61c7d
	Library/metadata/a4/a4c0d0fb0c102fa4abc523a9f5b5abc5
	Library/metadata/a7/a73cdb881d6184650bf7e385243c3cb0
	Library/metadata/a8/a8a80e9eb6cecb84ba1f9f9759c8f68a
	Library/metadata/b0/b014759a274e0f747aab7e617699a845
	Library/metadata/b1/b1cd9326c0d624e97aadff765a5814ea
	Library/metadata/b3/b3b1814c274dfa94eb05ee246c4238b2
	Library/metadata/b8/b8d4c9db09b80443eb1c90a1749f6ca8
	Library/metadata/b8/b8dc8dfbda461784484f7c3e64d8f5d4
	Library/metadata/bf/bf3437cfb53b844018053c6a4f0030ac
	Library/metadata/c1/c17690e241536e448999c3622786b5cd
	Library/metadata/c1/c1cc516d4f59448389cebbfccbe3ac1d
	Library/metadata/ce/ce2b20a3884f84fca85c44ce10becc4b
	Library/metadata/d0/d01cef0a7c3d1437186928afcd437643
	Library/metadata/d7/d7a33fbcb6fe27a47b6bbf2550764d6f
	Library/metadata/dc/dc2f9a87404f14e4ba86f69bdc6caf94
	Library/metadata/dd/ddc2b0b8662fa4d938c30cfc44474e80
	Library/metadata/de/de7a0c1b0cbd94ed18937bceeb4e13fc
	Library/metadata/e1/e18036367562749d1bfb829c441e91fa
	Library/metadata/e3/e3397e3ab7f255547bcbbe0cd9653c3e
	Library/metadata/e4/e42d8dc57892a4dfb9caf4d4331aefdb
	Library/metadata/e7/e710770601f599744ae37c1267596aa5
	Library/metadata/eb/eb486695a59db44a1810f7be739ea9a9
	Library/metadata/ed/ed35a5b51667f47e8a2b894960c0937a
	Library/metadata/f5/f5efc50cdda10427aab89bfe7371ec40
	Library/metadata/fa/fa45867b7ef8ac74f99c4a81d24749d9
	TER-2014-csharp.sln
	TER-2014.sln