Commit Graph
588 Commits
Author SHA1 Message Date
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
Lesh fe7015a16d - new xml: SamSites.xml to customize game
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@555 4f8fa57e-7814-0410-bad4-adc449f26b7c
2006-10-31 20:15:20 +00:00
Wanne a3c7bb3add new exe (609)
- bugfix: Landmines
- bugfix: Got a "misplaced" I.M.P email on day 3
- bugfix: Laptop -> Personnel -> Inventory scroll buttons 
- changed max number of slots for towns (hardcoded value)
- highest town index defines the number of towns on map (user defined value via xml)
- updated cities.xml handling code so now it is possible to control can player train militia in town or not

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@554 4f8fa57e-7814-0410-bad4-adc449f26b7c
2006-10-30 20:21:58 +00:00
Starwalker 4f7e627af1 Four new guns added: M16A1, XM177-E1, CMMG 7.3, and OA-93
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@553 4f8fa57e-7814-0410-bad4-adc449f26b7c
2006-10-27 06:44:00 +00:00
Starwalker ca754ec86c Pics for four new guns added: M16A1, XM177-E1, CMMG 7.3, and OA-93
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@552 4f8fa57e-7814-0410-bad4-adc449f26b7c
2006-10-27 06:42:55 +00:00
Starwalker 5892cd546e Pics for four new guns added: M16A1, XM177-E1, CMMG 7.3, and OA-93
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@551 4f8fa57e-7814-0410-bad4-adc449f26b7c
2006-10-27 06:42:41 +00:00
Starwalker 8c9b55f1f5 Pics for four new guns: M16A1, XM177-E1, CMMG 7.3, and OA-93
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@550 4f8fa57e-7814-0410-bad4-adc449f26b7c
2006-10-27 06:42:08 +00:00
Starwalker 5902b5b360 Added HK416 to Small Scope list in attachments.xml (got lost somehow)
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@549 4f8fa57e-7814-0410-bad4-adc449f26b7c
2006-10-25 06:20:42 +00:00
Starwalker 4fe415642a Einführung Small Scope
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@548 4f8fa57e-7814-0410-bad4-adc449f26b7c
2006-10-24 08:49:12 +00:00
Lesh ddbc709bb4 - updated Cities.xml (with <townMilitiaAllowed> tags)
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@547 4f8fa57e-7814-0410-bad4-adc449f26b7c
2006-10-23 19:09:48 +00:00
Lesh c6e62f01d3 - updated Cities.xml (with <townMilitiaAllowed> tags)
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@546 4f8fa57e-7814-0410-bad4-adc449f26b7c
2006-10-23 19:09:04 +00:00
Wanne ac2f2fa83b new exe (602) & map editor (602)
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@545 4f8fa57e-7814-0410-bad4-adc449f26b7c
2006-10-14 05:31:21 +00:00
Lesh 812177ba09 - already migrated xmls were deleted
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@544 4f8fa57e-7814-0410-bad4-adc449f26b7c
2006-10-13 15:28:16 +00:00
Lesh f03125f93a - already migrated xmls were deleted
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@543 4f8fa57e-7814-0410-bad4-adc449f26b7c
2006-10-13 15:27:43 +00:00
Wanne 093d214d55 git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@542 4f8fa57e-7814-0410-bad4-adc449f26b7c 2006-10-12 16:00:31 +00:00
Lesh 127525af49 - new Cities.xml for game rev.598
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@541 4f8fa57e-7814-0410-bad4-adc449f26b7c
2006-10-10 18:37:38 +00:00