Skip to content

Commit

Permalink
Merge branch 'master' of OpenRA/ra2
Browse files Browse the repository at this point in the history
  • Loading branch information
Mailaender committed May 16, 2016
2 parents 1da5236 + e4025e7 commit 5256ffa
Show file tree
Hide file tree
Showing 106 changed files with 21,813 additions and 3,813 deletions.
12 changes: 12 additions & 0 deletions .gitattributes
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
# Enforce LF normalization on Windows
*.yaml eol=lf
*.lua eol=lf
* text=lf

# Custom for Visual Studio
*.cs diff=csharp
*.sln merge=union
*.csproj merge=union
*.vbproj merge=union
*.fsproj merge=union
*.dbproj merge=union
62 changes: 62 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,62 @@
# Visual Studio
Release
bin
obj
*.ncb
*.vcproj*
*.suo
*.user
*.sln.cache
*.manifest
*.CodeAnalysisLog.xml
*.lastcodeanalysissucceeded
_ReSharper.*/

# movies
*.vqa

# archives
*.mix

# binaries
/*.exe
/*.dll
/*.dll.config
/*.so
/*.dylib
/*.pdb
/*.mdb
OpenRA.Mods.RA2/dependencies/*.dll
OpenRA.Mods.RA2/dependencies/*.exe
*.mmdb.gz

# backup files by various editors
*~
*.orig
\#*
.*.sw?

# Monodevelop
*.pidb
*.userprefs

# Mac OS X
.DS_Store

# XCode
packaging/osx/launcher/build/
packaging/osx/launcher/OpenRA.xcodeproj/*.pbxuser
packaging/osx/launcher/OpenRA.xcodeproj/*.perspectivev3
packaging/osx/launcher/OpenRA.xcodeproj/*.mode1v3
temp.c
temp.o
temp.s
OpenRA.Launcher.Mac/build/
OpenRA.Launcher.Mac/OpenRA.xcodeproj/*.pbxuser
OpenRA.Launcher.Mac/OpenRA.xcodeproj/*.perspectivev3
OpenRA.Launcher.Mac/OpenRA.xcodeproj/*.mode1v3
*.resources

# SublimeText
*.sublime-project
*.sublime-workspace
46 changes: 46 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,46 @@
language: csharp
mono: 4.2.1

sudo: false

cache:
directories:
- ~/.openra/Content

addons:
apt:
packages:
- liblua5.1-0
- p7zip-full

script:
- cd ../..
- mkdir -p ~/.openra/mods
- mv OpenRA/ra2 ~/.openra/mods/ra2
- git clone https://github.com/OpenRA/OpenRA.git
- cd OpenRA
- travis_retry make dependencies
- make all
- ln -sf ~/build/OpenRA/OpenRA.Game.exe ~/.openra/mods/ra2/OpenRA.Mods.RA2/dependencies
- ln -sf ~/build/OpenRA/mods/common/OpenRA.Mods.Common.dll ~/.openra/mods/ra2/OpenRA.Mods.RA2/dependencies
- ln -sf ~/build/OpenRA/mods/ra/OpenRA.Mods.RA.dll ~/.openra/mods/ra2/OpenRA.Mods.RA2/dependencies
- ln -sf ~/build/OpenRA/mods/ts/OpenRA.Mods.TS.dll ~/.openra/mods/ra2/OpenRA.Mods.RA2/dependencies
- ln -sf ~/build/OpenRA/thirdparty/download/Eluant.dll ~/.openra/mods/ra2/OpenRA.Mods.RA2/dependencies
- pushd ~/.openra/mods/ra2/OpenRA.Mods.RA2 && xbuild && popd
- travis_retry ~/.openra/mods/ra2/fetch-content.sh
- mono --debug OpenRA.Utility.exe ra2 --check-yaml
- mono --debug OpenRA.Utility.exe ra2 --check-sequence-sprites

branches:
only:
- master

# Notify developers when build passed/failed.
notifications:
irc:
template:
- "%{repository}#%{build_number} %{commit} %{author}: %{message} %{build_url}"
channels:
- "irc.freenode.net#openra"
use_notice: true
skip_join: true
7 changes: 7 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
# Red Alert 2 mod for OpenRA

[![Build Status](https://travis-ci.org/OpenRA/ra2.svg?branch=master)](https://travis-ci.org/OpenRA/ra2)

Consult the [wiki](https://github.com/OpenRA/ra2/wiki) for instructions on how to install and use this.

[![Bountysource](https://api.bountysource.com/badge/tracker?tracker_id=27677844)](https://www.bountysource.com/teams/openra/issues?tracker_ids=27677844)
2 changes: 1 addition & 1 deletion audio/music.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -31,4 +31,4 @@ credits: Credits
Extension: wav
score: Score
Filename: ra2-sco
Extension: wav
Extension: wav
85 changes: 73 additions & 12 deletions audio/notifications.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Speech:
DefaultVariant: .wav
Prefixes:
Prefixes:
america: ceva
korea: ceva
france: ceva
Expand All @@ -11,59 +11,120 @@ Speech:
iraq: csof
russia: csof
Notifications:
AirUnitLost: 064
AllianceBroken: 044
AllianceFormed: 043
AllianceRequested: 101
ArmorUpgraded: 067
ArmorTechnologyStolen: 082
AtomBombDetected: 001
AtomBombLaunchDetected: 002
AtomBombReady: 003
BaseAttack: 054
BeaconDetected: 041
BeaconPlaced: 042
BaseDefensesOffline: 059
Building: 052
BuildingCannotPlaceAudio: 063
BuildingCaptured: 072
BuildingInfiltrated: 073
BuildingInfiltratedCashStolen: 090
BuildingInfiltratedPowerSabotaged: 091
BuildingInfiltratedRadarSabotaged: 089
BuildingInfiltratedTechnologyStolen: 088
BuildingOffline: 061
BuildingOnline: 060
BridgeRepaired: 046
Cancelled: 051
CashStolen: 094
ChronominerOffline: 109
ChronosphereActivated: 008
ChronosphereDetected: 007
ChronosphereReady: 009
ConstructionComplete: 048
CreditsStolen: 094
FirstObjectiveMet: 017
HarvesterAttack: 037
CriticalUnitLost: 020
CriticalStructureLost: 021
EnemyAllianceFormed: 103
EnemyAirArmadaDetected: 096
EnemyArmorBattalionDetected: 098
EnemyBasePoweredDown: 075
EnemyFleetDetected: 097
EnemyInfantryBattalionDetected: 099
EnemyPowerRestored: 087
EstablishingBattlefieldcontrolStandBy: 016
FirepowerUpgraded: 068
FirepowerTechnologyStolen: 081
FiveMinutesRemaining: 029
FourMinutesRemaining: 030
IncomingTransmission: 040
InsufficientFunds: 050
IronCurtainActivated: 005
IronCurtainDetected: 004
IronCurtainReady: 006
Leave: 015
LightningStormCreated: 011
LightningStormReady: 012
Lose: 023
LowPower: 053
MissionAccomplished: 013
MissionFailed: 014
NavalUnitLost: 064
NewMissionObjectiveReceived: 083
NewObjectiveReceived: 104
NewOptions: 049
NewTechnologyAquired: 074
NewTerrainDiscovered: 039
NewRallyPointEstablished: 100
NoBuild: 047
NuclearMissileLaunched: 002
NuclearMissileReady: 002
NuclearSiloDetected: 001
OneMinuteRemaining: 033
OnHold: 056
OreMinerOffline: 086
OreMinerUnderAttack: 037
OurAllyIsUnderAttack: 045
PlayerDefeated: 026
PlayerResigned: 025
PowerSabotaged: 095
PrimaryBuildingSelected: 055
PrimaryObjectiveAchieved: 017
RadarSabotaged: 093
ReinforcementsArrived: 038
ReinforcementsReady: 121
Repairing: 057
SecondObjectiveMet: 018
Resign: 024
RequestingAlliance: 102
SecondObjectiveAchieved: 018
SelectTarget: 065
SpeedUpgraded: 069
StartGame: 120
StructureAbandoned: 108
StructureGarrisoned: 107
StructureSold: 058
TechBuildingCaptured: 105
TechBuildingLost: 106
TechnologyStolen: 092
TenMinutesRemaining: 028
ThirdObjectiveMet: 019
TertiaryObjectiveAchieved: 019
ThreeMinutesRemaining: 031
TimerStarted: 035
TimerStopped: 036
Training: 066
TwentyMinutesRemaining: 027
TwoMinutesRemaining: 032
UnitArmorUpgraded: 077
UnitFirepowerUpgraded: 076
UnitLost: 064
UnitPromoted: 079
UnitReady: 062
UnitRepaired: 070
UnitSold: 071
UnitSpeedUpgraded: 078
WarningOneMinuteRemaining: 033
WarningTwoMinutesRemaining: 032
WarningThreeMinutesRemaining: 031
WarningFourMinutesRemaining: 030
WarningFiveMinutesRemaining: 029
UnitUpgraded: 080
UpradeComplete: 085
UpgradeInProgress: 084
WeathercontrolDeviceDetected: 010
WeathercontrolDeviceOffline: 122
Win: 022

Sounds:
Expand Down
36 changes: 22 additions & 14 deletions audio/voices.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ AlliedEngineerVoice:
Zapped: igenzapa
Burned: ienadia #gotta put something as temp else game crashes
Melted: igenmela, igenmelb, igenmelc
# [EngAllPowerDown] Sounds = ienapow
# [EngAllPowerDown] Sounds = ienapow

SovietEngineerVoice:
DefaultVariant: .wav
Expand All @@ -31,6 +31,20 @@ AlliedVehicleVoice:
Move: vgramoa, vgramob, vgramoc, vgramod, vgramoe, vgramof
Attack: vgraata, vgraatb, vgraatc, vgraatd, vgraate

AlliedConstructionVehicleVoice:
DefaultVariant: .wav
Voices:
Select: vgrasea, vgraseb, vgrasec, vgrased, vgrasee
Move: vgramob, vgramod, vgramoe, vgramof
Attack: vgraata, vgraatb, vgraatc, vgraatd, vgraate

ChronoMinerVoice:
DefaultVariant: .wav
Voices:
Select: vgrasea, vgraseb, vgrasec, vgrased, vgrasee
Move: vgramob, vgramod, vgramoe, vgramof
Attack: vgraata, vgraatb, vgraatc, vgraatd, vgraate

SovietVehicleVoice:
DefaultVariant: .wav
Voices:
Expand Down Expand Up @@ -119,9 +133,9 @@ ChronoLegionnaireVoice:
Move: ichrseb, ichrsec, ichrsed, ichrsee
Attack: ichrata, ichratb, ichratc, ichratd
Feedback: ichrfea, ichrfeb, ichrfec
Die: ichrdia, ichrdib, ichrdic
Die: ichrdia, ichrdib, ichrdic
Zapped: igenzapa
Burned: ienadia #gotta put something as temp else game crashes
Burned: ienadia # gotta put something as temp else game crashes
Melted: igenmela, igenmelb, igenmelc

SniperVoice:
Expand All @@ -142,6 +156,7 @@ SealVoice:
Select: iseasea, iseaseb, iseasec, iseased
Move: iseamoa, iseamob, iseamoc
Attack: iseaata, iseaatb, iseaatc
SpecialAttack: iseaexa, iseaexb
Die: iseadia, iseadib, iseadic
Zapped: igenzapa
Burned: ienadia #gotta put something as temp else game crashes
Expand Down Expand Up @@ -169,15 +184,15 @@ DolphinVoice:

HarrierVoice:
DefaultVariant: .wav
Voiced:
Voices:
Select: vintsea, vintseb, vintsec, vintsed
Move: vintmoa, vintmob, vintmoc, vintmod
Attack: vintata, vintatb, vintatc, vintatd, vintate
Die: vintdia, vintdib, vintdic

BlackEagleVoice:
DefaultVariant: .wav
Voiced:
Voices:
Select: vblesea, vbleseb, vblesec, vblesed, vblesef
Move: vblemoa, vblemob, vblemoc
Attack: vbleata, vbleatb, vbleatc
Expand Down Expand Up @@ -269,7 +284,6 @@ KirovVoice:
Attack: vkirata, vkiratb, vkiratc, vkiratd
Feedback: vkirfea, vkirfeb, vkirfec
Die: vkirdia, vkirdib, vkirdic, vkirdid
Kill: vkirdia, vkirdib, vkirdic, vkirdid

DemolitionTruckVoice:
DefaultVariant: .wav
Expand Down Expand Up @@ -304,16 +318,15 @@ AlligatorVoice:
Attack: galiatta, galiattb
Feedback: galifeaa, galifeab
Die: galidiea
Burned: ienadia #gotta put something as temp else game crashes

BearVoice:
DefaultVariant: .wav
Voices:
Select: gbeasela, gbeaselb
Move: gbeamova, gbeamovb, gbeamovc
Attack: gbeaatta, gbeaattb
Feedback: gbeafeaa, gbeafeab
Die: gbeadiea, gbeadieb
Burned: ienadia #gotta put something as temp else game crashes

CarVoice:
DefaultVariant: .wav
Expand All @@ -331,7 +344,6 @@ ChimpanzeeVoice:
Attack: gchiata, gchiatb, gchiatc
Feedback: gchifeaa, gchifeab
Die: gchidiea, gchidieb
Burned: ienadia #gotta put something as temp else game crashes

CivilianAlliedMaleVoice:
DefaultVariant: .wav
Expand All @@ -345,7 +357,7 @@ CivilianAlliedMaleVoice:
Burned: ienadia #gotta put something as temp else game crashes
Melted: igenmela, igenmelb, igenmelc

CivilianSovietMalevVoice:
CivilianSovietMaleVoice:
DefaultVariant: .wav
Voices:
Select: icissea, icisseb, icissec, icissed
Expand Down Expand Up @@ -398,9 +410,5 @@ CowVoice:
Voices:
Select: gcowsela, gcowselb, gcowselc
Move: gcowmova, gcowmovb
Action: gcowmova, gcowmovb
Feedback: gcowsela, gcowselb, gcowselc
Die: gcowdiea
Zapped: igenzapa
Burned: ienadia #gotta put something as temp else game crashes
Melted: igenmela, igenmelb, igenmelc
Binary file added bits/animations/litning.shp
Binary file not shown.
Binary file added bits/animations/litningupg.shp
Binary file not shown.
Binary file added bits/cameos/acnsicon.shp
Binary file not shown.
Binary file added bits/cameos/cameo-chevron.pal
Binary file not shown.
Binary file added bits/cameos/cameo-chevron.shp
Binary file not shown.
Binary file added bits/cameos/scnsicon.shp
Binary file not shown.
Binary file added bits/camera.shp
Binary file not shown.
Binary file modified bits/mpspawn.shp
Binary file not shown.
Binary file added bits/temperate/droads45.tem
Binary file not shown.
Binary file added bits/ts-mousepal.pal
Binary file not shown.
Binary file added bits/tscameo.pal
Binary file not shown.
Binary file added bits/undeploy.shp
Binary file not shown.
Binary file modified bits/waypoint.shp
Binary file not shown.

0 comments on commit 5256ffa

Please sign in to comment.