Skip to content

Commit

Permalink
Merge branch 'master' of ssh://github.com/MegaMek/megamek
Browse files Browse the repository at this point in the history 
Conflicts:
	megamek/docs/history.txt
  • Loading branch information
@arlith
arlith committed Feb 1, 2016
2 parents fe91edc + 96652c6 commit c0114a3
Show file tree
Hide file tree
Showing 1,255 changed files with 3,879 additions and 328 deletions.
Binary file added megamek/data/images/units/mechs/Arbalest 2.gif
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added megamek/data/images/units/mechs/Arbalest 3.gif
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified megamek/data/images/units/mechs/Arbalest.gif
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added megamek/data/images/units/mechs/Corvis 2.gif
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added megamek/data/images/units/mechs/Slagmaiden.gif
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added megamek/data/images/units/mechs/Valiant V4-LNT-J3.gif
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added megamek/data/images/units/mechs/Valiant VLT-3E.gif
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified megamek/data/images/units/mechs/corvis.gif
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified megamek/data/images/units/mechs/valiant.gif
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
16 changes: 11 additions & 5 deletions megamek/data/images/units/mechset.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1265,10 +1265,12 @@ exact "Anvil ANV-8M" "mechs/Anvil ANV-8M.gif"
chassis "Apollo" "mechs/Apollo.gif"
exact "Apollo APL-3T" "mechs/Apollo APL-3T.gif"
exact "Apollo APL-4M" "mechs/Apollo APL-4M.gif"
chassis "Aquagladius" "mechs/aquagladius.gif"
chassis "Aquagladius" "mechs/Aquagladius.gif"
exact "Aquagladius AQS-4" "mechs/Aquagladius AQS-4.gif"
chassis "Arana MilitiaMech" "mechs/Arana MilitiaMech.gif"
chassis "Arbalest" "mechs/Arbalest.gif"
exact "Arbalest 2" "mechs/Arbalest 2.gif"
exact "Arbalest 3" "mechs/Arbalest 3.gif"
chassis "Arbiter SecurityMech" "mechs/Arbiter.gif"
chassis "Arcas" "mechs/Arcas.gif"
exact "Arcas 2" "mechs/Arcas 2.gif"
Expand Down Expand Up @@ -1763,8 +1765,8 @@ chassis "Commando IIC" "mechs/Commando IIC.gif"
chassis "Copperhead" "mechs/copperhead.gif"
chassis "Copper Securitymech" "mechs/Copper SecurityMech.gif"
exact "Copper SecurityMech CPK-19" "mechs/Copper SecurityMech CPK-19.gif"
chassis "Corvis" "mechs/corvis.gif"
exact "Corvis 2" "mechs/corvis_2.gif"
chassis "Corvis" "mechs/Corvis.gif"
exact "Corvis 2" "mechs/Corvis 2.gif"
chassis "Cossack" "mechs/cossack.gif"
exact "Cossack C-1FC" "mechs/cossack C-1FC.gif"
exact "Cossack MAD-COS-3C" "mechs/Marauder.gif"
Expand Down Expand Up @@ -3255,7 +3257,7 @@ chassis "Rifleman II" "mechs/Rifleman II.gif"
chassis "Rifleman III" "mechs/Rifleman III.gif"
chassis "Roadrunner (Emerald Harrier)" "mechs/Roadrunner (Emerald Harrier).gif"
chassis "Ronin" "mechs/ronin.gif"
chassis "Rook" "mechs/rook.gif"
chassis "Rook" "mechs/Rook.gif"
exact "Rook NH-2" "mechs/Rook NH-2.gif"
exact "Rook NH-3X" "mechs/Rook NH-3X.gif"
chassis "Rokurokubi" "mechs/Rokurokubi.gif"
Expand Down Expand Up @@ -3408,6 +3410,7 @@ exact "Shugosha LAW-QM3 Q-Mech" "mechs/Shugosha LAW-QM3 Q-Mech.gif"
chassis "Silver Fox" "mechs/silverfox.gif"
chassis "Sirocco" "mechs/Sirocco.gif"
#chassis "Sky Blazer" " .gif"
chassis "Slagmaiden" "mechs/Slagmaiden.gif"
#chassis "Sledgehammer" " .gif"
chassis "Sling" "mechs/Sling.gif"
exact "Sling SL-1H" "mechs/Sling SL-1H.gif"
Expand Down Expand Up @@ -3752,7 +3755,9 @@ chassis "Ursus II" "mechs/Ursus II.gif"
chassis "Uziel" "mechs/Uziel.gif"
exact "Uziel UZL-3S" "mechs/Uziel UZL-3S.gif"
exact "Uziel UZL-8S" "mechs/Uziel UZL-8S.gif"
chassis "Valiant" "mechs/valiant.gif"
chassis "Valiant" "mechs/Valiant.gif"
exact "Valiant VLT-3E" "mechs/Valiant VLT-3E.gif"
exact "Valiant V4-LNT-J3" "mechs/Valiant V4-LNT-J3.gif"
chassis "Valkyrie" "mechs/Valkyrie VLK-QA.gif"
exact "Valkyrie VLK-QA" "mechs/Valkyrie VLK-QA.gif"
exact "Valkyrie VLK-QF" "mechs/Valkyrie VLK-QF.gif"
Expand Down Expand Up @@ -4034,6 +4039,7 @@ chassis "Delphyne" "protomechs/delphyne.gif"
chassis "Erinyes" "protomechs/Erinyes.png"
chassis "Gorgon" "protomechs/gorgon.gif"
chassis "Harpy" "protomechs/harpy.gif"
chassis "Hippogriff" "protomechs/Hippogriff.png"
chassis "Hobgoblin" "protomechs/Hobgoblin.png"
chassis "Hydra" "protomechs/hydra.gif"
chassis "Minotaur" "protomechs/minotaur.gif"
Expand Down
Binary file added megamek/data/images/units/protomechs/Hippogriff.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion megamek/data/mechfiles/mechs/3058Uu/Avatar AV1-O.mtf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ AV1-O
Config:Biped Omnimech
TechBase:Inner Sphere
Era:3056
Source:TRO 3058 Upgrade
Source:TRO 3058 - Clan Invasion
Rules Level:2

