Consultation
Merge remote-tracking branch 'origin/Brandon' into Brandon

Conflicts:
	SimWormsProject/SimWorms.sdf
	SimWormsProject/SimWorms.v12.suo
	SimWormsProject/SimWorms/Debug/AnimatedSprite.obj
	SimWormsProject/SimWorms/Debug/AssetsManager.obj
	SimWormsProject/SimWorms/Debug/Clock.obj
	SimWormsProject/SimWorms/Debug/Color.obj
	SimWormsProject/SimWorms/Debug/Keyboard.obj
	SimWormsProject/SimWorms/Debug/Mouse.obj
	SimWormsProject/SimWorms/Debug/SimWorms.log
	SimWormsProject/SimWorms/Debug/SimWorms.tlog/CL.read.1.tlog
	SimWormsProject/SimWorms/Debug/Sprite.obj
	SimWormsProject/SimWorms/Debug/StaticSprite.obj
	SimWormsProject/SimWorms/Debug/StaticText.obj
	SimWormsProject/SimWorms/Debug/Terrain.obj
	SimWormsProject/SimWorms/Debug/Text.obj
	SimWormsProject/SimWorms/Debug/Texture.obj
	SimWormsProject/SimWorms/Debug/Transformable.obj
	SimWormsProject/SimWorms/Debug/View.obj
	SimWormsProject/SimWorms/Debug/Window.obj
	SimWormsProject/SimWorms/Debug/main.obj
	SimWormsProject/SimWorms/Debug/vc120.idb
	SimWormsProject/SimWorms/Debug/vc120.pdb
Bug fix + commencement de l'ajout des maps et des options.
Hmm
Merge remote-tracking branch 'origin/Brandon' into Brandon

Conflicts:
	SimWormsProject/SimWorms.sdf
	SimWormsProject/SimWorms.v12.suo
	SimWormsProject/SimWorms/Maps/country/map.png
	SimWormsProject/SimWorms/OOSDL/Mouse.cpp
	SimWormsProject/SimWorms/OOSDL/View.cpp
	SimWormsProject/SimWorms/OOSDL/View.h
	SimWormsProject/SimWorms/OOSDL/Window.cpp
	SimWormsProject/SimWorms/OOSDL/Window.h
	SimWormsProject/SimWorms/SimWorms.vcxproj
	SimWormsProject/SimWorms/SimWorms.vcxproj.filters
	SimWormsProject/SimWorms/Terrain.cpp
	SimWormsProject/SimWorms/Terrain.h
	SimWormsProject/SimWorms/main.cpp
Mise à jour
ok
Amélioration des physiques

Le personnage peut maintenant marcher des deux côté, reste qu'à vérifier
les collisions avec le plafond
Journal
Modification mineure des contrôle
Merge branch 'Stuff' of https://github.com/SirKhepre/SimWorms into Brandon

Conflicts:
	SimWormsProject/Debug/Maps/desert/Thumbs.db
	SimWormsProject/SimWorms.sdf
	SimWormsProject/SimWorms.v12.suo
	SimWormsProject/SimWorms/SimWorms.vcxproj.filters
	SimWormsProject/SimWorms/main.cpp
	SimWormsProject/SimWorms/maps/country/Thumbs.db
	SimWormsProject/debug/maps/country/Thumbs.db
Ménage dans les fichiers.
Ménage dans les fichiers
Merge branch 'Stuff' of https://github.com/SirKhepre/SimWorms into Nicolas
Presque fini!, petit réglage à faire, mais ça risque d'être tout.
Supression des exécutables
Finalisation du checkCollision
Correctif dans le terrain et les commandes d'entrée
Modif des déplacement
Pull