7604 Commits
Author SHA1 Message Date
Overhaul ea68cd14ff Added profiler support
Fixed memory leak and CTD with editor summary info
Added extra VS2K5 property pages for debug support


git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@1528 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2007-10-20 06:56:34 +00:00
Starwalker 6d62f584f1 changed Rifle LAM/Flashlight Combo to new pic
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@899 4f8fa57e-7814-0410-bad4-adc449f26b7c
2007-10-18 07:11:13 +00:00
Starwalker ee830d5b52 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 39391c3990 added CETME Ameli
Changed HK MG36E to HK MG36 RAS
added HK MG36
added mergability of various G36 rifles with rail-kit or optics-grip to obtain other versions
disallowed Rifle LAM and Rifle LAM/Flashlight combo on Bundeswehr G36 versions as these have no forward rails.
added grippod attachability to G36 RAS versions
corrected price of Match Sights ($1 was much too cheap ;-)
changed vision bonus of attachable scopes to reflect effect of ambient light (or lack thereof)

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@895 4f8fa57e-7814-0410-bad4-adc449f26b7c
2007-10-12 06:57:28 +00:00
Starwalker 5824af525a 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
Wanne b43ec593fe - bugfix: for expert difficulty level, that leads to adding INSANE_ELITE_BONUS after applying of EXPERT_ELITE_BONUS (thx to Scorpion)
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@1501 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2007-10-11 18:05:50 +00:00
Starwalker 1d7b92dc20 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 5b9ae6454c changed more attachment weights
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@888 4f8fa57e-7814-0410-bad4-adc449f26b7c
2007-10-01 09:55:25 +00:00
Starwalker 764523c045 more sound changes by Farmer Toby
description change of SIG MP41 by Farmer Toby
added three WW-II era scopes (M1 Garand, Mosin Nagant, and Kar 98k lose the ability to mount ACOG but get their respective original scopes instead), pics by Tbird
added Match Sights (pic by Tbird)
added Underarmor Shirt (pic by Marlboro Man)

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@887 4f8fa57e-7814-0410-bad4-adc449f26b7c
2007-10-01 07:06:53 +00:00
Starwalker aafd39c201 sound allocation (Farmer Toby)
German designations (Farmer Toby)

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@886 4f8fa57e-7814-0410-bad4-adc449f26b7c
2007-09-30 15:31:21 +00:00
Starwalker feec1fdc3a sound file allocation xmls (Farmer Toby)
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@885 4f8fa57e-7814-0410-bad4-adc449f26b7c
2007-09-30 15:30:13 +00:00
Starwalker 329abacbe7 shifted one sound file
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@884 4f8fa57e-7814-0410-bad4-adc449f26b7c
2007-09-30 14:40:30 +00:00
Starwalker 6a89976bbd new gun sounds added (Farmer Toby)
some gun sound-files renamed for easier work with the XML-Editor

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@883 4f8fa57e-7814-0410-bad4-adc449f26b7c
2007-09-30 14:37:27 +00:00
AalaarDB ece5d551c1 Fixed bug where if a merc with an extended ear, and out of normal talking range, tried to interact with a shopkeeper the game would crash.
Now the merc will run up to the shopkeeper and then interact.

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@1444 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2007-09-28 00:38:47 +00:00
AalaarDB 5df2c69d10 Readded AStar code, see email for more details.
Fixed bug in AStar code.
Fixed night combat chance to hit
Optimized worst case scenario pathing to be faster.

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@1438 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2007-09-25 21:37:01 +00:00
Starwalker e55ae97228 new gun sounds added to sound-xmls and weapons.xml (Farmer Toby)
some attachment weights corrected to have more realistic values

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@882 4f8fa57e-7814-0410-bad4-adc449f26b7c
2007-09-25 11:37:05 +00:00
Starwalker e684da67ed added several new gun sounds and replaced Stechkin sounds (Farmer Toby)
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@881 4f8fa57e-7814-0410-bad4-adc449f26b7c
2007-09-25 11:34:34 +00:00
SpaceViking 0d820f3c43 Fix problem where nothing can be picked up from the strategic screen.
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@1431 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2007-09-25 05:19:36 +00:00
SpaceViking 79333dbf84 Initialize variables to code that adds soldiers onto tactical field
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@1427 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2007-09-24 05:37:53 +00:00
lalien ebd1e97d37 - removed variables that are not used
- some fixes on soldier direction calculations

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@1403 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2007-09-20 14:35:33 +00:00
lalien 5a0abb4a14 - Removed non backward compatible code due to violation of §20 of JA2 1.13 Development Rules
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@1402 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2007-09-20 13:43:27 +00:00
Starwalker c4e2b896b4 corrected wrong index for Warden
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@880 4f8fa57e-7814-0410-bad4-adc449f26b7c
2007-09-19 08:49:35 +00:00
Starwalker 247eb99d3a 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 937ef7f998 added Sounds for 7.92x57mm and 7.92x33mm ammo
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@878 4f8fa57e-7814-0410-bad4-adc449f26b7c
2007-09-18 06:48:25 +00:00
Wanne ce385421f1 - bugfix: Sam sites with index >=5 lacks ability to train militia (fixed by Lesh)
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@1376 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2007-09-16 11:11:09 +00:00
Overhaul 5035e83261 Fixed CTD in editor when changing detailed civ placement from wheelchair to jeep
Fixed memory corruption in detailed placement due to old-inventory behavior
Added Editor.slf to files JA2/Editor will load from
Fixed FindBestPath to not search for a path to NOWHERE


