add a pause/slowdown/play/fastforward button for replays

closes #4633
This commit is contained in:
Matthias Mailänder
2014-03-12 11:51:36 +01:00
parent c5ef9cbfb2
commit 0c20e38443
21 changed files with 482 additions and 282 deletions

View File

@@ -388,6 +388,8 @@ music: chrome.png
play: 288,0,16,16
next: 256,16,16,16
prev: 272,16,16,16
fastforward: 400,64,16,16
slowmo: 400,80,16,16
lobby-bits: chrome.png
spawn-claimed: 256,32,16,16

View File

@@ -56,6 +56,7 @@ Container@INGAME_ROOT:
TooltipContainer:TOOLTIP_CONTAINER
Container@PLAYER_ROOT:
TooltipContainer@TOOLTIP_CONTAINER:
Container@OBSERVER_WIDGETS:
Children:
Button@OPTIONS_BUTTON:
@@ -85,14 +86,86 @@ Container@OBSERVER_WIDGETS:
Y:1
Width:PARENT_RIGHT-2
Height:PARENT_BOTTOM-2
DropDownButton@SHROUD_SELECTOR:
Logic:ObserverShroudSelectorLogic
Background@OBSERVER_CONTROL_BG:
X:WINDOW_RIGHT-173
Y:172
Width:168
Height:25
Font:Bold
Visible:true
Height:35
Background:panel-black
Children:
DropDownButton@SHROUD_SELECTOR:
Logic:ObserverShroudSelectorLogic
X:5
Y:5
Width:158
Height:25
Font:Bold
Visible:true
Container@REPLAY_PLAYER:
Logic:ReplayControlBarLogic
X:PARENT_RIGHT/2 - 70
Y:30
Width:160
Height:35
Visible:false
Children:
Button@BUTTON_PAUSE:
X:5
Y:5
Width:26
Height:26
IgnoreChildMouseOver:true
Children:
Image@IMAGE_PAUSE:
X:5
Y:5
Width:16
Height:16
ImageCollection:music
ImageName:pause
Button@BUTTON_SLOW:
X:40
Y:5
Width:26
Height:26
IgnoreChildMouseOver:true
Children:
Image@IMAGE_SLOW:
X:5
Y:5
Width:16
Height:16
ImageCollection:music
ImageName:slowmo
Button@BUTTON_NORMALSPEED:
X:75
Y:5
Width:26
Height:26
IgnoreChildMouseOver:true
Children:
Image@IMAGE_PLAY:
X:5
Y:5
Width:16
Height:16
ImageCollection:music
ImageName:play
Button@BUTTON_FASTFORWARD:
X:110
Y:5
Width:26
Height:26
IgnoreChildMouseOver:true
Children:
Image@IMAGE_FASTFORWARD:
X:5
Y:5
Width:16
Height:16
ImageCollection:music
ImageName:fastforward
Container@PLAYER_WIDGETS:
Children:
LogicTicker@SIDEBAR_TICKER:

Binary file not shown.

Before

Width:  |  Height:  |  Size: 74 KiB

After

Width:  |  Height:  |  Size: 74 KiB

View File

@@ -258,6 +258,8 @@ music: musicplayer.png
play: 56,0,25,25
next: 84,0,25,25
prev: 112,0,25,25
fastforward: 140,0,25,25
slowmo: 168,0,25,25
scrollbar: buttons.png
down_arrow: 16,112,16,16

View File

