walk function complete
Merge branch 'master' of https://github.com/legionth/Survival

Conflicts:
item menu
cear config files netbeans
add netbeans files to ignore list
	modified:   Building.cpp
	modified:   BuildingButton.cpp
	modified:   Enemy.cpp
	modified:   Enemy.h
	modified:   Game.cpp
	modified:   GameObject.cpp
	modified:   ItemButton.cpp
	modified:   ItemButton.h
	modified:   ItemMenu.cpp
	modified:   ItemMenu.h
	modified:   LivingObject.cpp
	modified:   Player.cpp
	modified:   Player.h
	modified:   Ressource.cpp
	modified:   Tile.cpp
	new file:   build/Debug/GNU-Linux-x86/Building.o.d
	new file:   build/Debug/GNU-Linux-x86/BuildingButton.o.d
	new file:   build/Debug/GNU-Linux-x86/BuildingMenu.o.d
	new file:   build/Debug/GNU-Linux-x86/Button.o.d
	new file:   build/Debug/GNU-Linux-x86/Enemy.o.d
	new file:   build/Debug/GNU-Linux-x86/Game.o.d
	new file:   build/Debug/GNU-Linux-x86/GameObject.o.d
	new file:   build/Debug/GNU-Linux-x86/ItemButton.o.d
	new file:   build/Debug/GNU-Linux-x86/ItemMenu.o.d
	new file:   build/Debug/GNU-Linux-x86/LivingObject.o.d
	new file:   build/Debug/GNU-Linux-x86/Menu.o.d
	new file:   build/Debug/GNU-Linux-x86/Player.o.d
	new file:   build/Debug/GNU-Linux-x86/Ressource.o.d
	new file:   build/Debug/GNU-Linux-x86/Tile.o.d
	new file:   build/Debug/GNU-Linux-x86/TileMap.o.d
	new file:   build/Debug/GNU-Linux-x86/World.o.d
	new file:   build/Debug/GNU-Linux-x86/main.o.d
	modified:   buildings.png
	modified:   button_item.png
	modified:   consts.h
	new file:   dist/Debug/GNU-Linux-x86/legionth-survival-c0396a1
	new file:   dist/Debug/GNU-Linux-x86/legionth-survival-normal
	new file:   enemy_pig.png
	new file:   nbproject/Makefile-Debug.mk
	new file:   nbproject/Makefile-Release.mk
	modified:   nbproject/Makefile-impl.mk
	modified:   nbproject/Makefile-variables.mk
	new file:   nbproject/Package-Debug.bash
	new file:   nbproject/Package-Release.bash
	modified:   nbproject/configurations.xml
	modified:   nbproject/private/Makefile-variables.mk
	modified:   nbproject/private/configurations.xml
	modified:   nbproject/project.xml
	modified:   player.png
	modified:   ressources.png
Merge branch 'master' of https://github.com/legionth/Survival

Conflicts:
	nbproject/Makefile-impl.mk
	nbproject/configurations.xml
	nbproject/private/configurations.xml

	modified:   .gitignore
	modified:   Enemy.cpp
	modified:   Enemy.h
	modified:   Game.cpp
	modified:   Game.h
	modified:   LivingObject.cpp
	modified:   LivingObject.h
	modified:   TileMap.cpp
	modified:   TileMap.h
	modified:   consts.h
	modified:   enemy_pig.png
	modified:   nbproject/Makefile-impl.mk
	modified:   nbproject/configurations.xml
	modified:   nbproject/private/configurations.xml
	modified:   Game.cpp
	modified:   LivingObject.cpp
	modified:   LivingObject.h
	modified:   consts.h
	modified:   Game.cpp
	modified:   GameObject.cpp
	modified:   LivingObject.cpp
	modified:   LivingObject.h
	modified:   Enemy.cpp
	modified:   Game.cpp
	modified:   Game.h
	modified:   GameObject.cpp
	modified:   LivingObject.cpp
	modified:   LivingObject.h
	new file:   StatusButton.cpp
	new file:   StatusButton.h
	new file:   StatusMenu.cpp
	new file:   StatusMenu.h
	new file:   button_status.png
	modified:   consts.h
	modified:   enemy_pig.png
	new file:   menu_status.png
	modified:   player.png
	modified:   Enemy.cpp
	modified:   Enemy.h
	modified:   Game.cpp
	new file:   Inventory.cpp
	new file:   Inventory.h
	modified:   LivingObject.cpp
	modified:   LivingObject.h
	modified:   StatusButton.cpp
	modified:   StatusMenu.cpp
	modified:   StatusMenu.h
	modified:   consts.h
	new file:   Dropable.cpp
	new file:   Dropable.h
	modified:   Enemy.cpp
	modified:   Enemy.h
	modified:   Game.cpp
	modified:   LivingObject.cpp
	modified:   LivingObject.h
	modified:   Tile.cpp
	modified:   Tile.h
	modified:   Tile.h
Inventory init and ItemMenu edit