Commit Graph
7142 Commits
Author SHA1 Message Date
Starwalker a4f218d955 added speech-files for "Slay forever"-feature
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@943 4f8fa57e-7814-0410-bad4-adc449f26b7c
2008-03-11 12:30:05 +00:00
Wanne bf368a0013 - suppressed all the deprecated insecure functions warnings for VS 2005 if you build a Release or MapEditor Version
For Debug version it is already set.
Project -> Properties -> Linker -> Command Line -> Additional options: /D "_CRT_SECURE_NO_DEPRECATE"

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@1878 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2008-03-10 19:58:45 +00:00
ChrisL 88619fb555 1877 Release
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@1877 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2008-03-10 17:39:30 +00:00
ChrisL 6d31772abd Altered the pName field from Pockets.xml to a CHAR16 value so it will support multilingual code.
Updated the Pockets.xml reader function so that we can include a german.pockets.xml and russian.pockets.xml (and any other language we eventually choose to support) just like we have with Items.xml.
I moved the "Sold Item" and "Delete Item" phrases to the language specific cpp files.
I updated the SHIFT+N hotkey so that it will now work from the strategic screen.  On tactical it handles the entire team.  On strategic, it handles only the one merc who is currently active.
I fixed a problem with the ALT+W cheat key so that it cycles properly.
I fixed a problem with the backpack buttons where the button key wasn't being properly deleted.  This could sometimes cause an "overload" which would result in a crash.

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@1873 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2008-03-09 17:26:55 +00:00
lalien 43ca24dda8 Merged New Inventory Project into main branch
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@1871 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2008-03-08 15:15:25 +00:00
lalien e16d166277 Changed SVN properties
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@1870 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2008-03-08 14:40:47 +00:00
Starwalker 8146daa390 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
Wanne 5e5035458a - Improved previous bugfix: If the merc arrives with the helicopter at night (defined in the ja2_options.ini) it was daytime in tactical
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@1855 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2008-02-26 20:28:06 +00:00
Wanne 9649811083 - bugfix: If the merc arrives with the helicopter at night (defined in the ja2_options.ini) it was daytime in tactical
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@1854 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2008-02-26 19:41:45 +00:00
MaddMugsy cb36b3db6d -updated game version
-suppressed soldier action data messages in cheat mode
-enabled enemy / militia ammo choosing to be limited by coolness

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@1853 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2008-02-26 02:37:23 +00:00
Wanne c49af95ec6 - suppressed all the deprecated insecure functions warnings for VS 2005 if you build a Release veersion
Project -> Properties -> Linker -> Command Line -> Additional options: /D "_CRT_SECURE_NO_DEPRECATE"


git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@1852 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2008-02-25 19:32:42 +00:00
Wanne f641ba3e32 - new property (ENABLE_CHANCE_OF_ENEMY_AMBUSHES_ON_INSANE_DIFFICULT) for the enemy ambushes which are in the game since the beginning of 1.13 development
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@1836 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2008-02-24 19:06:52 +00:00
Wanne eda1439f5b - Externalized property (ENABLE_CHANCE_OF_ENEMY_AMBUSHES_ON_INSANE_DIFFICULT) for the 1.13 exclusive enemy ambush chance which exists from the development beginning of 1.13
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@937 4f8fa57e-7814-0410-bad4-adc449f26b7c
2008-02-24 19:05:23 +00:00
Wanne 41e2bd433c - bugfix: item duplication bug:
You need two mercenaries. You place required item to first mercenary's inventory, 
then you take the item and point cursor with the item at the second mercenary. 
Then you click right mouse button and then left one. 
During the process of giving the item from the first mercenary to the second quickly move the item to the another slot of the inventory. 
As a result of it the item will be given to the second mercenary and the first mercenary will still have it.


git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@1835 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2008-02-24 18:04:50 +00:00
Wanne 72b9a847dd - suppressed all the deprecated insecure functions warnings for VS 2005:
Project -> Properties -> Linker -> Command Line -> Additional options: /D "_CRT_SECURE_NO_DEPRECATE"
- Enabled PLAY_INTRO (defined in ja2.ini) property in source code

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@1834 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2008-02-24 17:55:49 +00:00
Wanne f90ac9c70c - added "PLAY_INTRO" Property to the ja2.ini. But this is not used yet in svn release exe version
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@936 4f8fa57e-7814-0410-bad4-adc449f26b7c
2008-02-24 17:30:13 +00:00
lalien 2ed23927f2 - fixes for VS2003
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@1806 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2008-02-16 16:34:47 +00:00
Starwalker 387714edac uploaded 'real' Russian.Items.xml (Inshy)
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@935 4f8fa57e-7814-0410-bad4-adc449f26b7c
2008-02-14 15:13:02 +00:00
Wanne 411fdd1584 - bugfix: Bug #79: Creatures are gone if you compress time in strategic and select auto battle
- bugfix: Bug #51: Speck sends wrong mail if any of the 4 new guys (Text, Stogie, Biggens, Gaston) level up.
- added missing description texts for IMP skill rooftop sniping and camouflage (also translated in german and russian)



