Commit Graph
246 Commits
Author SHA1 Message Date
Wanne 2a4a71d0b1 - New Feature: Rifle Sling (by Flugente)
o This attachment fits most ARs, Rifles and SMGs. When attached, moving the gun from the main hand to the rifle sling slot does not cost APs when 'Inventory Manipulation costs AP' is turned on.
o When a merc would drop his gun because of damage taken, it is instead moved to the rifle sling slot if possible.
o A gun in the main hand or rifle sling slot cannot be stolen when a rifle sling is attached.

- Proper picture for Tripwire (by smeagol)

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1403 4f8fa57e-7814-0410-bad4-adc449f26b7c
2012-04-13 08:20:12 +00:00
Wanne 531f4134c3 - New Feature: Allow attaching and using underbarrel weapons (by Flugente & JMich, Pics by smeagol)
o Updated XML files and added new KAC masterkey which can be used as an underbarrel weapon
o Raider and Kelly have one in their starting kit 4 

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1380 4f8fa57e-7814-0410-bad4-adc449f26b7c
2012-04-01 15:38:40 +00:00
Wanne b2caea497a MERGED source game dir files from development trunk revision 4890 up to latest current revision 5105
Development Trunk (now obsolete): https://ja2svn.dyndns.org/source/ja2/branches/Wanne/JA2%201.13%20MP
A detailed list of all the features (changes) is visible in the history log of the development trunk:

- New JA/DG Merc: Version 2.9
o Up to 20 new characters with complete speech from JA/DG
o see JA2_DG_Merc.txt for more infos

