Merge pull request #4852 from pchote/timer-fixup

Overhaul ingame timer displays.

mods/cnc/chrome/ingame.yaml

@@ -3,11 +3,25 @@ Container@INGAME_ROOT:
 	Children:
 		LogicTicker@DISCONNECT_WATCHER:
 			Logic:DisconnectWatcherLogic
-		Timer@GAME_TIMER:
-			X: WINDOW_RIGHT/2
-			Y: 0
-			Font: Title
-			Contrast: true
+		Container@GAME_TIMER_BLOCK:
+			Logic:GameTimerLogic
+			X:WINDOW_RIGHT/2 - WIDTH
+			Width:100
+			Height:55
+			Children:
+				Label@GAME_TIMER:
+					Width:PARENT_RIGHT
+					Height:30
+					Align:Center
+					Font:Title
+					Contrast:true
+				Label@GAME_TIMER_STATUS:
+					Y:35
+					Width:PARENT_RIGHT
+					Height:15
+					Align:Center
+					Font:Bold
+					Contrast:true
 		StrategicProgress@STRATEGIC_PROGRESS:
 			X: WINDOW_RIGHT/2
 			Y: 40