Merge pull request #4682 from ScottNZ/beacon

closes #2320
closes #3767
closes #3810
This commit is contained in:
Matthias Mailänder
2014-02-23 09:55:23 +01:00
32 changed files with 432 additions and 42 deletions

View File

@@ -41,4 +41,5 @@ Sounds:
ChatLine: scold1
TabClick: button
ClickSound: button
ClickDisabledSound: scold2
ClickDisabledSound: scold2
Beacon: bleep2

View File

@@ -445,6 +445,8 @@ EYE:
LaunchSound: ion1.aud
SelectTargetSound: select1.aud
InsufficientPowerSound: nopower1.aud
DisplayBeacon: True
DisplayRadarPing: True
SupportPowerChargeBar:
TMPL:
@@ -483,6 +485,8 @@ TMPL:
LaunchSound: nuklnch1.aud
IncomingSound: nuke1.aud
MissileWeapon: atomic
DisplayBeacon: True
DisplayRadarPing: True
SupportPowerChargeBar:
GUN:

View File

@@ -16,4 +16,5 @@ Player:
Shroud:
PlayerStatistics:
FrozenActorLayer:
PlaceBeacon:

View File

@@ -175,4 +175,4 @@ World:
DebugPauseState:
ConquestObjectivesPanel:
ObjectivesPanel: CONQUEST_OBJECTIVES
RadarPings:

View File

@@ -152,6 +152,14 @@ rallypoint:
Start: 0
Length: *
beacon:
arrow: mouse2
Start: 5
Offset: 1,-12
circles: fpls
Start: 0
Length: *
select:
repair:
Start: 2

View File

@@ -47,4 +47,5 @@ Sounds:
BuildPaletteClose: BUTTON1
TabClick: SIDEBAR1
ClickSound: BUTTON1
ClickDisabledSound: ENDLIST1
ClickDisabledSound: ENDLIST1
Beacon: CHAT1

View File

@@ -96,6 +96,8 @@ PALACEH:
IncomingSound:
MissileWeapon: atomic
SpawnOffset: -512,1c171,0
DisplayBeacon: True
DisplayRadarPing: True
CanPowerDown:
RequiresPower:
SupportPowerChargeBar:

View File

@@ -51,4 +51,4 @@ Player:
FrozenActorLayer:
HarvesterAttackNotifier:
PlayerStatistics:
PlaceBeacon:

View File

@@ -126,4 +126,4 @@ World:
PathFinder:
ValidateOrder:
DebugPauseState:
RadarPings:

View File

@@ -130,6 +130,14 @@ rallypoint:
Start: 0
Length: *
beacon:
arrow: mouse
Start: 148
Offset: -24,-24
circles: fpls
Start: 0
Length: *
rpg:
idle: DATA
Start: 3015

View File

@@ -42,4 +42,5 @@ Sounds:
BuildPaletteClose: bleep13
TabClick: ramenu1
ClickSound:
ClickDisabledSound:
ClickDisabledSound:
Beacon: beepslct

View File

@@ -37,6 +37,8 @@ MSLO:
MissileWeapon: atomic
SpawnOffset: 0,427,0
DisplayTimer: True
DisplayBeacon: True
DisplayRadarPing: True
CanPowerDown:
RequiresPower:
SupportPowerChargeBar:
@@ -224,6 +226,7 @@ IRON:
InsufficientPowerSound: nopowr1.aud
BeginChargeSound: ironchg1.aud
EndChargeSound: ironrdy1.aud
DisplayRadarPing: True
SupportPowerChargeBar:
PDOX:
@@ -264,6 +267,7 @@ PDOX:
EndChargeSound: chrordy1.aud
Duration: 20
KillCargo: yes
DisplayRadarPing: True
SupportPowerChargeBar:
-AcceptsSupplies:

View File

@@ -56,4 +56,5 @@ Player:
FrozenActorLayer:
BaseAttackNotifier:
PlayerStatistics:
PlaceBeacon:

View File

@@ -164,4 +164,4 @@ World:
PathFinder:
ValidateOrder:
DebugPauseState:
RadarPings:

View File

@@ -114,6 +114,14 @@ rallypoint:
Start: 0
Length: *
beacon:
arrow: mouse
Start: 5
Offset: 1,-12
circles: fpls
Start: 0
Length: *
smoke_m:
idle:
Start: 0

View File

@@ -39,4 +39,5 @@ Sounds:
BuildPaletteClose:
TabClick:
ClickSound:clicky1
ClickDisabledSound:wrong1
ClickDisabledSound:wrong1
Beacon: message1

View File

@@ -40,4 +40,4 @@ Player:
Shroud:
BaseAttackNotifier:
PlayerStatistics:
PlaceBeacon:

View File

@@ -96,4 +96,4 @@ World:
ValidateOrder:
DebugPauseState:
ScreenShaker:
RadarPings:

View File

@@ -44,6 +44,15 @@ rallypoint:
Length: 12
BlendMode: Additive
beacon:
arrow: mouse
Start: 6
Offset: 1,-12
circles: ring
Start: 0
Length: 12
BlendMode: Additive
rank: # TODO: backfall to RA asset
rank:
Start: 0