Merge pull request #8174 from abcdefg30/formattime

Added a FormatTime function to UtilsGlobal.cs
This commit is contained in:
Pavel Penev
2015-05-17 17:48:23 +03:00
3 changed files with 14 additions and 7 deletions

View File

@@ -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);
}
}
}

View File

@@ -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

View File

@@ -1,5 +1,5 @@
Container@SKIRMISH_STATS:
Height: PARENT_BOTTOM
Height: PARENT_BOTTOM
Width: PARENT_RIGHT
Logic: GameInfoStatsLogic
Children: