7621 Commits
Author SHA1 Message Date
lalien 76d67f37e9 - removed beta version build define
- allowed helicopter to land in enemy controlled sector
- SHIFT+N now can use goggles attached to the helmet

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@901 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2007-05-29 11:57:10 +00:00
Sergeant_Kolja 09a26e3155 in ReadInAttachmentComboMergeStats() added a missing fclose plus a missing XML_free
in Items.cpp added unfriendly code to trace + stop the game when pObj is corrupted.
(the corruption comes from somewhere outside the destructed foo!)


git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@900 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2007-05-27 12:34:43 +00:00
Wanne bd22863e45 - bugfix: If merc is in crouched stance and he passes an item to another merc, he did not change his direction
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@895 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2007-05-23 18:41:42 +00:00
Starwalker a45476d56c Somehow this pic got deleted during the last upload :-(
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@814 4f8fa57e-7814-0410-bad4-adc449f26b7c
2007-05-23 13:53:59 +00:00
Starwalker 4c9bc82795 Coolberg improved his SIG pistol pics
added Tbird's SIG SAS pistols and his Luger pistol

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@813 4f8fa57e-7814-0410-bad4-adc449f26b7c
2007-05-23 13:49:13 +00:00
Wanne 4effa1c3ea - new: Merged source code of item throwing animation in crouched stance, AI was not changed (look for comments marked <SB>)
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@890 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2007-05-21 18:09:15 +00:00
Wanne 855c66a42d - added the new item throwing animations in crouched stance
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@812 4f8fa57e-7814-0410-bad4-adc449f26b7c
2007-05-21 18:06:55 +00:00
Wanne d61f4ff935 - new exe build (888)
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@889 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2007-05-21 14:59:40 +00:00
Wanne 34a683cacb - new: Externalized sector loadscreens to TableData\Map\SectorLoadscreens.xml (Ja2_Options.INI Setting: USE_EXTERNALIZED_LOADSCREENS)
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@810 4f8fa57e-7814-0410-bad4-adc449f26b7c
2007-05-21 14:32:11 +00:00
Wanne 76cf1684f1 - new: Externalized sector loadscreens to TableData\Map\SectorLoadscreens.xml (INI-Switch: USE_EXTERNALIZED_LOADSCREENS)
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@887 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2007-05-21 14:29:52 +00:00
Starwalker b7a2705f3f corrected the non-transparent background of gun08.sti
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@809 4f8fa57e-7814-0410-bad4-adc449f26b7c
2007-05-20 15:48:50 +00:00
Starwalker 11b36e793d added a ton of armors: Thanks to ChrisL's work (both XML-work and graphics), we now can treat/coat the advanced armor items.
added a point of accuracy to hi-cap Colt pistol

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@808 4f8fa57e-7814-0410-bad4-adc449f26b7c
2007-05-20 14:47:43 +00:00
Starwalker 7f72bc8b7b added new armor graphics
added Galil Sniper pic (Coolberg)
added Luger and Steyr IWS 2000 pics (Tbird)
replaced Colt pistol pics with those made by Tbird
replaced AICW pic with one made by Tbird

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@807 4f8fa57e-7814-0410-bad4-adc449f26b7c
2007-05-20 14:40:52 +00:00
MaddMugsy d1f2c96949 -removed three references to "Nothing" items from Tony's Inventory (462, 468, 474). File re-indexed :)
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@804 4f8fa57e-7814-0410-bad4-adc449f26b7c
2007-05-18 18:43:44 +00:00
SpaceViking 102bfd1469 Another missing entry
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@802 4f8fa57e-7814-0410-bad4-adc449f26b7c
2007-05-18 01:30:15 +00:00
SpaceViking a62ac737bd Add missing line back so Tony has full inventory.
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@801 4f8fa57e-7814-0410-bad4-adc449f26b7c
2007-05-17 23:14:11 +00:00
Starwalker 5eecc32027 added new guns and magazines to Tony's inventory
added First Responder Kit to Howard's inventory

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@800 4f8fa57e-7814-0410-bad4-adc449f26b7c
2007-05-15 14:36:35 +00:00
Starwalker ccf3c261ea added Barrett M468, Bushmaster M4A3, and Robarms XCR-1
changed Steyr AUG-HBAR to use 42rnd mags (lost capability to use C-mag adapter in the process, or strange things would occur)
added 42rnd mags for Steyr AUG-HBAR
changed draw on some SCAR SV-variants, had overlooked my own correctly calculated values and used the wrong ones earlier... :-(
added Thor's First Responder Kit, for storing a few medical items.

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@799 4f8fa57e-7814-0410-bad4-adc449f26b7c
2007-05-15 14:35:22 +00:00
Starwalker b3ba37920b replaced Super Shorty pic with one made by Marlboro Man
added several armor pics for later use (much more to come), made by ChrisL

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@798 4f8fa57e-7814-0410-bad4-adc449f26b7c
2007-05-15 14:30:16 +00:00
Wanne 2ee08ea1c0 - bugfix: Automated scrolling if you talk to someone in small maps (e.g: Rebel Basement) in high resolution (1024x768)
- bugfix: Scrolling problem in radar map in small maps (e.g: Rebel Basement) in high resolution (1024x768)

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@875 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2007-05-14 16:07:06 +00:00
lalien 9b89749d8f - fix for Russian version
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@874 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2007-05-11 20:07:47 +00:00
Starwalker 50f359b102 replaced pics of Skorpion vz82, Walther MPL, and Steyr TMP with pics made by Coolberg
added pics oc Barrett M468, Bushmaster M4A3, and Robarms XCR-1 for later use
added pic of Thor's First Response Kit
added pic of 5-round .50BMG mag for use in UC (wil) and other mods (no gun for this mag in basic v1.13 at this moment)

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@793 4f8fa57e-7814-0410-bad4-adc449f26b7c
2007-05-11 10:07:29 +00:00
Wanne 5661efc75b - new exe build (872)
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@872 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2007-05-09 20:38:22 +00:00
lalien 0530b53b9c bug fixes from Overhaul:
- Data type changes 
- Templates removed

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@871 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2007-05-09 13:16:37 +00:00
lalien 61d6152ce5 bug fixes from Overhaul:
- Disappearing corpses (and possibly items) when cursor hovers over a square on the rooftop; also fixes a "write to freed memory" heap check
- Fixed improper printf field in a debug message 

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@870 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2007-05-08 22:44:08 +00:00
lalien 8e80a6168a bug fixes from Overhaul:
- roof inaccessible tiles problem
- AI hang while deciding on an action (fire 0 rounds on auto)


git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@868 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2007-05-08 15:10:29 +00:00
lalien 30cc546c09 bug fixes from Overhaul:
- CTD when someone fell off the west side of a building 
- Assertion failure when Skyrider leaves a sector where a merc cannot be woken up 
- Boxing fixes: Opponent no longer "seeks cover", ie jumps back out of the ring; no longer will pick up a gun from the ground while boxing
- Disappearing corpses (and possibly items) when cursor hovers over a square on the rooftop; also fixes a "write to freed memory" heap check

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@867 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2007-05-08 14:42:28 +00:00
Starwalker 6acedece52 added a missing merge with the SCAR-WP SV Barrel
added further merges to exchange the barrel in a SCAR Conversion Kit
added ability to mount Kobra on Bizon SMG
corrected a typo in one of the SCAR-WP Conversion Kit descriptions
changed sound of Steyr ACR, because the sound of falling brass does not go well with synthetic cartridge cases ;-)

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@789 4f8fa57e-7814-0410-bad4-adc449f26b7c
2007-05-08 09:39:50 +00:00
Starwalker c943b34c94 added/deleted some new items from inventories (deleted entries were due to copying items)
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@788 4f8fa57e-7814-0410-bad4-adc449f26b7c
2007-05-06 08:23:52 +00:00
Starwalker a86c8d1ac2 added new SCARs in 6.8mm SPC and 7.62x39mm.
added SCAR conversion kits
added 6.8x43mm SPC ammo (HP and AP)
activated Steyr ACR and its ammo
deactivated HK MP5/10SD3 and 10mm DU ammo
added HK MP5/40A3 and SMG ammo
raised ammo capacity of Micro-Uzi to 30
added Thor's Katana, Nunchaku, and Shuriken (also to IMP-Item choices)

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@787 4f8fa57e-7814-0410-bad4-adc449f26b7c
2007-05-06 08:22:44 +00:00
Starwalker 2a0d7fd805 added pics of Thor's 3 martial arts items
added .40 S&W SMG mag pics made by Coolberg
replaced Uzi pics with new ones made by Coolberg

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@786 4f8fa57e-7814-0410-bad4-adc449f26b7c
2007-05-05 15:43:17 +00:00
Sergeant_Kolja 840a61f5c8 Gameboy can made to Lameboy display, again.
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@783 4f8fa57e-7814-0410-bad4-adc449f26b7c
2007-05-05 05:36:45 +00:00
Starwalker 79f778491b replaced MP5 family with Coolberg's pics (except MP5/10SD3)
replaced MP7 with Coolberg's pic
added Coolberg's MP5/40 pic
replaced Walther P99 with Coolberg's pic
replaced 10mm SMG mag pics with Coolberg's pics
added 42rnd mag pics for AUG (pics made by Wil)
added new SCAR version pics (including conversion kits)

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@782 4f8fa57e-7814-0410-bad4-adc449f26b7c
2007-05-03 11:20:06 +00:00
Wanne 91016c3d6c - reverted: Reverted the changes from version 856, because I think this leads to the graphical glitches with tooltips in Strategy screen. But I'm not sure if it is the problem ...
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@864 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2007-04-28 20:03:41 +00:00
Wanne a1a3487b2b - bugfix: Text placement in insurance laptop pages in higher resolutions
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@863 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2007-04-28 19:44:03 +00:00
lalien 60b6b85801 Strategic AI changes:
- Removed Omerta from the list of "unimportant" sectors (Estoni and San Mona still "unimportant")
- Allowed queen to attack Omerta before day 2 at 7:45AM and Drassen before day 3 at 6:30AM
- The reinforcements are not reassigned anymore when the sector where they were going to is captured by player
- Omerta garrison is not reassigned anymore when queen fortifies cities
- Enabled investigation of lost city sector by the enemy 
*Limit for the investigation of the sector depends on difficulty level (4, 8, 12 and unlimited on INSANE)

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@861 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2007-04-27 21:30:59 +00:00
lalien 4689f95a7b Added ini options for strategic AI
- The reinforcements are not reassigned anymore when the sector where they were going to is captured by player
- Investigation of lost city sector by the enemy 


git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@779 4f8fa57e-7814-0410-bad4-adc449f26b7c
2007-04-27 21:05:08 +00:00
AcyForsythe d8ed7117f0 - Adding XML_Roaming.cpp to project
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@860 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2007-04-27 20:52:43 +00:00
Starwalker 0f9417b7c9 added Heavy Throwing Knife to Tony's inventory
added .45 ACP Drums to Tony's inventory

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@778 4f8fa57e-7814-0410-bad4-adc449f26b7c
2007-04-26 09:42:16 +00:00
Starwalker 25dfe1388c changed Colt Delta Elite to small slot
changed FN EGLM to draw pics from P1ITEM
removed Foregrip attachability from Glock 19 (made no sense on that gun)
added Heavy Throwing Knife to Tony's inventory
added .45 ACP Drums to Tony's inventory
added Steyr ACR, but DEACTIVATED it, because it is not ready yet
added Steyr ACR magazine, but DEACTIVATED it, because it is not ready yet

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@777 4f8fa57e-7814-0410-bad4-adc449f26b7c
2007-04-26 09:41:51 +00:00
Starwalker 7f38c74dbe replaced Colt Delta Elite pic with a new pic that does not show a compensator
added Steyr ACR magazine pic
added FN EGLM as P1ITEM pic instead of GUN pic

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@774 4f8fa57e-7814-0410-bad4-adc449f26b7c
2007-04-26 09:34:15 +00:00
AcyForsythe de6c87675c - Added INI options for RESTRICT_ROAMING and REVEAL_ITEMS_AFTER_COMBAT
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@773 4f8fa57e-7814-0410-bad4-adc449f26b7c
2007-04-25 23:09:00 +00:00
AcyForsythe 80d4c7ae4b - Added INI options for RESTRICT_ROAMING and REVEAL_ITEMS_AFTER_COMBAT
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@772 4f8fa57e-7814-0410-bad4-adc449f26b7c
2007-04-25 23:00:05 +00:00
AcyForsythe 48c5a4e1ab git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@859 3b4a5df2-a311-0410-b5c6-a8a6f20db521 2007-04-25 22:50:42 +00:00
AcyForsythe e95a6463ad - Added INI options for RESTRICT_ROAMING and REVEAL_ITEMS_AFTER_COMBAT
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@858 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2007-04-25 22:46:27 +00:00
AcyForsythe f9fe75d5e7 - Added INI options for RESTRICT_ROAMING and REVEAL_ITEMS_AFTER_COMBAT
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@857 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2007-04-25 22:45:10 +00:00
Sergeant_Kolja 1af4970bc9 Merges: All Types of T-Shirts now can be cut to Rags (for Molotovs) with any non-throwing Knife. Officers Coat can also be cut. Bloody knifes can be cleaned with a Rag.
German.Items: corrected some Grammar, Corrected U-238 to U-235, squeezed Dyneema descriptions (too long for BR), Improved Text for old Aimpoint.
ATN: I did _NOT_ checked, if U-238 is also wrong in English!
ATN: Gameboy + Copper still don't work. Not found the Bug for now :-(


git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@771 4f8fa57e-7814-0410-bad4-adc449f26b7c
2007-04-25 21:14:15 +00:00
Starwalker 7fec12b76c remade SCAR pics implemented as P1ITEM-pics, old pics stay as GUN-pics if need to revert occurs.
removed 'Electronic'-tag from Triggergroup

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@770 4f8fa57e-7814-0410-bad4-adc449f26b7c
2007-04-22 15:44:41 +00:00
Starwalker ef4d67378b replaced FAMAE-SMG pics by Coolberg's
replaced Beretta 96FS pic by Coolberg's pic
added remade SCAR pics for later implementation

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@767 4f8fa57e-7814-0410-bad4-adc449f26b7c
2007-04-22 15:29:54 +00:00
Wanne a5dd7f7a76 - bugfix: Wrong placement of the terrorists pictures on the files section in the laptop
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@856 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2007-04-19 20:11:06 +00:00