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