Merge pull request #3629 from pchote/superweapons

Fix superweapon timer / perf text conflict.
This commit is contained in:
Matthias Mailänder
2013-08-03 03:57:00 -07:00

View File

@@ -23,6 +23,10 @@ Container@INGAME_ROOT:
StrategicProgress@STRATEGIC_PROGRESS:
X: WINDOW_RIGHT/2
Y: 40
SupportPowerTimer@SUPPORT_POWER_TIMER:
X:80
Y:34
Order:Descending
Container@PLAYER_ROOT:
Button@INGAME_OPTIONS_BUTTON:
X:0
@@ -52,10 +56,6 @@ Container@INGAME_ROOT:
Width:170
Height:40
TooltipContainer@TOOLTIP_CONTAINER:
SupportPowerTimer@SUPPORT_POWER_TIMER:
X:15
Y:WINDOW_BOTTOM-30
Order:Ascending
Container@PLAYER_WIDGETS:
Children: