verysecrethero be628d9406 Merge remote-tracking branch 'origin/master' into HealthPickup ...

# Conflicts:
#	resources/Schema/Components.xsd

2016-02-05 16:23:22 +01:00

..

Events

Added EntityWrapper::IsChildOf and made snapshot interpolation and rendering exceptions for player less hacky

2016-01-23 11:44:16 +01:00

Systems

Merge remote-tracking branch 'origin/master' into HealthPickup

2016-02-05 16:23:22 +01:00

ExplosionEffectSystem.h

Merge remote-tracking branch 'origin/master' into CoolDeathAnimation

2016-01-25 01:21:15 +01:00

Game.h

Several changes/fixes based on the latest broken refactoring.

2016-02-02 11:37:22 +01:00