Modif texture soleil
Merge branch 'master' of github.com:xabufr/meteor-falls

Conflicts:
	build/CEGUI.log
	build/Ogre.log
	meteor-falls-src/meteor-falls-src.depend
	meteor-falls-src/src/Engine/GameEngine/GameEngine.cpp
	meteor-falls-src/src/main.cpp
ADD NINJA
Merge branch 'master' of github.com:xabufr/meteor-falls

Conflicts:
	build/CEGUI.log
	build/Ogre.log
	meteor-falls-src/meteor-falls-src.depend
	meteor-falls-src/src/Engine/GameEngine/Map.cpp
	meteor-falls-src/src/State/Menu/MenuState.cpp
Merge branch 'master' of github.com:xabufr/meteor-falls
Merge branch 'master' of github.com:xabufr/meteor-falls

Conflicts:
	meteor-falls-src/src/Engine/GameEngine/Map/Map.h
	meteor-falls-src/src/main.cpp
Merge branch 'master' of github.com:xabufr/meteor-falls

Conflicts:
	GlobalServer/GlobalServer.layout
	GlobalServerAdmin/GlobalServerAdmin.layout
	meteor-falls-src/meteor-falls-src.cbp
	meteor-falls-src/src/Engine/GameEngine/Map/Map.cpp
Construction de la classe batiment
Creation des vectors
bla
sqd
Merge branch 'master' of github.com:xabufr/meteor-falls

Conflicts:
	CommunityHydrax-master/lib/Release/libhydrax.so.0.5.3
	GlobalServer/GlobalServer.layout
	SkyX/CMakeCache.txt
	SkyX/CMakeFiles/CMakeDirectoryInformation.cmake
	SkyX/CMakeFiles/Makefile.cmake
	SkyX/CMakeFiles/Makefile2
	SkyX/CMakeFiles/SkyX.dir/CXX.includecache
	SkyX/CMakeFiles/SkyX.dir/DependInfo.cmake
	SkyX/CMakeFiles/SkyX.dir/build.make
	SkyX/CMakeFiles/SkyX.dir/cmake_clean.cmake
	SkyX/CMakeFiles/SkyX.dir/depend.internal
	SkyX/CMakeFiles/SkyX.dir/flags.make
	SkyX/CMakeFiles/SkyX.dir/link.txt
	SkyX/CMakeFiles/TargetDirectories.txt
	SkyX/Makefile
	SkyX/cmake_install.cmake
	SkyX/install_manifest.txt
	meteor-falls-src/meteor-falls-src.cbp
	meteor-falls-src/src/Engine/GameEngine/Factions/Equipe.cpp
	meteor-falls-src/src/Engine/GameEngine/Factions/Equipe.h
	meteor-falls-src/src/Engine/GameEngine/Map/Map.cpp
Merge branch 'master' of github.com:xabufr/meteor-falls

Conflicts:
	meteor-falls-src/src/Engine/GraphicEngine/Ogre/OgreWindowInputManager.cpp