Merge remote-tracking branch 'origin/gui' into havok

2014-05-28 20:29:28 +02:00
parent 133473b00e cc42b94000
commit 75e8ae0265
62 changed files with 2468 additions and 1626 deletions
@@ -150,7 +150,7 @@ bool Systems::TankSteeringSystem::OnCollision( const Events::Collision &e )
 				{
 					Events::Damage d;
 					d.Entity = physicsEntity;
-					d.damage =  (1.f - pow(distance / radius, 2)) * shellComponent->Damage;
+					d.Amount =  (1.f - pow(distance / radius, 2)) * shellComponent->Damage;
 					EventBroker->Publish(d);
 				}