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

Conflicts: src/GameWorld.cpp vs11/Returngeance/Returngeance.vcxproj.filters
2014-06-05 06:01:49 +02:00
parent 56e6545f0f
commit e4a59cec61
31 changed files with 288 additions and 130 deletions
@@ -37,7 +37,7 @@ namespace GUI
 			if (!health)
 				return false;
 	
-			SetColor(glm::vec4(1.f, 1.f, 1.f, 1 - health->Amount / 100.f));
+			SetColor(glm::vec4(1.f, 1.f, 1.f, 1 - (health->Amount / 100.f * 2)));

 			return true;
 		}