git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@1362 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2007-09-14 07:27:14 +00:00
Starwalker 3bb01780b8 added the new explosive internal item at #270, so Overhaul's fix should be workin with vanilla JA2 as well. Also made a new explosive entry for this item in explosives.xml.
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@876 4f8fa57e-7814-0410-bad4-adc449f26b7c
2007-09-13 08:31:45 +00:00
Starwalker 1044142484 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
Overhaul 2a4e963983 Fixed a problem with wrong variable name, and modified infant spit index to match the new Vanilla friendly index
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@1357 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2007-09-13 06:01:33 +00:00
Overhaul ffc70e9723 Fixed buffer overrun for LUA strings
Made direction variables more consistent as unsigned chars.  Several function prototypes updated for this.
Many memory leaks plugged:  External options, video overlays, laptop file lists, tactical message queue, strategic pathing, autobandage, merc hiring, detailed placements, crate in Drassen, tactical placement
New functions and attributes for soldiers in LUA (still for debugging at best): Soldier.APs (current APs), Soldier.changestance (changes stance, uses game heights)
File catalog ignores .SVN directories (game load speedup)
Fix CTD in mouse regions
JA2 window now refuses to move to negative coords
Checks to prevent DirectX-related infinite loops due to minimizing and task switching
Invading enemies should now appear on the borders even when reinforcements disabled in .ini
Suppression should no longer work on mercs in medium water
Infant/Young creatures use restored spit instead of Molotov
Creatures begin with their 'guns' (spit) 'locked and loaded' (cartridge in chamber)
Further fix to AXP and AlaarDB's weapon ready check:  Now 'firing' is always counted as 'ready'.
Prevent mercs from falling and flying back through obstacles
Check whether battle group is even set before testing its location for battle setup
Burst spread locations now limited to 6, the limit within the soldier struct
Extra burst spread locations zeroed out so that they aren't used unless necessary
Spread code now only shoots at locations in the spread, and will shoot at all 6
Only mercs in the sector where autobandage happens will be made to stand up after it's done
Throwing a grenade at the tail of the plane in Drassen should not result in a CTD
Reset attack busy count when loading a new sector


