Tleety 2bd60be741 Merge remote-tracking branch 'origin/master' into Forward+ ...

# Conflicts:
#	resources/Schema/Types/Entity.xsd

2016-01-08 14:14:43 +01:00

..

Engine

Merge remote-tracking branch 'origin/master' into Forward+

2016-01-08 14:14:43 +01:00

Game

Fixed so the PlayerDeath event doesn't get spammed while the player is dead. Also made sure that any remaining healthDeltas are cleared when dead.

2016-01-08 11:37:51 +01:00

Tests

New small fix.

2016-01-07 17:40:47 +01:00