From 57dbdd097dc3ea2e315c718633e0aff6eb328198 Mon Sep 17 00:00:00 2001 From: abcdefg30 Date: Sat, 16 May 2015 01:30:25 +0200 Subject: [PATCH 1/3] Add a FormatTime function to UtilsGlobal.cs --- OpenRA.Mods.Common/Scripting/Global/UtilsGlobal.cs | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/OpenRA.Mods.Common/Scripting/Global/UtilsGlobal.cs b/OpenRA.Mods.Common/Scripting/Global/UtilsGlobal.cs index 68feddcb9f..08acf4219e 100644 --- a/OpenRA.Mods.Common/Scripting/Global/UtilsGlobal.cs +++ b/OpenRA.Mods.Common/Scripting/Global/UtilsGlobal.cs @@ -12,6 +12,7 @@ using System.Linq; using Eluant; using OpenRA.Scripting; using OpenRA.Traits; +using OpenRA.Widgets; namespace OpenRA.Mods.Common.Scripting { @@ -96,5 +97,11 @@ namespace OpenRA.Mods.Common.Scripting return Context.World.SharedRandom.Next(low, high); } + + [Desc("Returns the ticks formatted to HH:MM:SS.")] + public string FormatTime(int ticks, bool leadingMinuteZero = true) + { + return WidgetUtils.FormatTime(ticks, leadingMinuteZero); + } } } From 2fd91c53f2b9219599ae211e4b332b02a2e534dd Mon Sep 17 00:00:00 2001 From: abcdefg30 Date: Sat, 16 May 2015 11:50:34 +0200 Subject: [PATCH 2/3] Remove trailing spaces from nod04b map.yaml --- mods/cnc/maps/nod04b/map.yaml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/mods/cnc/maps/nod04b/map.yaml b/mods/cnc/maps/nod04b/map.yaml index 60d711d739..d790d4c13d 100644 --- a/mods/cnc/maps/nod04b/map.yaml +++ b/mods/cnc/maps/nod04b/map.yaml @@ -275,10 +275,10 @@ Actors: Owner: Neutral Actor77: v31 Location: 10,52 - Owner: Neutral + Owner: Neutral Actor87: v23 Location: 9,59 - Owner: Neutral + Owner: Neutral Actor92: jeep Location: 51,25 Owner: GDI @@ -288,7 +288,7 @@ Actors: Actor94: jeep Location: 39,48 Owner: GDI - Facing: 96 + Facing: 96 Actor110: e1 Location: 40,49 Owner: GDI @@ -311,7 +311,7 @@ Actors: Actor114: e2 Location: 35,40 Owner: GDI - SubCell: 1 + SubCell: 1 waypoint27: waypoint Location: 31,36 Owner: Neutral @@ -492,7 +492,7 @@ Actors: CameraPoint: waypoint Location: 32,22 Owner: Neutral - + Smudges: Rules: @@ -508,7 +508,7 @@ Rules: ObjectivesPanel: PanelName: MISSION_OBJECTIVES LuaScript: - Scripts: nod04b.lua + Scripts: nod04b.lua ^Vehicle: Tooltip: GenericVisibility: Enemy From d50ed6ec2fe821e8b57b7b6a6320b4ecdd7177ad Mon Sep 17 00:00:00 2001 From: abcdefg30 Date: Sat, 16 May 2015 11:51:43 +0200 Subject: [PATCH 3/3] Replace a bogus tab --- mods/ra/chrome/ingame-infostats.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mods/ra/chrome/ingame-infostats.yaml b/mods/ra/chrome/ingame-infostats.yaml index df59659c4d..5bb1cef853 100644 --- a/mods/ra/chrome/ingame-infostats.yaml +++ b/mods/ra/chrome/ingame-infostats.yaml @@ -1,5 +1,5 @@ Container@SKIRMISH_STATS: - Height: PARENT_BOTTOM + Height: PARENT_BOTTOM Width: PARENT_RIGHT Logic: GameInfoStatsLogic Children: