dégat joueur ajouter
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/Prefabs/baseA.prefab
	Assets/Prefabs/baseB.prefab
	Assets/Prefabs/rocket.prefab
	Assets/Prefabs/rocketJoueur.prefab
	Assets/Scene/Jeu.unity
	Library/CurrentLayout.dwlt
	Library/CurrentMaximizeLayout.dwlt
	Library/ScriptAssemblies/Assembly-CSharp-Editor.dll
	Library/ScriptAssemblies/Assembly-CSharp-Editor.dll.mdb
	Library/ScriptAssemblies/Assembly-CSharp-firstpass.dll
	Library/ScriptAssemblies/Assembly-CSharp-firstpass.dll.mdb
	Library/ScriptAssemblies/Assembly-CSharp.dll
	Library/ScriptAssemblies/Assembly-CSharp.dll.mdb
	Library/ScriptAssemblies/Assembly-UnityScript-firstpass.dll
	Library/ScriptAssemblies/Assembly-UnityScript-firstpass.dll.mdb
	Library/ScriptAssemblies/Assembly-UnityScript.dll
	Library/ScriptAssemblies/Assembly-UnityScript.dll.mdb
	Library/assetDatabase3
	Library/guidmapper
	Library/metadata/c5/c5b1f5e3e689774458a9508ccf01f818
	Library/metadata/c7/c7de5b9bbf95df24185e1807e650463c
	Library/metadata/e0/e0d50200fa4b1c04faaf5bc8712a5b90
	Library/metadata/e7/e7e5e6944974d5d429bbe879e6da2089
	ProjectSettings/EditorBuildSettings.asset
	ProjectSettings/Physics2DSettings.asset
	TER-2014-csharp.sln
	TER-2014.sln
	TER-2014.userprefs