Merge pull request #172 from teamfisk/ScoreBoard

Score board
This commit is contained in:
Tobias Dahl
2016-03-07 11:09:17 +01:00
4 changed files with 1148 additions and 1148 deletions
+1 -1
Submodule assets updated: 6451a3f5a5...0ae736570b
File diff suppressed because it is too large Load Diff
@@ -21,11 +21,11 @@
<Entity name="ScoreBoard_Spectators">
<Components>
<c:ScoreScreen>
<Offset X="0" Y="-1" Z="0"/>
<Offset X="0" Y="-2" Z="0"/>
</c:ScoreScreen>
<c:Team/>
<c:Transform>
<Position X="0" Y="-14" Z="1.5"/>
<Position X="0" Y="-15.7886772" Z="1.5"/>
</c:Transform>
</Components>
<Children/>
+1 -1
View File
@@ -78,7 +78,7 @@ void ScoreScreenSystem::UpdateComponent(EntityWrapper& entity, ComponentWrapper&
if (it == m_PlayerIdentities.end()) {
break;
}
}
if(found == false) {
if(it->second.Team != currentTeam) {