@@ -0,0 +1,104 @@
Container@PLAYER_WIDGETS:
Children:
LogicTicker@SIDEBAR_TICKER:
Button@INGAME_DIPLOMACY_BUTTON:
X:162
Y:0
Width:160
Height:25
Text:Diplomacy (F1)
Font:Bold
Key: f1
Button@CHEATS_BUTTON:
X:324
Y:0
Width:160
Height:25
Text:Cheats (F2)
Visible:false
Font:Bold
Key: f2
Button@OBJECTIVES_BUTTON:
X:486
Y:0
Width:160
Height:25
Text:Objectives (F3)
Visible:false
Font:Bold
Key: f3
SlidingContainer@INGAME_RADAR_BIN:
X:WINDOW_RIGHT-215
Y:0
OpenOffset:0,29
ClosedOffset:0,-166
AnimationLength:15
Children:
Image@RADAR_BIN_BG:
ImageName:radar
Radar@RADAR_MINIMAP:
WorldInteractionController:INTERACTION_CONTROLLER
X:9
Width:192
Height:192
ResourceBar@POWERBAR:
X:42
Y:205
Width:138
Height:5
TooltipContainer:TOOLTIP_CONTAINER
IndicatorImage:power-indicator
Orientation:Horizontal
Style:Bevelled
MoneyBin@INGAME_MONEY_BIN:
X:WINDOW_RIGHT - WIDTH
Y:0
Width:320
Height: 32
Children:
OrderButton@SELL:
Logic:OrderButtonsChromeLogic
X:3
Y:0
Width:30
Height:30
Image:sell
Description:Sell
LongDesc:Sell buildings, reclaiming a \nproportion of their build cost
OrderButton@POWER_DOWN:
Logic:OrderButtonsChromeLogic
X:39
Y:0
Width:30
Height:30
Image:power
Description:Powerdown
LongDesc:Disable unneeded structures so their \npower can be used elsewhere
OrderButton@REPAIR:
Logic:OrderButtonsChromeLogic
X:75
Y:0
Width:30
Height:30
Image:repair
Description:Repair
LongDesc:Repair damaged buildings
SupportPowerBin@INGAME_POWERS_BIN:
X:0
Y:25
IconWidth: 60
IconHeight: 48
ReadyText: READY
HoldText: ON HOLD
BuildPalette@INGAME_BUILD_PALETTE:
X:WINDOW_RIGHT - 250
Y:280
Width:238
Height:500
ReadyText:@ready@
HoldText:@on-hold@
RequiresText:@requires@
IconWidth: 60
IconHeight: 48
Columns: 3
Rows: 4

View File

@@ -77,138 +77,3 @@ Container@INGAME_ROOT:
Width:200
Height:200
TooltipContainer@TOOLTIP_CONTAINER:
Container@PLAYER_WIDGETS:
Children:
LogicTicker@SIDEBAR_TICKER:
Button@INGAME_DIPLOMACY_BUTTON:
X:162
Y:0
Width:160
Height:25
Text:Diplomacy (F1)
Font:Bold
Key: f1
Button@CHEATS_BUTTON:
X:324
Y:0
Width:160
Height:25
Text:Cheats (F2)
Visible:false
Font:Bold
Key: f2
Button@OBJECTIVES_BUTTON:
X:486
Y:0
Width:160
Height:25
Text:Objectives (F3)
Visible:false
Font:Bold
Key: f3
SlidingContainer@INGAME_RADAR_BIN:
X:WINDOW_RIGHT-215
Y:0
OpenOffset:0,29
ClosedOffset:0,-166
AnimationLength:15
Children:
Image@RADAR_BIN_BG:
ImageName:radar
Radar@RADAR_MINIMAP:
WorldInteractionController:INTERACTION_CONTROLLER
X:9
Width:192
Height:192
ResourceBar@POWERBAR:
X:42
Y:205
Width:138
Height:5
TooltipContainer:TOOLTIP_CONTAINER
IndicatorImage:power-indicator
Orientation:Horizontal
Style:Bevelled
MoneyBin@INGAME_MONEY_BIN:
X:WINDOW_RIGHT - WIDTH
Y:0
Width:320
Height: 32
Children:
OrderButton@SELL:
Logic:OrderButtonsChromeLogic
X:3
Y:0
Width:30
Height:30
Image:sell
Description:Sell
LongDesc:Sell buildings, reclaiming a \nproportion of their build cost
OrderButton@POWER_DOWN:
Logic:OrderButtonsChromeLogic
X:39
Y:0
Width:30
Height:30
Image:power
Description:Powerdown
LongDesc:Disable unneeded structures so their \npower can be used elsewhere
OrderButton@REPAIR:
Logic:OrderButtonsChromeLogic
X:75
Y:0
Width:30
Height:30
Image:repair
Description:Repair
LongDesc:Repair damaged buildings
SupportPowerBin@INGAME_POWERS_BIN:
X:0
Y:25
IconWidth: 60
IconHeight: 48
ReadyText: READY
HoldText: ON HOLD
BuildPalette@INGAME_BUILD_PALETTE:
X:WINDOW_RIGHT - 250
Y:280
Width:238
Height:500
ReadyText:@ready@
HoldText:@on-hold@
RequiresText:@requires@
IconWidth: 60
IconHeight: 48
Columns: 3
Rows: 4
Container@OBSERVER_WIDGETS:
Children:
Button@INGAME_STATS_BUTTON:
X:162
Y:0
Width:160
Height:25
Text:Statistics (F1)
Font:Bold
Key:f1
Background@RADAR_BG:
X:WINDOW_RIGHT-255
Y:5
Width:250
Height:250
Children:
Radar@INGAME_RADAR:
X:10
Y:10
Width:PARENT_RIGHT-19
Height:PARENT_BOTTOM-19
WorldInteractionController:INTERACTION_CONTROLLER
DropDownButton@SHROUD_SELECTOR:
Logic:ObserverShroudSelectorLogic
X:WINDOW_RIGHT-250
Y:260
Width:240
Height:25
Font:Bold

View File

@@ -62,7 +62,9 @@ ChromeLayout:
mods/ra/chrome/ingame-diplomacy.yaml
mods/ra/chrome/ingame-fmvplayer.yaml
mods/ra/chrome/ingame-menu.yaml
mods/ra/chrome/ingame-observer.yaml
mods/ra/chrome/ingame-observerstats.yaml
mods/d2k/chrome/ingame-player.yaml
mods/d2k/chrome/mainmenu.yaml
mods/ra/chrome/settings.yaml
mods/ra/chrome/credits.yaml

View File

@@ -120,7 +120,7 @@ tabs-normal: tabs.png
soviet-Helicopter: 54,160,27,41
soviet-Ship: 134,200,27,41
# Used for the menu
# Used for the menu
dialog: dialog.png
background: 0,0,480,480
border-r: 489,0,9,192
@@ -208,6 +208,8 @@ music: musicplayer.png
play: 56,0,25,25
next: 84,0,25,25
prev: 112,0,25,25
fastforward: 140,0,25,25
slowmo: 168,0,25,25
scrollbar: buttons.png
down_arrow: 16,112,16,16

View File

@@ -0,0 +1,99 @@
Container@OBSERVER_WIDGETS:
Children:
Button@INGAME_STATS_BUTTON:
X:162
Y:0
Width:160
Height:25
Text:Statistics (F1)
Font:Bold
Key:f1
Background@RADAR_BG:
X:WINDOW_RIGHT-255
Y:5
Width:250
Height:250
Children:
Radar@INGAME_RADAR:
X:10
Y:10
Width:PARENT_RIGHT-19
Height:PARENT_BOTTOM-19
WorldInteractionController:INTERACTION_CONTROLLER
Background@OBSERVER_CONTROL_BG:
X:WINDOW_RIGHT-255
Y:260
Width:250
Height:55
Children:
DropDownButton@SHROUD_SELECTOR:
Logic:ObserverShroudSelectorLogic
X:15
Y:15
Width:220
Height:25
Font:Bold
Container@REPLAY_PLAYER:
Logic:ReplayControlBarLogic
X:PARENT_RIGHT/2 - 80
Y:35
Width:160
Height:35
Visible:false
Children:
Button@BUTTON_PAUSE:
X:15
Y:15
Width:25
Height:25
IgnoreChildMouseOver:true
Children:
Image@IMAGE_PAUSE:
X:0
Y:0
Width:25
Height:25
ImageCollection:music
ImageName:pause
Button@BUTTON_SLOW:
X:50
Y:15
Width:25
Height:25
IgnoreChildMouseOver:true
Children:
Image@IMAGE_SLOW:
X:4
Y:0
Width:25
Height:25
ImageCollection:music
ImageName:slowmo
Button@BUTTON_NORMALSPEED:
X:85
Y:15
Width:25
Height:25
IgnoreChildMouseOver:true
Children:
Image@IMAGE_PLAY:
X:0
Y:0
Width:25
Height:25
ImageCollection:music
ImageName:play
Button@BUTTON_FASTFORWARD:
X:120
Y:15
Width:25
Height:25
IgnoreChildMouseOver:true
Children:
Image@IMAGE_FASTFORWARD:
X:4
Y:0
Width:25
Height:25
ImageCollection:music
ImageName:fastforward