git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@1796 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2008-02-12 18:56:38 +00:00
Starwalker f91a630e23 added SR-2 Veresk, but only with Gyurza mag available at the moment, 30rnd mag will come later. (pic by Coolberg)
changed several Burst Penalties (lowered them, where they were the same as Autofire Penalties)
changed attachment data on several guns (thanks to Hairysteed)
changed definition of vehicle slots a little bit

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@934 4f8fa57e-7814-0410-bad4-adc449f26b7c
2008-02-12 08:27:16 +00:00
Starwalker 7593674a4c 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
Wanne 31ba967436 - Intro is always played now (iPlayIntro = 1), until I can update (have write access) the ja2.ini in the GameDir
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@1792 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2008-02-10 07:42:59 +00:00
Wanne e41a905c51 - added a new option in ja2.ini (PLAY_INTRO) + source code where the user can enable or disable the intro.
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@1791 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2008-02-10 07:36:22 +00:00
Wanne c55b927f8b - bugfix: Bobby Rays filter buttons (again). Now it should work
- bugfix: Hand to hand combat (knifes, claws, ...) was disabled in auto battle. This was done in revision 51 because of CTDs that always occured there. I enabled hand to hand combat and tested ~50 auto battles. No single CTD. It seems that the CTD has been fixed since revision 51.

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@1788 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2008-02-09 09:41:24 +00:00
Wanne df8b135b52 - bugfix (workaround): Most of the Sir-tech credits name were displayed in dark blue color. Now all credits name are set in "dark-white" color regardless of the font color code.
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@1784 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2008-02-07 17:14:52 +00:00
Starwalker 9ea8cae190 replaced Russian.AmmoStrings.xml with one made by inshy
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@930 4f8fa57e-7814-0410-bad4-adc449f26b7c
2008-02-07 15:22:12 +00:00
Starwalker e7910114f7 added Russian.cities.xml
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@929 4f8fa57e-7814-0410-bad4-adc449f26b7c
2008-02-07 15:19:34 +00:00
Wanne 8232957994 - Enabled music in windowed mode (was missing in windowed mode)
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@1783 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2008-02-07 09:37:12 +00:00
Wanne bb1b1eaf7e - bugfix: Filter buttons under used category
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@1782 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2008-02-07 07:58:03 +00:00
lalien 56e3a24535 - changed Russian descriptions
- bug fix for bug #50 'Monsters win auto battle'

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@1757 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2008-01-24 12:39:50 +00:00
Starwalker 762dc2ab14 forgot another needed change in pockets.xml :-(
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@928 4f8fa57e-7814-0410-bad4-adc449f26b7c
2008-01-24 08:59:38 +00:00
Starwalker 509c497e5c added a Burst Penalty to the Calicos that did not have one, because they can have the triggergoup as an attachment
corrected the price of the Colt Python
used pType-tags in pockets.xml as preliminary work for ChrisL's NIV Beta10
changed filled size of backpacks (to avoid exploits)

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@927 4f8fa57e-7814-0410-bad4-adc449f26b7c
2008-01-24 08:34:44 +00:00
Starwalker 0d050203b5 added Pipe Wrench as a close combat weapon, but it is nowhere sold at the moment!
added another SL8-version as the result of a merge
changed Shovel to close combat weapon
changed Barret to use new pic
changed standard 7.62x25mm (Tokarev) ammo to AP/FMJ because of its reputation
moved the four NIV default items to lower itemnumbers due to XML-constraints
changed revolvers to have SwapClips=1 to avoid strange results from ChrisL's new reloading code.

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@926 4f8fa57e-7814-0410-bad4-adc449f26b7c
2008-01-21 09:43:51 +00:00
Starwalker d174aad3d3 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 d129e4c939 corrected a few weights
corrected a few descriptions
corrected a few accuracy values
introduced four new items that are useless for gameplay but are needed for the compatibility of the 1.13 XML-Editor with the New Inventory

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@922 4f8fa57e-7814-0410-bad4-adc449f26b7c
2008-01-15 12:21:56 +00:00
lalien 77e2b4e176 - changed Russian descriptions
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@1719 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2008-01-15 11:12:06 +00:00
Overhaul 6049e8da5a Added property pages to make it easy to change build language (at least with VS2K5)
Added support for Russian city names and Items
Fixed contract length exploit (hire merc for 2 weeks for the price of 1 day)
Fixed insurance emails repeating when you choose "delete" but then say no
Corrected UTF-8 to wide char translation on Windows platforms (Windows doesn't handle mbstowcs correctly)
Moved UTF-8 to Wide Char translation for item descriptions and names so it happens at XML load time (fix bug that Russian has half the description space)
Fix overflow when combining two items with high counts (such as 200-round boxes of ammo)
Path AI fixes
Fixed issues with non-interruptable animations causing infinite clock
Fixed some issues with soldiers not reaching their plotted destination
Fixed escorted players who were cowering, being unable to move after joining party
Only allow militia to climb roofs if their orders allow them to move
Fix bug where AI might climb the wrong roof on the way to the destination roof
Allow AI who have gone outside their patrol grid, to return to the Grid


git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@1702 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2008-01-09 02:08:39 +00:00
lalien 144426e896 - fixed Russian text
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@1674 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2007-12-17 18:18:21 +00:00
Starwalker b0657b6d65 corrected some item descriptions (thanks to inshy)
added a few attachment data for some NewInv-only items (should not hurt standard JA2, stand-ins are in place [items 1197, 1198, and 1199; should not be deleted])

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@921 4f8fa57e-7814-0410-bad4-adc449f26b7c
2007-12-17 14:46:16 +00:00
lalien 45b492c94a - replaced Russian characters
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@1668 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2007-12-14 11:24:32 +00:00
bugmonster c33b00d6ff - additional text moved to _*Text.cpp for localisation purposes
- refined Russian text

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@1667 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2007-12-12 18:21:35 +00:00
bugmonster 2ab1e53459 - fixed bug, appearing as overlapping text in insurance web-site on high screen resolutions
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@1666 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2007-12-12 18:18:43 +00:00
Starwalker 345bfec3cf added mssing SCAR barrel merge (WP-version)
changed Russian caliber of UDAR-Revolver
changed/corrected a lot of other Russian stuff (names, weights, descriptions)
increased coolnes of HK G11-PDW and Mauser M-03
added data for a new NewInv LBE-item

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@920 4f8fa57e-7814-0410-bad4-adc449f26b7c
2007-12-11 08:57:17 +00:00
Starwalker 2819990fc3 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 d1d3d64785 dropped weight of RPG-27 from 8.0kg to 7.5kg
made Kevlar&Leather Jacket a unique item again (Angel quest)
renamed built-in grenade launcher of Groza rifle to GP-25
added ability to attach Reflex Sight to Steyr ACR
halved reload time of HK G11 (because of magazine rails on gun)
made SAW-pouch ammo-exclusive and gave ammobelt silhouette to it
gave medium general silhouette to former TNT-pocket.

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@916 4f8fa57e-7814-0410-bad4-adc449f26b7c
2007-11-27 14:25:43 +00:00
Starwalker 91a7400b96 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 9b3ed4dd4c changed graphics pointer of M224 in items.xml to 343 instead of 0 (got a new pic, but old pic still needed for NADA items)
changed some attachments on some machineguns
deleted cave vision bonus on NVG-I
replaced description of CAWS (Kensuke), but had to shorten BR-description
renamed Frag Grenade to Mk2 Defensive Grenade and changed description (Kensuke)
new German.Items.xml (Farmer Toby)

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@912 4f8fa57e-7814-0410-bad4-adc449f26b7c
2007-11-15 07:58:32 +00:00
Starwalker c8e1776901 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
bugmonster 9d716dcaae - fixed bug when merc cannot automaticly leave the ring after boxing. This happens when SOLDIER_ENGAGEDINACTION flag is set.
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@1615 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2007-11-14 16:55:07 +00:00
bugmonster 574b8e3218 - Improved compatibility with different russian JA2 distribs' resources
- International/russian *.npc file format unified, performed conversion on-the-fly
- New 1.13 messages' text moved to Text.h/_*Text.cpp
- Russian translation fixed/refined

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@1610 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2007-11-12 18:40:15 +00:00