- A few more adjustments to the GameDir files

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1365 4f8fa57e-7814-0410-bad4-adc449f26b7c
2012-03-23 20:30:23 +00:00
Starwalker 9acefd26c2 changed pics back to old pics, because the new ones had the wrong dimensions
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1312 4f8fa57e-7814-0410-bad4-adc449f26b7c
2011-07-13 11:57:02 +00:00
Starwalker 90203e1343 added new graphics of Lasersight, LAM, Sniper Scope, ACOG, ACOG-Combo, and Reflex Sight (all made by Exurok22)
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1304 4f8fa57e-7814-0410-bad4-adc449f26b7c
2011-06-08 09:58:41 +00:00
Starwalker 15e17dfa8a exchanged ammocrate pictures with better ones made by Smeagol
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1271 4f8fa57e-7814-0410-bad4-adc449f26b7c
2011-02-21 10:33:13 +00:00
Starwalker 1f3eac16b3 added big pics of single 43mm grenades (ChrisL)
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1255 4f8fa57e-7814-0410-bad4-adc449f26b7c
2010-12-06 09:47:54 +00:00
Starwalker f4bff25368 big pics for 9x18 Glaser ammo added
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1250 4f8fa57e-7814-0410-bad4-adc449f26b7c
2010-11-30 15:45:24 +00:00
Starwalker 4905ee1517 added pics for new .38Spc ammunition.
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1244 4f8fa57e-7814-0410-bad4-adc449f26b7c
2010-10-25 13:13:56 +00:00
Starwalker 82e48cbf3c added some item pics from Unfinished Business, for later addition of those items.
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1229 4f8fa57e-7814-0410-bad4-adc449f26b7c
2010-08-30 08:37:41 +00:00
Starwalker 19d9c1ebb8 added pic for Beretta Cx4 Storm
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1219 4f8fa57e-7814-0410-bad4-adc449f26b7c
2010-04-01 06:34:21 +00:00
Starwalker b2be32b66d added pic of choke (Tbird)
added pics of subsonic 7.62x39mm ammo

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1200 4f8fa57e-7814-0410-bad4-adc449f26b7c
2009-10-22 07:47:57 +00:00
Starwalker e6bbb0d59c added some 5.45x39mm cold ammo pics
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1193 4f8fa57e-7814-0410-bad4-adc449f26b7c
2009-09-16 09:13:03 +00:00
Starwalker 6813c7138b repaired 9mm AP-Cold pic (had been missing asterisk)
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1187 4f8fa57e-7814-0410-bad4-adc449f26b7c
2009-08-31 08:43:54 +00:00
Starwalker 932de87b64 replacement pics for some guns and ammo (Kaerar & Tbird)
pics for AR57-series (Kaerar)

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1168 4f8fa57e-7814-0410-bad4-adc449f26b7c
2009-07-07 11:18:32 +00:00
Starwalker 98572938c0 added ammo pics made by Kaerar
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1151 4f8fa57e-7814-0410-bad4-adc449f26b7c
2009-06-24 08:09:43 +00:00
Starwalker bf33d64a52 added pic of Kimber Eclipse (Tbird)
added pic of FN HP-35 (Coolberg)

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1144 4f8fa57e-7814-0410-bad4-adc449f26b7c
2009-06-09 11:21:04 +00:00
Starwalker b003cbb60b color correction on ammo pic
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1120 4f8fa57e-7814-0410-bad4-adc449f26b7c
2009-04-22 07:28:26 +00:00
Starwalker 2fa783d6ce added pics for some ammo (9x18mm AP and 7.62x54mm Match)
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1118 4f8fa57e-7814-0410-bad4-adc449f26b7c
2009-04-22 07:20:45 +00:00
Starwalker ed78800ed5 new pics for 2 existing revolvers (Coolberg)
new pics for C1 and C4 (KenNoOni, adjusted by Coolberg)

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1103 4f8fa57e-7814-0410-bad4-adc449f26b7c
2009-04-01 06:42:21 +00:00
Starwalker 7cedb2f8db replaced two revolver pics and added two new ones, all by Coolberg
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1095 4f8fa57e-7814-0410-bad4-adc449f26b7c
2009-03-12 11:08:06 +00:00
Starwalker f55ec75ec4 replaced some launcher pics (Coolberg)
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1082 4f8fa57e-7814-0410-bad4-adc449f26b7c
2009-02-02 12:21:39 +00:00
Starwalker 8d4ebe850b added temporary pics for new illumination/smoke items
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1074 4f8fa57e-7814-0410-bad4-adc449f26b7c
2009-01-29 07:38:04 +00:00
Starwalker a02c68cea7 New grenade/rocket launcher pics (Coolberg)
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1058 4f8fa57e-7814-0410-bad4-adc449f26b7c
2008-12-01 11:54:23 +00:00
Starwalker 22be8193af 4 updated shotgun pics by Coolberg
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1047 4f8fa57e-7814-0410-bad4-adc449f26b7c
2008-10-30 07:58:51 +00:00
Starwalker ead57f8f86 pics uploaded earlier contained artefacts :-(
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1043 4f8fa57e-7814-0410-bad4-adc449f26b7c
2008-10-02 09:20:23 +00:00
Starwalker e6d9edcfa0 3 new FN pistol pics (Jimmy)
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1040 4f8fa57e-7814-0410-bad4-adc449f26b7c
2008-10-02 09:14:21 +00:00
Starwalker ba022cb0db New Thompson M1928 pics (Marlboro Man)
New Thompson Drums (KenNoOni)

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1028 4f8fa57e-7814-0410-bad4-adc449f26b7c
2008-07-23 14:29:57 +00:00
Starwalker bb350f7c20 revolver pics added
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1022 4f8fa57e-7814-0410-bad4-adc449f26b7c
2008-07-01 15:13:38 +00:00
Starwalker 0298cffbf8 double entry of gun277.sti deleted
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1015 4f8fa57e-7814-0410-bad4-adc449f26b7c
2008-05-31 16:21:27 +00:00
Starwalker 18ad58a6a0 added/replaced some gun/item pics
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1012 4f8fa57e-7814-0410-bad4-adc449f26b7c
2008-05-31 15:01:25 +00:00
Starwalker 8ca8b03489 replaced Type 85 and 30rnd 7.62x25mm mag pictures with new ones made by Hruza
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@991 4f8fa57e-7814-0410-bad4-adc449f26b7c
2008-04-24 09:19:13 +00:00
Starwalker 5b196badc9 replaced SAW Pouch pic (Marlboro Man)
replaced Triggergroup pic (Tbird)
added S&W M29 SATAN pic (Tbird)

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@979 4f8fa57e-7814-0410-bad4-adc449f26b7c
2008-04-09 06:51:05 +00:00
Starwalker 5518a9ee87 replaced M14, M21 and Desert Eagle pics (Kaerar)
added gun pics for later use (Kaerar)
added item pics for later use
added red stripe to some 7.62x25mm ammo pics to better show their type

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@976 4f8fa57e-7814-0410-bad4-adc449f26b7c
2008-04-04 11:13:47 +00:00
Starwalker 12abcba3cd added three new LBE item graphics (re-assembled some of Marlboro Man's work)
removed some of the upper background of the Barrett M82A2, so that it is displayed higher at BR's

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@963 4f8fa57e-7814-0410-bad4-adc449f26b7c
2008-03-17 09:12:12 +00:00
Starwalker fe12a275f7 replaced MP-133 pic (Coolberg)
added two Fabarm Shotgun pics for later use (Coolberg)
added 7.62x39mm Drum Adapter pic (KenNoOni)
added several ammo crate pics as stand-ins for testing purposes (not final pics)

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@940 4f8fa57e-7814-0410-bad4-adc449f26b7c
2008-03-03 14:04:18 +00:00
Starwalker 1f0da96faa replaced Baikal MP-233 pic (Coolberg)
added 30rnd Veresk mag pic (Coolberg)
added Veresk pic (Coolberg)
replace Ceramic and Titanium Plate pics (KenNoOni)

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@933 4f8fa57e-7814-0410-bad4-adc449f26b7c
2008-02-12 08:16:18 +00:00
Starwalker 5ba405493f added Pipe Wrench pic (Kaerar)
added camoed Barret pic (Kaerar)
added another SL8-version (Kaerar)
replaced HK G11 PDW pic (Kaerar)

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@925 4f8fa57e-7814-0410-bad4-adc449f26b7c
2008-01-21 09:34:05 +00:00
Starwalker c2c6ad2a28 replaced pic of NADA items (Marlboro Man)
replaced pic of Retractable Baton (Marlboro Man)
replaced pic of Flash Suppressor (Tbird)
added pics for later use in NewInv (Marlboro Man)

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@919 4f8fa57e-7814-0410-bad4-adc449f26b7c
2007-12-11 08:50:11 +00:00
Starwalker 51d16f298d changed all Automag pics (new ones by Tbird)
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@915 4f8fa57e-7814-0410-bad4-adc449f26b7c
2007-11-27 14:20:50 +00:00
Starwalker 1a85513e0c replaced pics of HiCap Colt pistol, FR-F2, and M224 Mortar (Tbird)
NADA items will keep the old mortar pic.

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@911 4f8fa57e-7814-0410-bad4-adc449f26b7c
2007-11-15 07:52:50 +00:00
Starwalker 03dd46e021 replaced pics of Remington, Ithaca, and Street Sweeper shotguns (Coolberg)
added pic of another LBE-vest

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@907 4f8fa57e-7814-0410-bad4-adc449f26b7c
2007-11-05 07:16:24 +00:00
Starwalker 46550af620 added MC51 pic for later use (Tbird)
added Flare pic for later use (Kaerar)
replaced Sungoggles pic (Marlboro Man)
replaced M79 and Blaser pics (Marlboro Man)
replaced Franchi and Benelli Shotgun pics (Coolberg)
replaced PPsh41 pic (Coolberg)
replaced BigItem pics of G36 family (Coolberg)

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@903 4f8fa57e-7814-0410-bad4-adc449f26b7c
2007-11-01 08:29:48 +00:00
Starwalker 84ade6ce08 replaced HK SL8 pic (Coolberg)
added several gun pics for later use (Tbird)
added a new pic for Rifle LAM/Flashlight combo (but old pic stays as well, if needed for UC)

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@898 4f8fa57e-7814-0410-bad4-adc449f26b7c
2007-10-18 07:07:07 +00:00
Starwalker 1df54ecdd1 replaced pics of Ruger Mini 14, Winchester 94, M1 Garand, Mosin-Nagant, Kar 98k, and Mauser M03 (Coolberg)
replaced pics of M72 LAW and HK SL9SD (Tbird)
replaced several LBE-item pics (Marlboro Man)

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@892 4f8fa57e-7814-0410-bad4-adc449f26b7c
2007-10-12 06:52:15 +00:00
Starwalker a3cb3c71b8 missing pics for new items :-(
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@891 4f8fa57e-7814-0410-bad4-adc449f26b7c
2007-10-01 12:02:25 +00:00
Starwalker e70708c712 replaced G36 family pics (Coolberg)
added MG36 and MG36-RAS pics in addition to replacement mentioned above (Coolberg)
added pics of G36 kits for later use
changed name of G36/G36K Tactical to G36/G36K RAS
added pics of LBE-items
increased damage of .357M and 10mmAuto guns by 1, decreased damage of .45ACP guns by 1
updated New Inventory definition XML-files (same as on FTP-site)

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@879 4f8fa57e-7814-0410-bad4-adc449f26b7c
2007-09-18 06:55:30 +00:00
Starwalker 39a9f56422 changed the new explosive internal item from #995 to #270, so I can use the same in the Data-folder for vanilla JA2 (a hardcoded pointer uses this item).
changed description of Beowulf Rifle
increased range of Mosin Nagant to 600m
replaced pics of SKS and AKMSU (Tbird) and of MG3 (Buren)
added several gun pics (Tbird) and LBE-item pics (Marlboro Man) for later use

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@875 4f8fa57e-7814-0410-bad4-adc449f26b7c
2007-09-13 08:28:29 +00:00
Starwalker 0de88bd851 Added three new SMG pics (MAT-49, SIG MP41, Spectre M4) by Tbird
changed BigItem pics of Luger and Alaskan

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@869 4f8fa57e-7814-0410-bad4-adc449f26b7c
2007-09-09 12:10:22 +00:00
Starwalker 776ee3352b changed pics for 20mm and 25mm grenade magazines to new pics made by Briareos
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@855 4f8fa57e-7814-0410-bad4-adc449f26b7c
2007-08-17 06:45:12 +00:00