git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@1347 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2007-09-11 11:19:03 +00:00
Overhaul 20df3ca6cf Corrected spelling errors and typos in SectorLoadScreens.xml
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@874 4f8fa57e-7814-0410-bad4-adc449f26b7c
2007-09-11 09:54:56 +00:00
Starwalker aaac85eb1f added a new explosive internal item (#995) to help Overhaul with a creature problem
changed silenced sound of ranged creature attacks to standard creature attack sound

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@873 4f8fa57e-7814-0410-bad4-adc449f26b7c
2007-09-11 06:23:55 +00:00
AalaarDB 63a7b27b29 Added BinaryHeap.cpp for AStar pathfinding, somehow it got missed.
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@1346 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2007-09-10 22:37:25 +00:00
Starwalker dbf267dbcf added three new SMGs (MAT-49, SIG MP41, Spectre M4), also to Tony's inventory
changed description of FN BDA
changed SMGs usable in one hand to machinepistol class, so they appear in that section in BR's now. Additionally, these are guns that will fit into the New Inventory 'MP-Holster'.
added six new thigh-packs and a single vest, but they are deactivated and still have stand-in graphics.

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@872 4f8fa57e-7814-0410-bad4-adc449f26b7c
2007-09-09 12:16:25 +00:00
Starwalker b82949d4e5 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
AalaarDB c099151b37 Added AStar pathfinding.
It can be removed easily by undefing USE_ASTAR_PATHS.
See AStar thread in mod discussion forum for changes.

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@1331 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2007-09-08 03:18:32 +00:00
SpaceViking 10208ca5af Bug fix for militia movement on strategic screen not setting group ID for battles.
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@1312 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2007-09-04 04:06:23 +00:00
Wanne 3e294ee92f - To get a full working version of classic ja2/ub (Data folder) I had to move the sound files from Data-1.13/Sounds to Data\Sounds. This was needed, because otherwise the weapons which have autofire wouldn't have a matching sound, because no autofire sound exists in vanilla ja2. Data-1.13 works like before, because it has a fallback to the Data folder!!
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@868 4f8fa57e-7814-0410-bad4-adc449f26b7c
2007-08-28 18:59:48 +00:00
Wanne fc297a992a - Reworked Data\TableData folder so it reflects the classic/ub items and weapons (uiIndex <= 335)
- Corrected xml files and added needed STIs to get the xml editor working with the "Data" folder

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@867 4f8fa57e-7814-0410-bad4-adc449f26b7c
2007-08-28 17:56:51 +00:00
Wanne 40dcef0399 Corrected AttachmentInfo.xml, so it works with the xml editor
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@866 4f8fa57e-7814-0410-bad4-adc449f26b7c
2007-08-26 12:44:35 +00:00
Wanne 0c27cc47d4 Added some missing tags to the xml files, so they can load in the xml editor
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@865 4f8fa57e-7814-0410-bad4-adc449f26b7c
2007-08-26 11:24:36 +00:00
AalaarDB ef04b0790d Fixed bug where wrong chance to hit was displayed by completing AXP's previous bugfix.
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@1280 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2007-08-26 06:09:34 +00:00
Wanne 7cf994b19d Added missing files to the Data folder, so the xml editor will work when selecting the Data folder in the XMLEditorInit.xml.
The xml editor can only read from STI files and not from SLF-Archiv.
Some xml files in the Data\TableData folder are invalid for the xml editor, so they needs to be corrected first to use the xml editor.

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@864 4f8fa57e-7814-0410-bad4-adc449f26b7c
2007-08-25 16:40:27 +00:00
Wanne 146230752e - Bugfix in ChooseFaceGearForSoldierCreateStruct(). Wrong HeadPos was set.
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@1278 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2007-08-25 15:46:05 +00:00
Wanne a671931ceb Corrected EnemyMiscDrops.xml, because the xml editor did not work with this version.
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@862 4f8fa57e-7814-0410-bad4-adc449f26b7c
2007-08-25 15:36:16 +00:00
lalien c656cffed5 - replaced NOBODY with TOTAL_SOLDIERS in range checks (NOBODY definition will be changed from 156 to -1 later)
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@1255 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2007-08-22 18:29:35 +00:00
Wanne cd8ad6e8b8 - Added missing #include "Map Information.h" to Points.cpp
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@1254 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2007-08-22 17:44:52 +00:00
Wanne 2db6ab8ade Added missing entry (uiIndex = 8) to EnemyMiscDrops.xml
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@861 4f8fa57e-7814-0410-bad4-adc449f26b7c
2007-08-22 17:01:28 +00:00
lalien 85152e7a05 - replaced NO_SOLDIER with NOBODY
- replaced NO_MAP_POS with NOWHERE

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@1252 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2007-08-22 14:54:41 +00:00
lalien f035858e3f - removed breath reduction for soldiers that are not in loaded sector
- added bug fix from build 1240 (fixed freeze in tactical - enemy soldier attempted to throw item at himself (save from pyg))

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@1251 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2007-08-22 14:29:14 +00:00