View File

@@ -0,0 +1,99 @@
Container@PLAYER_WIDGETS:
Children:
LogicTicker@SIDEBAR_TICKER:
Button@INGAME_DIPLOMACY_BUTTON:
X:162
Y:0
Width:160
Height:25
Text:Diplomacy (F1)
Font:Bold
Key: f1
Button@CHEATS_BUTTON:
X:324
Y:0
Width:160
Height:25
Text:Cheats (F2)
Visible:false
Font:Bold
Key: f2
Button@OBJECTIVES_BUTTON:
X:486
Y:0
Width:160
Height:25
Text:Objectives (F3)
Visible:false
Font:Bold
Key: f3
SlidingContainer@INGAME_RADAR_BIN:
X:WINDOW_RIGHT-215
Y:0
OpenOffset:0,29
ClosedOffset:0,-166
AnimationLength:15
Children:
Image@RADAR_BIN_BG:
ImageName:radar
Radar@RADAR_MINIMAP:
WorldInteractionController:INTERACTION_CONTROLLER
X:9
Width:192
Height:192
ResourceBar@POWERBAR:
X:42
Y:205
Width:138
Height:5
TooltipContainer:TOOLTIP_CONTAINER
IndicatorImage:power-indicator
Orientation:Horizontal
Style:Bevelled
MoneyBin@INGAME_MONEY_BIN:
X:WINDOW_RIGHT - WIDTH
Y:0
Width:320
Height: 32
Children:
OrderButton@SELL:
Logic:OrderButtonsChromeLogic
X:3
Y:0
Width:30
Height:30
Image:sell
Description:Sell
LongDesc:Sell buildings, reclaiming a \nproportion of their build cost
OrderButton@POWER_DOWN:
Logic:OrderButtonsChromeLogic
X:39
Y:0
Width:30
Height:30
Image:power
Description:Powerdown
LongDesc:Disable unneeded structures so their \npower can be used elsewhere
OrderButton@REPAIR:
Logic:OrderButtonsChromeLogic
X:75
Y:0
Width:30
Height:30
Image:repair
Description:Repair
LongDesc:Repair damaged buildings
SupportPowerBin@INGAME_POWERS_BIN:
X:0
Y:25
ReadyText: @ready@
HoldText: @on-hold@
BuildPalette@INGAME_BUILD_PALETTE:
X:WINDOW_RIGHT - 250
Y:280
Width:250
Height:500
ReadyText: @ready@
HoldText: @on-hold@
RequiresText: @requires@

View File

