viktorljung 08328a781c Merge remote-tracking branch 'origin/master' into Animations ...

# Conflicts:
#	assets
#	include/Engine/Rendering/Model.h
#	src/Engine/Collision/Collision.cpp

2016-02-10 14:13:08 +01:00

..

Engine

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

2016-02-10 14:13:08 +01:00

Game

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

2016-02-10 14:13:08 +01:00

Tests

Miscellaneous small fixes: For Tests, CapturePoint xml file, HealthSystem, DashAbility xml file.

2016-02-05 15:35:51 +01:00