Jace 47053285c8 Merge remote-tracking branch 'origin/Menu' into WeaponSystem ...

# Conflicts:
#	resources/Schema/Entities/Player.xml
#	resources/Schema/Types/Entity.xsd

2016-02-12 02:30:38 +01:00

..

Engine

Merge pull request #104 from teamfisk/AmmoPickup

2016-02-12 02:08:29 +01:00

Game

Merge remote-tracking branch 'origin/Menu' into WeaponSystem

2016-02-12 02:30:38 +01:00