Mass:70
Expand Down
2 changes: 1 addition & 1 deletion megamek/data/mechfiles/mechs/3058Uu/Avatar AV1-OA.mtf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ AV1-OA
Config:Biped Omnimech
TechBase:Inner Sphere
Era:3056
Source:TRO 3058 Upgrade
Source:TRO 3058 - Clan Invasion
Rules Level:2

Mass:70
Expand Down
2 changes: 1 addition & 1 deletion megamek/data/mechfiles/mechs/3058Uu/Avatar AV1-OB.mtf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ AV1-OB
Config:Biped Omnimech
TechBase:Inner Sphere
Era:3056
Source:TRO 3058 Upgrade
Source:TRO 3058 - Clan Invasion
Rules Level:2

Mass:70
Expand Down
2 changes: 1 addition & 1 deletion megamek/data/mechfiles/mechs/3058Uu/Avatar AV1-OC.mtf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ AV1-OC
Config:Biped Omnimech
TechBase:Inner Sphere
Era:3056
Source:TRO 3058 Upgrade
Source:TRO 3058 - Clan Invasion
Rules Level:2

Mass:70
Expand Down
2 changes: 1 addition & 1 deletion megamek/data/mechfiles/mechs/3058Uu/Avatar AV1-OD.mtf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ AV1-OD
Config:Biped Omnimech
TechBase:Inner Sphere
Era:3060
Source:TRO 3058 Upgrade
Source:TRO 3058 - Clan Invasion
Rules Level:2

Mass:70
Expand Down
2 changes: 1 addition & 1 deletion megamek/data/mechfiles/mechs/3058Uu/Avatar AV1-OE.mtf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ AV1-OE
Config:Biped Omnimech
TechBase:Inner Sphere
Era:3062
Source:Civil War
Source:TRO 3058 - Civil War
Rules Level:2

Mass:70
Expand Down
2 changes: 1 addition & 1 deletion megamek/data/mechfiles/mechs/3058Uu/Avatar AV1-OF.mtf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ AV1-OF
Config:Biped Omnimech
TechBase:Inner Sphere
Era:3064
Source:Civil War
Source:TRO 3058 - Civil War
Rules Level:2

Mass:70
Expand Down
2 changes: 1 addition & 1 deletion megamek/data/mechfiles/mechs/3058Uu/Avatar AV1-OG.mtf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ AV1-OG
Config:Biped Omnimech
TechBase:Inner Sphere
Era:3056
Source:TRO 3058 Upgrade
Source:TRO 3058 - Clan Invasion
Rules Level:2

Mass:70
Expand Down
2 changes: 1 addition & 1 deletion megamek/data/mechfiles/mechs/3058Uu/Avatar AV1-OH.mtf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ AV1-OH
Config:Biped Omnimech
TechBase:Inner Sphere
Era:3069
Source:TRO 3058 Upgrade
Source:TRO 3058 - Jihad
Rules Level:2

Mass:70
Expand Down
2 changes: 1 addition & 1 deletion megamek/data/mechfiles/mechs/3058Uu/Avatar AV1-OI.mtf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ AV1-OI
Config:Biped Omnimech
TechBase:Inner Sphere
Era:3078
Source:TRO 3058 Upgrade
Source:TRO 3058 - Jihad
Rules Level:3

Mass:70
Expand Down
2 changes: 1 addition & 1 deletion megamek/data/mechfiles/mechs/3058Uu/Avatar AV1-OR.mtf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ AV1-OR
Config:Biped Omnimech
TechBase:Mixed (IS Chassis)
Era:3059
Source:TRO 3058 Upgrade
Source:TRO 3058 - Clan Invasion
Rules Level:4

Mass:70
Expand Down
2 changes: 1 addition & 1 deletion megamek/data/mechfiles/mechs/3058Uu/Battle Cobra A.mtf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ A
Config:Biped Omnimech
TechBase:Clan
Era:2873
Source:Succession Wars
Source:TRO 3058 - Succession Wars
Rules Level:2

Mass:40
Expand Down
2 changes: 1 addition & 1 deletion megamek/data/mechfiles/mechs/3058Uu/Battle Cobra B.mtf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ B
Config:Biped Omnimech
TechBase:Clan
Era:2873
Source:Succession Wars
Source:TRO 3058 - Succession Wars
Rules Level:2

Mass:40
Expand Down
2 changes: 1 addition & 1 deletion megamek/data/mechfiles/mechs/3058Uu/Battle Cobra BTL-C-2O.mtf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ BTL-C-2O
Config:Biped Omnimech
TechBase:Inner Sphere
Era:3063
Source:Civil War
Source:TRO 3058 - Civil War
Rules Level:2

Mass:40
Expand Down
2 changes: 1 addition & 1 deletion megamek/data/mechfiles/mechs/3058Uu/Battle Cobra BTL-C-2OA.mtf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ BTL-C-2OA
Config:Biped Omnimech
TechBase:Inner Sphere
Era:3063
Source:Civil War
Source:TRO 3058 - Civil War
Rules Level:2

Mass:40
Expand Down
2 changes: 1 addition & 1 deletion megamek/data/mechfiles/mechs/3058Uu/Battle Cobra BTL-C-2OB.mtf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ BTL-C-2OB
Config:Biped Omnimech
TechBase:Inner Sphere
Era:3063
Source:Civil War
Source:TRO 3058 - Civil War
Rules Level:2

Mass:40
Expand Down
2 changes: 1 addition & 1 deletion megamek/data/mechfiles/mechs/3058Uu/Battle Cobra BTL-C-2OC.mtf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ BTL-C-2OC
Config:Biped Omnimech
TechBase:Inner Sphere
Era:3063
Source:Civil War
Source:TRO 3058 - Civil War
Rules Level:2

Mass:40
Expand Down
2 changes: 1 addition & 1 deletion megamek/data/mechfiles/mechs/3058Uu/Battle Cobra BTL-C-2OD.mtf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ BTL-C-2OD
Config:Biped Omnimech
TechBase:Inner Sphere
Era:3069
Source:TRO 3058 Upgrade
Source:TRO 3058 - Jihad
Rules Level:2

Mass:40
Expand Down
2 changes: 1 addition & 1 deletion megamek/data/mechfiles/mechs/3058Uu/Battle Cobra BTL-C-2OE.mtf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ BTL-C-2OE
Config:Biped Omnimech
TechBase:Inner Sphere
Era:3070
Source:TRO 3058 Upgrade
Source:TRO 3058 - Jihad
Rules Level:2

Mass:40
Expand Down
2 changes: 1 addition & 1 deletion megamek/data/mechfiles/mechs/3058Uu/Battle Cobra BTL-C-2OF.mtf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ BTL-C-2OF
Config:Biped Omnimech
TechBase:Inner Sphere
Era:3070
Source:TRO 3058 Upgrade
Source:TRO 3058 - Jihad
Rules Level:2

Mass:40
Expand Down
2 changes: 1 addition & 1 deletion megamek/data/mechfiles/mechs/3058Uu/Battle Cobra C.mtf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ C
Config:Biped Omnimech
TechBase:Clan
Era:3062
Source:Civil War
Source:TRO 3058 - Civil War
Rules Level:2

Mass:40
Expand Down
2 changes: 1 addition & 1 deletion megamek/data/mechfiles/mechs/3058Uu/Battle Cobra F.mtf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ F
Config:Biped Omnimech
TechBase:Clan
Era:3057
Source:TRO 3058 Upgrade
Source:TRO 3058 - Clan Invasion
Rules Level:2

Mass:40
Expand Down
2 changes: 1 addition & 1 deletion megamek/data/mechfiles/mechs/3058Uu/Battle Cobra H.mtf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ H
Config:Biped Omnimech
TechBase:Clan
Era:3061
Source:Civil War
Source:TRO 3058 - Clan Invasion
Rules Level:2

Mass:40
Expand Down
2 changes: 1 addition & 1 deletion megamek/data/mechfiles/mechs/3058Uu/Battle Cobra Prime.mtf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ Prime
Config:Biped Omnimech
TechBase:Clan
Era:2873
Source:Succession Wars
Source:TRO 3058 - Succession Wars
Rules Level:2

Mass:40
Expand Down
2 changes: 1 addition & 1 deletion megamek/data/mechfiles/mechs/3058Uu/Battle Cobra X.mtf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ X
Config:Biped Omnimech
TechBase:Clan
Era:3073
Source:TRO 3058 Upgrade
Source:TRO 3058 - Jihad
Rules Level:4

Mass:40
Expand Down
2 changes: 1 addition & 1 deletion megamek/data/mechfiles/mechs/3058Uu/Black Hawk-KU BHKU-O.mtf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ BHKU-O
Config:Biped Omnimech
TechBase:Inner Sphere
Era:3055
Source:TRO 3058 Upgrade
Source:TRO 3058 - Clan Invasion
Rules Level:2

Mass:60
Expand Down
2 changes: 1 addition & 1 deletion megamek/data/mechfiles/mechs/3058Uu/Black Hawk-KU BHKU-OA.mtf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ BHKU-OA
Config:Biped Omnimech
TechBase:Inner Sphere
Era:3055
Source:TRO 3058 Upgrade
Source:TRO 3058 - Clan Invasion
Rules Level:2

Mass:60
Expand Down
2 changes: 1 addition & 1 deletion megamek/data/mechfiles/mechs/3058Uu/Black Hawk-KU BHKU-OB.mtf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ BHKU-OB
Config:Biped Omnimech
TechBase:Inner Sphere
Era:3055
Source:TRO 3058 Upgrade
Source:TRO 3058 - Clan Invasion
Rules Level:2

Mass:60
Expand Down
2 changes: 1 addition & 1 deletion megamek/data/mechfiles/mechs/3058Uu/Black Hawk-KU BHKU-OC.mtf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ BHKU-OC
Config:Biped Omnimech
TechBase:Inner Sphere
Era:3055
Source:TRO 3058 Upgrade
Source:TRO 3058 - Clan Invasion
Rules Level:2

Mass:60
Expand Down
2 changes: 1 addition & 1 deletion megamek/data/mechfiles/mechs/3058Uu/Black Hawk-KU BHKU-OD.mtf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ BHKU-OD
Config:Biped Omnimech
TechBase:Inner Sphere
Era:3055
Source:TRO 3058 Upgrade
Source:TRO 3058 - Clan Invasion
Rules Level:2

Mass:60
Expand Down
2 changes: 1 addition & 1 deletion megamek/data/mechfiles/mechs/3058Uu/Black Hawk-KU BHKU-OE.mtf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ BHKU-OE
Config:Biped Omnimech
TechBase:Inner Sphere
Era:3063
Source:Civil War
Source:TRO 3058 - Civil War
Rules Level:2

Mass:60
Expand Down
2 changes: 1 addition & 1 deletion megamek/data/mechfiles/mechs/3058Uu/Black Hawk-KU BHKU-OF.mtf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ BHKU-OF
Config:Biped Omnimech
TechBase:Inner Sphere
Era:3069
Source:TRO 3058 Upgrade
Source:TRO 3058 - Jihad
Rules Level:2

Mass:60
Expand Down
2 changes: 1 addition & 1 deletion megamek/data/mechfiles/mechs/3058Uu/Black Hawk-KU BHKU-OR.mtf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ BHKU-OR
Config:Biped Omnimech
TechBase:Mixed (IS Chassis)
Era:3059
Source:TRO 3058 Upgrade
Source:TRO 3058 - Clan Invasion
Rules Level:4

Mass:60
Expand Down
2 changes: 1 addition & 1 deletion megamek/data/mechfiles/mechs/3058Uu/Black Hawk-KU BHKU-OX.mtf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ BHKU-OX
Config:Biped Omnimech
TechBase:Inner Sphere
Era:3058
Source:TRO 3058 Upgrade
Source:TRO 3058 - Clan Invasion
Rules Level:4

Mass:60
Expand Down
2 changes: 1 addition & 1 deletion megamek/data/mechfiles/mechs/3058Uu/Black Lanner A.mtf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ A
Config:Biped Omnimech
TechBase:Clan
Era:3052
Source:TRO 3058 Upgrade
Source:TRO 3058 - Clan Invasion
Rules Level:2

Mass:55
Expand Down
2 changes: 1 addition & 1 deletion megamek/data/mechfiles/mechs/3058Uu/Black Lanner B.mtf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ B
Config:Biped Omnimech
TechBase:Clan
Era:3052
Source:TRO 3058 Upgrade
Source:TRO 3058 - Clan Invasion
Rules Level:2

Mass:55
Expand Down
2 changes: 1 addition & 1 deletion megamek/data/mechfiles/mechs/3058Uu/Black Lanner C.mtf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ C
Config:Biped Omnimech
TechBase:Clan
Era:3052
Source:TRO 3058 Upgrade
Source:TRO 3058 - Clan Invasion
Rules Level:2

Mass:55
Expand Down
Loading

0 comments on commit c0114a3

Please sign in to comment.