@@ -77,132 +77,3 @@ Container@INGAME_ROOT:
Width:200
Height:200
TooltipContainer@TOOLTIP_CONTAINER:
Container@PLAYER_WIDGETS:
Children:
LogicTicker@SIDEBAR_TICKER:
Button@INGAME_DIPLOMACY_BUTTON:
X:162
Y:0
Width:160
Height:25
Text:Diplomacy (F1)
Font:Bold
Key: f1
Button@CHEATS_BUTTON:
X:324
Y:0
Width:160
Height:25
Text:Cheats (F2)
Visible:false
Font:Bold
Key: f2
Button@OBJECTIVES_BUTTON:
X:486
Y:0
Width:160
Height:25
Text:Objectives (F3)
Visible:false
Font:Bold
Key: f3
SlidingContainer@INGAME_RADAR_BIN:
X:WINDOW_RIGHT-215
Y:0
OpenOffset:0,29
ClosedOffset:0,-166
AnimationLength:15
Children:
Image@RADAR_BIN_BG:
ImageName:radar
Radar@RADAR_MINIMAP:
WorldInteractionController:INTERACTION_CONTROLLER
X:9
Width:192
Height:192
ResourceBar@POWERBAR:
X:42
Y:205
Width:138
Height:5
TooltipContainer:TOOLTIP_CONTAINER
IndicatorImage:power-indicator
Orientation:Horizontal
Style:Bevelled
MoneyBin@INGAME_MONEY_BIN:
X:WINDOW_RIGHT - WIDTH
Y:0
Width:320
Height: 32
Children:
OrderButton@SELL:
Logic:OrderButtonsChromeLogic
X:3
Y:0
Width:30
Height:30
Image:sell
Description:Sell
LongDesc:Sell buildings, reclaiming a \nproportion of their build cost
OrderButton@POWER_DOWN:
Logic:OrderButtonsChromeLogic
X:39
Y:0
Width:30
Height:30
Image:power
Description:Powerdown
LongDesc:Disable unneeded structures so their \npower can be used elsewhere
OrderButton@REPAIR:
Logic:OrderButtonsChromeLogic
X:75
Y:0
Width:30
Height:30
Image:repair
Description:Repair
LongDesc:Repair damaged buildings
SupportPowerBin@INGAME_POWERS_BIN:
X:0
Y:25
ReadyText: @ready@
HoldText: @on-hold@
BuildPalette@INGAME_BUILD_PALETTE:
X:WINDOW_RIGHT - 250
Y:280
Width:250
Height:500
ReadyText: @ready@
HoldText: @on-hold@
RequiresText: @requires@
Container@OBSERVER_WIDGETS:
Children:
Button@INGAME_STATS_BUTTON:
X:162
Y:0
Width:160
Height:25
Text:Statistics (F1)
Font:Bold
Key:f1
Background@RADAR_BG:
X:WINDOW_RIGHT-255
Y:5
Width:250
Height:250
Children:
Radar@INGAME_RADAR:
X:10
Y:10
Width:PARENT_RIGHT-19
Height:PARENT_BOTTOM-19
WorldInteractionController:INTERACTION_CONTROLLER
DropDownButton@SHROUD_SELECTOR:
Logic:ObserverShroudSelectorLogic
X:WINDOW_RIGHT-250
Y:260
Width:240
Height:25
Font:Bold

View File

@@ -76,7 +76,9 @@ ChromeLayout:
mods/ra/chrome/ingame-fmvplayer.yaml
mods/ra/chrome/ingame-menu.yaml
mods/ra/chrome/ingame-objectives.yaml
mods/ra/chrome/ingame-observer.yaml
mods/ra/chrome/ingame-observerstats.yaml
mods/ra/chrome/ingame-player.yaml
mods/ra/chrome/mainmenu.yaml
mods/ra/chrome/settings.yaml
mods/ra/chrome/credits.yaml

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.0 KiB

After

Width:  |  Height:  |  Size: 546 B

View File

@@ -202,6 +202,8 @@ music: musicplayer.png
play: 56,0,25,25
next: 84,0,25,25
prev: 112,0,25,25
fastforward: 140,0,25,25
slowmo: 168,0,25,25
scrollbar: buttons.png
down_arrow: 16,112,16,16

View File

@@ -101,7 +101,9 @@ ChromeLayout:
mods/ra/chrome/ingame-fmvplayer.yaml
mods/ra/chrome/ingame-menu.yaml
mods/ra/chrome/ingame-objectives.yaml
mods/ra/chrome/ingame-observer.yaml
mods/ra/chrome/ingame-observerstats.yaml
mods/ra/chrome/ingame-player.yaml
mods/ra/chrome/mainmenu.yaml
mods/ra/chrome/settings.yaml
mods/ra/chrome/credits.yaml