BTH/axyz
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Some assets, some fixes to the scoreboard

Browse Source
This commit is contained in:
Tleety
2016-03-07 10:48:46 +01:00
parent 19ee66fc75
commit a8f2d0a8e6
4 changed files with 1148 additions and 1148 deletions
Download Patch File Download Diff File Expand all files Collapse all files
assets
+1 -1
Submodule assets updated: 7a6d70787b...0ae736570b
resources/Schema/Entities/CP_Rocky.xml
+1144 -1144
View File
File diff suppressed because it is too large Load Diff
resources/Schema/Entities/ScoreBoard_Main.xml
+2 -2
View File
@@ -21,11 +21,11 @@
<Entity name="ScoreBoard_Spectators"> <Entity name="ScoreBoard_Spectators">
<Components> <Components>
<c:ScoreScreen> <c:ScoreScreen>
<Offset X="0" Y="-1" Z="0"/> <Offset X="0" Y="-2" Z="0"/>
</c:ScoreScreen> </c:ScoreScreen>
<c:Team/> <c:Team/>
<c:Transform> <c:Transform>
<Position X="0" Y="-14" Z="1.5"/> <Position X="0" Y="-15.7886772" Z="1.5"/>
</c:Transform> </c:Transform>
</Components> </Components>
<Children/> <Children/>
src/Game/Systems/ScoreScreenSystem.cpp
+1 -1
View File
@@ -78,7 +78,7 @@ void ScoreScreenSystem::UpdateComponent(EntityWrapper& entity, ComponentWrapper&
if (it == m_PlayerIdentities.end()) { if (it == m_PlayerIdentities.end()) {
break; break;
} }
if(found == false) { if(found == false) {
if(it->second.Team != currentTeam) { if(it->second.Team != currentTeam) {