Avancée dans la phase de planification (choix des actions, apparition des cases selectionnables pour 'move' et 'pass' et enregistrement de celles ci dans un array)
Ajout de le scène bien paramétrée
Planification casi finie alpha
simulation + animation
Merge remote-tracking branch 'origin/Mathieu' into Fred

Conflicts:
	StratBrawl_source/Assets/Scenes/game_test.unity
	StratBrawl_source/Library/CurrentLayout.dwlt
	StratBrawl_source/Library/InspectorExpandedItems.asset
	StratBrawl_source/Library/ScriptAssemblies/Assembly-CSharp-Editor.dll.mdb
	StratBrawl_source/Library/ScriptAssemblies/Assembly-CSharp.dll
	StratBrawl_source/Library/ScriptAssemblies/Assembly-CSharp.dll.mdb
	StratBrawl_source/Library/assetDatabase3
	StratBrawl_source/Library/expandedItems
	StratBrawl_source/Library/guidmapper
	StratBrawl_source/Library/metadata/18/18410fe1155676842b60a2ec5c6f57a3
	StratBrawl_source/Library/metadata/40/40b8058d7ba615141baabd9ee79e4282
	StratBrawl_source/Library/metadata/8f/8fc654023162a974eb4e44aa5a01a372
	StratBrawl_source/Library/metadata/93/93a6dd24433069741b633676deebd3f5
	StratBrawl_source/Library/metadata/96/967550735ec0f84419d49669941fe4af
	StratBrawl_source/Library/metadata/9a/9a1fc767a03f79a4a8c7a6228c6b09e4
	StratBrawl_source/Library/metadata/d7/d75baa2d875677a4ba29ed96011ce3c2
	StratBrawl_source/Library/metadata/f2/f25aa5b10a284d54a8e946bb92b84950
	StratBrawl_source/StratBrawl_source-csharp.sln
	StratBrawl_source/StratBrawl_source.sln
	StratBrawl_source/StratBrawl_source.userprefs
Merge remote-tracking branch 'origin/Mathieu' into Fred

Conflicts:
	StratBrawl_source/Assets/Scripts/SC_structs.cs
Actions fonctionnent mieux (move, suppression d'une action), tackle visuel encore a améliorer
correct simulation and animation
Merge branch 'Fred'

Conflicts:
	StratBrawl_source/Library/CurrentLayout.dwlt
	StratBrawl_source/Library/ScriptAssemblies/Assembly-CSharp-Editor.dll.mdb
	StratBrawl_source/Library/ScriptAssemblies/Assembly-CSharp.dll
	StratBrawl_source/Library/ScriptAssemblies/Assembly-CSharp.dll.mdb
	StratBrawl_source/Library/assetDatabase3
	StratBrawl_source/Library/expandedItems
	StratBrawl_source/Library/metadata/49/49f3a6f77176f334f9c12822f839e494
	StratBrawl_source/Library/metadata/8f/8fc654023162a974eb4e44aa5a01a372
	StratBrawl_source/Library/metadata/93/93a6dd24433069741b633676deebd3f5
	StratBrawl_source/Library/metadata/9a/9a1fc767a03f79a4a8c7a6228c6b09e4
	StratBrawl_source/Library/metadata/bd/bd6d0bd942da50c45b12dea2b6128ca8
	StratBrawl_source/StratBrawl_source.userprefs
Merge remote-tracking branch 'origin/Maxime'

Conflicts:
	StratBrawl_source/Assembly-CSharp-Editor-vs.csproj
	StratBrawl_source/Assembly-CSharp-Editor.csproj
	StratBrawl_source/Assembly-CSharp-vs.csproj
	StratBrawl_source/Assembly-CSharp.csproj
	StratBrawl_source/Library/CurrentLayout.dwlt
	StratBrawl_source/Library/EditorUserBuildSettings.asset
	StratBrawl_source/Library/ScriptAssemblies/Assembly-CSharp-Editor.dll.mdb
	StratBrawl_source/Library/ScriptAssemblies/Assembly-CSharp.dll
	StratBrawl_source/Library/ScriptAssemblies/Assembly-CSharp.dll.mdb
	StratBrawl_source/Library/assetDatabase3
	StratBrawl_source/Library/expandedItems
	StratBrawl_source/Library/guidmapper
	StratBrawl_source/Library/metadata/0c/0c3f1ad6a8e8ae94e94b073ef3a0dbfe
	StratBrawl_source/Library/metadata/80/80a3616ca19596e4da0f10f14d241e9f
	StratBrawl_source/Library/metadata/a1/a123235d816dcf642ba013b73eb51345
	StratBrawl_source/Library/metadata/f5/f5f67c52d1564df4a8936ccd202a3bd8
	StratBrawl_source/ProjectSettings/EditorBuildSettings.asset
	StratBrawl_source/StratBrawl_source-csharp.sln
	StratBrawl_source/StratBrawl_source.sln
	StratBrawl_source/StratBrawl_source.userprefs