initial commit
first commit
Merge branch 'master' of github.com:legionth/Survival
	modified:   Game.cpp
	modified:   Tile.cpp
	modified:   Tile.h
	modified:   GameObject.cpp
	modified:   GameObject.h
	modified:   LivingObject.h
	modified:   TileMap.cpp
	modified:   TileMap.h
	modified:   Game.cpp
	modified:   Game.h
	modified:   GameObject.cpp
	modified:   LivingObject.h
	modified:   Tile.h
	modified:   TileMap.cpp
	modified:   TileMap.h
	modified:   World.cpp
	modified:   World.h
	new file:   map1.map
	modified:   Game.cpp
	modified:   GameObject.cpp
	modified:   World.cpp
	new file:   player.png
	modified:   Game.cpp
	modified:   Game.h
	modified:   GameObject.cpp
	modified:   GameObject.h
	modified:   LivingObject.cpp
	modified:   LivingObject.h
	modified:   Player.cpp
	modified:   Player.h
	modified:   Tile.cpp
	modified:   Tile.h
	modified:   TileMap.cpp
	modified:   TileMap.h
	modified:   World.cpp
	modified:   World.h
	new file:   land.png
	new file:   map0_0.map
	modified:   player.png
	modified:   Game.cpp
	modified:   GameObject.cpp
	modified:   GameObject.h
	modified:   LivingObject.cpp
	modified:   World.cpp
	modified:   land.png
	modified:   Game.cpp
	modified:   Game.h
	modified:   GameObject.cpp
	modified:   GameObject.h
	modified:   LivingObject.cpp
	new file:   consts.h
	modified:   Game.cpp
	modified:   GameObject.cpp
	modified:   LivingObject.cpp
	modified:   LivingObject.h
	modified:   World.cpp
	new file:   map0_1.map
	new file:   map0_2.map
	new file:   map0_3.map
	new file:   map0_4.map
	new file:   map1_0.map
	new file:   map1_1.map
	new file:   map1_2.map
	new file:   map1_3.map
	new file:   map1_4.map
	new file:   map2_0.map
	modified:   Game.cpp
	modified:   Game.h
	modified:   GameObject.cpp
	modified:   LivingObject.cpp
	modified:   LivingObject.h
	modified:   Player.cpp
	modified:   Player.h
	new file:   Ressource.cpp
	new file:   Ressource.h
	modified:   Tile.cpp
	modified:   Tile.h
	modified:   TileMap.cpp
	modified:   World.cpp
	modified:   consts.h
	new file:   map2_1.map
	new file:   map2_2.map
	new file:   map2_3.map
	new file:   map2_4.map
	new file:   map3_0.map
	new file:   map3_1.map
	new file:   map3_2.map
	new file:   map3_3.map
	new file:   map3_4.map
	new file:   map4_0.map
	new file:   map4_1.map
	new file:   map4_2.map
	new file:   map4_3.map
	modified:   player.png
	new file:   ressources.png
	new file:   Enemy.cpp
	new file:   Enemy.h
	modified:   consts.h
	new file:   Building.cpp
	new file:   Building.h
	new file:   BuildingButton.cpp
	new file:   BuildingButton.h
	new file:   Button.cpp
	new file:   Button.h
	modified:   Enemy.cpp
	modified:   Game.h
	modified:   LivingObject.h
	new file:   Menu.cpp
	new file:   Menu.h
	modified:   consts.h
	modified:   Game.cpp
	modified:   Game.h
	modified:   Building.cpp
	modified:   Building.h
	modified:   BuildingButton.cpp
	modified:   BuildingButton.h
	modified:   Button.cpp
	modified:   Button.h
	modified:   Game.cpp
	modified:   GameObject.cpp
	modified:   Menu.cpp
	modified:   Menu.h
	new file:   buildings.png
	new file:   button_building.png
	modified:   consts.h
	new file:   menu_building.png
	modified:   Building.cpp
	modified:   Building.h
	modified:   BuildingButton.cpp
	modified:   BuildingButton.h
	new file:   BuildingMenu.cpp
	new file:   BuildingMenu.h
	modified:   Button.cpp
	modified:   Game.cpp
	modified:   Game.h
	modified:   LivingObject.cpp
	modified:   Menu.cpp
	modified:   Tile.cpp
	modified:   Tile.h
	modified:   TileMap.cpp
	modified:   button_building.png
	modified:   consts.h
	modified:   main.cpp
	modified:   menu_building.png
Merge branch 'master' of https://github.com/legionth/Survival

Conflicts:
item menu