Commit Graph
653 Commits
Author SHA1 Message Date
Starwalker b752fc62f3 replaced pic of RPK-74 with new one by Marlboro Man
added pic of C7CT, made by Marlboro Man
added pics of two .454 Casull guns for later use, by Starwalker
added pics for 45rnd RPK-magazine and for .454 Casull ammo, all made by Marlboro Man

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@605 4f8fa57e-7814-0410-bad4-adc449f26b7c
2006-12-03 14:08:06 +00:00
Starwalker 29259a27ba replaced pic of RPK-74 with new one by Marlboro Man
added pic of C7CT, made by Marlboro Man
added pics of two .454 Casull guns for later use, by Starwalker
added pics for 45rnd RPK-magazine and for .454 Casull ammo, all made by Marlboro Man

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@604 4f8fa57e-7814-0410-bad4-adc449f26b7c
2006-12-03 14:07:27 +00:00
Starwalker c3ea83fd01 new pic (made by Marlboro Man) for FN F2000
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@603 4f8fa57e-7814-0410-bad4-adc449f26b7c
2006-11-28 17:31:50 +00:00
Starwalker ce7e10d480 new pic (made by Marlboro Man) for FN F2000
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@602 4f8fa57e-7814-0410-bad4-adc449f26b7c
2006-11-28 17:31:33 +00:00
Starwalker acc0eecb8c new pic (made by Marlboro Man) for FN F2000
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@601 4f8fa57e-7814-0410-bad4-adc449f26b7c
2006-11-28 17:28:42 +00:00
Starwalker b2839859ee made Sniper Scope and Reflex Sight incompatible for future projects.
changed available and built-in attachments of FN F2000.

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@600 4f8fa57e-7814-0410-bad4-adc449f26b7c
2006-11-28 17:27:23 +00:00
Starwalker 216bbe7d84 added German descriptions made by Malborex for the .45 Winchester Magnum ammo and pistols.
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@599 4f8fa57e-7814-0410-bad4-adc449f26b7c
2006-11-23 08:32:07 +00:00
Starwalker f937cef04c added some items to the game:
item 567    .45 Winchester Magnum magazine
item 568    .45 Winchester Magnum HP magazine
item 569    .45 Winchester Magnum AP magazine
item 766    Automag IV pistol
item 767    LAR Grizzly .45 WM pistol
item 768    Wildey Survivor pistol
item 920    M203 CLS grenade launcher

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@598 4f8fa57e-7814-0410-bad4-adc449f26b7c
2006-11-22 08:16:00 +00:00
Starwalker ecf3fc8d29 changed pic for LAR Grizzly .45 WM
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@597 4f8fa57e-7814-0410-bad4-adc449f26b7c
2006-11-22 08:12:53 +00:00
Starwalker 6457c993ea changed pic for LAR Grizzly .45 WM
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@596 4f8fa57e-7814-0410-bad4-adc449f26b7c
2006-11-22 08:12:20 +00:00
Starwalker 4a68490a68 added several ammo pics for later use:
528  .45 Winchester Magnum
529  .45 Winchester Magnum HP
530  .45 Winchester Magnum AP

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@595 4f8fa57e-7814-0410-bad4-adc449f26b7c
2006-11-21 08:12:10 +00:00
Starwalker 4c144470d5 added several ammo pics for later use:
528  .45 Winchester Magnum
529  .45 Winchester Magnum HP
530  .45 Winchester Magnum AP

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@594 4f8fa57e-7814-0410-bad4-adc449f26b7c
2006-11-21 08:11:52 +00:00
Starwalker 4e2f46054a added several ammo pics for later use:
528  .45 Winchester Magnum
529  .45 Winchester Magnum HP
530  .45 Winchester Magnum AP

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@593 4f8fa57e-7814-0410-bad4-adc449f26b7c
2006-11-21 08:11:07 +00:00
Starwalker 4f4ca94fb8 Trying to repair broken xml by uploading unopened version.
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@592 4f8fa57e-7814-0410-bad4-adc449f26b7c
2006-11-20 11:18:42 +00:00
Wanne 1844cd3e00 - fix: RUNTIME-ERROR after starting the game. The problem occured in ArmyComposition.xml in the comment block. "--" is not allowed in the comment block. Strange, don't ask me why ;-)
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@591 4f8fa57e-7814-0410-bad4-adc449f26b7c
2006-11-19 18:47:12 +00:00
Lesh 5294b6bc2d - comments on army externalization (3/3)
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@590 4f8fa57e-7814-0410-bad4-adc449f26b7c
2006-11-19 15:36:01 +00:00
Lesh b0ba2cc2c5 - comments on army externalization (3/3)
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@589 4f8fa57e-7814-0410-bad4-adc449f26b7c
2006-11-19 15:35:22 +00:00
Starwalker 32e6b78ceb added German descriptions made by Malborex for M16A1, XM177-E1, CMMG 7.3, and OA-93
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@588 4f8fa57e-7814-0410-bad4-adc449f26b7c
2006-11-17 08:33:33 +00:00
Lesh 75d4a7af50 - army xmls comments, files: 2 of 3
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@587 4f8fa57e-7814-0410-bad4-adc449f26b7c
2006-11-16 17:06:47 +00:00
Lesh 4e9ae8f27f - army xmls comments, files: 2 of 3
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@586 4f8fa57e-7814-0410-bad4-adc449f26b7c
2006-11-16 17:06:18 +00:00
Starwalker 0a8edfab4e replaced SPAS-15 pic with one made by Marlboro Man.
added several gun pics for later use:
276  Automag IV
277  LAR Grizzly .45WM
278  Wildey Survivor
279  KP m/31 Suomi
280  Colt Launcher System

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@585 4f8fa57e-7814-0410-bad4-adc449f26b7c
2006-11-16 07:52:09 +00:00
Starwalker 56465bddec replaced SPAS-15 pic with one made by Marlboro Man.
added several gun pics for later use:
276  Automag IV
277  LAR Grizzly .45WM
278  Wildey Survivor
279  KP m/31 Suomi
280  Colt Launcher System

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@584 4f8fa57e-7814-0410-bad4-adc449f26b7c
2006-11-16 07:51:52 +00:00
Starwalker 88f87fdc88 replaced SPAS-15 pic with one made by Marlboro Man.
added several gun pics for later use:
276  Automag IV
277  LAR Grizzly .45WM
278  Wildey Survivor
279  KP m/31 Suomi
280  Colt Launcher System

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@583 4f8fa57e-7814-0410-bad4-adc449f26b7c
2006-11-16 07:51:02 +00:00
Lesh 3c0ecee8a2 - army xml set added
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@582 4f8fa57e-7814-0410-bad4-adc449f26b7c
2006-11-14 14:26:34 +00:00
Lesh da4d340712 - army xml set added
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@581 4f8fa57e-7814-0410-bad4-adc449f26b7c
2006-11-14 14:26:14 +00:00
Starwalker 8069fc81ee added M16A1, XM177-E1, CMMG 7.3, and OA-93 to Tony's inventory.
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@580 4f8fa57e-7814-0410-bad4-adc449f26b7c
2006-11-14 08:15:33 +00:00
Starwalker da1d6e9d6b replaced M14 and Type 85 pics with those made by Marlboro Man
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@579 4f8fa57e-7814-0410-bad4-adc449f26b7c
2006-11-14 08:13:58 +00:00
Starwalker 63cd377449 replaced M14 and Type 85 pics with those made by Marlboro Man
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@578 4f8fa57e-7814-0410-bad4-adc449f26b7c
2006-11-14 08:13:43 +00:00
Starwalker 727e647c22 replaced M14 and Type 85 pics with those made by Marlboro Man
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@577 4f8fa57e-7814-0410-bad4-adc449f26b7c
2006-11-14 08:13:02 +00:00
Wanne 75a0116d72 new exe (631)
- bugfix: Endless clock after stealing
- bugfix: CTD after talking to Darren in San Mona (in the boxing club)
- bugfix: Wrong APs deduction from stealing
- bugfix: Prevent Nada objects from stealing
- bugfix: CTD when trying to add 13th town
- changed: APs for stealing from 10 to 14 (because stealing is more than simple picking enemies gun)
- changed: You cannot steal items from head, body, leg or face until the enemy is collapsed (lying on the ground)
- changed: Tooltips on the enemy are only displayed if the enemy can be seen by the selected merc
- preparations to increase number of town sectors

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@576 4f8fa57e-7814-0410-bad4-adc449f26b7c
2006-11-13 08:45:08 +00:00
Starwalker e250ff6b2e replaced some SIG pistol pics with those made by Terry Thorne
replaced SIG 55X pics with those made by Terry Thorne
replaced HK G3KA4 pic with one made by Terry Thorne

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@575 4f8fa57e-7814-0410-bad4-adc449f26b7c
2006-11-13 08:08:59 +00:00
Starwalker 2427eae0f6 replaced some SIG pistol pics with those made by Terry Thorne
replaced SIG 55X pics with those made by Terry Thorne
replaced HK G3KA4 pic with one made by Terry Thorne

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@574 4f8fa57e-7814-0410-bad4-adc449f26b7c
2006-11-13 08:07:48 +00:00
Starwalker e76d664e54 removed ability to mount Retractable Stock to QBZ-97, which is a bullpup rifle!
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@573 4f8fa57e-7814-0410-bad4-adc449f26b7c
2006-11-13 08:05:42 +00:00
Wanne a0c4ab36f3 git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@572 4f8fa57e-7814-0410-bad4-adc449f26b7c 2006-11-12 16:24:02 +00:00
Wanne 40d66c4f16 git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@571 4f8fa57e-7814-0410-bad4-adc449f26b7c 2006-11-11 09:21:57 +00:00
Wanne f89d890416 git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@570 4f8fa57e-7814-0410-bad4-adc449f26b7c 2006-11-09 19:38:01 +00:00
Starwalker bc517d59f9 replaced small pics for HK SL8 and Thompson M1A1 with new ones made by Marlboro Man
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@569 4f8fa57e-7814-0410-bad4-adc449f26b7c
2006-11-09 07:46:39 +00:00
Starwalker 8a53252a12 replaced interface pics for HK SL8 and Thompson M1A1 with new ones made by Marlboro Man
replaced interface pics for Micro-Uzi, Mini-Uzi, Tavor, and Uzi with new ones made by Terry Thorne

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@568 4f8fa57e-7814-0410-bad4-adc449f26b7c
2006-11-09 07:45:22 +00:00
Starwalker 6ce1ebec61 replaced big pics for HK SL8 and Thompson M1A1 with new ones made by Marlboro Man
replaced big pics for Bizon, M16A1, Micro-Uzi, Mini-Uzi, Saiga, SIG Pro, Tavor, and Uzi with new ones made by Terry Thorne

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@567 4f8fa57e-7814-0410-bad4-adc449f26b7c
2006-11-09 07:43:58 +00:00
Starwalker 5b57a86f17 added .357 Magnum AET ammo to Tony's inventory
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@566 4f8fa57e-7814-0410-bad4-adc449f26b7c
2006-11-09 07:38:03 +00:00
Starwalker 3c9134a6dd corrected price for .357 Magnum AET ammo
corrected explanation of 'SIG' in one gun description

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@565 4f8fa57e-7814-0410-bad4-adc449f26b7c
2006-11-09 07:37:08 +00:00
Wanne 33eae3242d git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@564 4f8fa57e-7814-0410-bad4-adc449f26b7c 2006-11-08 21:28:08 +00:00
Wanne 75abcc9375 new exe (620)
- bugfix: CTDs after you have placed your mercs before the attacking occurs
- bugfix: CTD when trying to recruit John & Mary and there is only one free place left in the whole team
- bugfix: fixed issue with visibility of enemies after raising scoped gun (no need to look twice anymore) and versa
- reseted IMP activation text box after creating an IMP
- added notification when you try to create a new IMP and you already have the maximum number of mercs (18) in your team

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@563 4f8fa57e-7814-0410-bad4-adc449f26b7c
2006-11-06 21:13:20 +00:00
Starwalker 9aa4981436 Small pics for .357 Magnum AET ammo.
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@562 4f8fa57e-7814-0410-bad4-adc449f26b7c
2006-11-06 08:43:51 +00:00
Starwalker d03419b42f Added .357 Magnum AET ammo (both magazine and speedloader)
Tagged 20mm and 25mm grenade ammo as SciFi, because the relevant launchers are tagged as SciFi as well.

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@561 4f8fa57e-7814-0410-bad4-adc449f26b7c
2006-11-06 08:41:01 +00:00
Starwalker b4b0196e04 Interface pics for the new .357 Magnum AET ammo
Interface pic for OA-93 reworked.

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@560 4f8fa57e-7814-0410-bad4-adc449f26b7c
2006-11-06 08:38:11 +00:00
Starwalker 2daee5d2f7 Large pics for the new .357 Magnum AET ammo
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@559 4f8fa57e-7814-0410-bad4-adc449f26b7c
2006-11-06 08:02:58 +00:00
Starwalker a1c6569fad The four new guns added to enemygunchoices: M16A1, XM177-E1, CMMG 7.3, and OA-93
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@558 4f8fa57e-7814-0410-bad4-adc449f26b7c
2006-11-03 08:54:36 +00:00
Wanne fcf8c0e8be new exe (614)
- bugfix: CTDs in Drassen tactical screen

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@557 4f8fa57e-7814-0410-bad4-adc449f26b7c
2006-11-02 22:49:26 +00:00
Lesh ca2b2a49e3 - new xml: SamSites.xml to customize game
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@556 4f8fa57e-7814-0410-bad4-adc449f26b7c
2006-10-31 20:15:48 +00:00