creating an energy a room
Refactoring createDoor in room
Merge branch 'master' into energy
adding energy in the EnergyRoom

modified:   src/environment/room/EnergyRoom.java
Merge branch 'master' of https://github.com/Mathgoat/square-loot
Fix laser door bug
Merge animation-->master
merge again
Merge branch 'master' of https://github.com/Mathgoat/square-loot.git

Conflicts:
	src/environment/room/OxygenRoom.java
	src/environment/room/Room.java
Merge branch 'master' of https://github.com/Mathgoat/square-loot
item drawing fix
first step toward items physical handling

modified:   src/entity/DynamicEntity.java
modified:   src/entity/player/Player.java
modified:   src/entity/projectile/Projectile.java
modified:   src/environment/blocks/DoorBlock.java
modified:   src/environment/blocks/PhysicalBlock.java
modified:   src/item/Item.java
renamed:    src/physics/bodyType.java -> src/physics/GameBodyType.java
modified:   src/physics/PhysicsDataStructure.java
Merge branch 'master' into items
non functionning energy collision

modified:   src/entity/player/Player.java
modified:   src/environment/room/EnergyRoom.java
modified:   src/item/Energy.java
modified:   src/item/Item.java
modified:   src/item/ItemManager.java
modified:   src/physics/GameBodyType.java