7623 Commits
Author SHA1 Message Date
MaddMugsy 0e64603c9a Fixed item_transformations.xml not loading in properly.
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5194 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2012-04-11 22:51:23 +00:00
MaddMugsy b72b1f9262 XML Editor updated
- JMich fixed a possible crash scenario at start.  
- Fragmentation data values are now able to go above 100 in Item Data form.
Added fragments to Fragmentation Rocket and VOG Jumping Grenade
Allowed old Talon GL to be more than a paperweight if/when it is found on the vanilla maps

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1395 4f8fa57e-7814-0410-bad4-adc449f26b7c
2012-04-11 17:00:52 +00:00
Wanne 0259412dac - BUGZILLA #606: Fixed wrong spelling of "Ceramic Armor Insert.wav" sound
o Because of wrong spelling, this sound was never loaded and reported in the "game_log.log" file

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1393 4f8fa57e-7814-0410-bad4-adc449f26b7c
2012-04-11 16:39:37 +00:00
Wanne 29c05c0f3e - BUGZILLA #598: Fixed a few German typos / grammatic errors
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameData@5191 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2012-04-11 16:19:34 +00:00
Wanne e8d8a1a468 - HAM 5: Bugfixes
o Fixed movement errors placement in all resolutions

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5190 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2012-04-11 12:04:01 +00:00
Wanne 43b1fd46bd - HAM 5: Bugfixes
o Corretly positioned the strategy sector inventory and the zooming animation in all supported resolutions
o Reworked tooltip text (line-breaks) for the new sector inventory buttons

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5189 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2012-04-11 11:58:09 +00:00
Wanne b81559ab22 - HAM 5: Bugfixes
o Corretly positioned the strategy sector inventory buttons (zoom, ...) for all resolutions

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5188 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2012-04-11 11:24:06 +00:00
Wanne 864d9acb27 - HAM 5: Bugfixes
o Fixed a few positions for the sector inventory in widescreen resolution
o TODO: The file "Map Screen Interface Map Inventory.cpp" needs to be adjusted (The "xResOffset" needs to be added to the x-positions of the images) for widescreen resolutions

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5187 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2012-04-11 11:21:04 +00:00
Wanne af8c9bc391 - Added the new missing HAM 5 texts to the language specific files (only in English)
o Marked the English texts with "// TODO.Translate" comments

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5186 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2012-04-11 10:51:22 +00:00
Wanne 981e2a2f3c - Initialize windows timer to lowest possible value during timer initialization (by tazpn)
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5185 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2012-04-11 10:15:30 +00:00
Wanne 14b533d124 - Fixed compilation errors in VS 2005 and VS 2008 after HAM 5 integration
o Added the new files (*.h, *.cpp) to the proper projects

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5184 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2012-04-11 10:11:01 +00:00
MaddMugsy b6b6e4e927 Fixed key input not always working on map screen
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5182 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2012-04-11 04:47:14 +00:00
MaddMugsy c845f9f117 HAM5.5b2 merged in!
Notes:
-There may still be bugs!! (In fact, I almost guarantee it -- there's
-Ammo box code added to HR's crate code
-Splitting a crate/box also automatically refills half empty magazines
-new pathing arrows for map screen not included
-code for scouts to know where enemies are going doesn't appear to work... but i'm not sure it was completed.
-lots of gobledy gook (chinese?) comments turned back to english
-also added Bob's popups
-other languages besides english still need to have there language.cpp files updated with array changes
-AI enhancements by Warmsteel (reloading, suppression, roaming, avoiding gas, and other fixes)

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5181 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2012-04-10 23:45:46 +00:00
MaddMugsy 0b72ef854b Added PocketPopups.xml file
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1390 4f8fa57e-7814-0410-bad4-adc449f26b7c
2012-04-10 23:26:37 +00:00
MaddMugsy 5d86fa4434 Changes for HAM 5
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1389 4f8fa57e-7814-0410-bad4-adc449f26b7c
2012-04-10 23:16:43 +00:00
MaddMugsy 7e74e2d2da removed boolean tags from AttachmentClass.xml
New version of XML Editor

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1388 4f8fa57e-7814-0410-bad4-adc449f26b7c
2012-04-10 22:48:44 +00:00
MaddMugsy ab3412e5ed 1. Removed hardcoding of face items in the code for the face icons / graphics
2. Fixed potential infinite loop bug if no ammo crate or box is present and (ctrl+)shift+a is pressed.
3. Changed Ctrl click on mapscreen from Delete to auto-place item in selected merc or vehicle inventory.

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5179 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2012-04-10 20:41:04 +00:00
Wanne c031dce02a - Updated comment section for ActionItems.xml
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1387 4f8fa57e-7814-0410-bad4-adc449f26b7c
2012-04-10 18:13:34 +00:00
Wanne 74c6e3c56c - Fixed error when playing / loading maps that have been saved with a new Map Editor after Revision 5064 (when the Overheated Weapon feature was included)
o The gMapInformation struct (Version, Edgepoints, ...) was not read correctly from the map file. Now it should work again!

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5178 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2012-04-10 17:25:39 +00:00
inshy 6b19c05f82 Translated new names
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameData@5177 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2012-04-10 14:19:23 +00:00
Wanne 3e60a5ac6e - Removed the "USE_XML_TILESETS" from ja2.ini and ALWAYS set it to enabled (1) in the game, so the game always uses the ja2set.dat.xml file, because with the old way (USE_XML_TILESETS = 0) it will not work anymore.
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1384 4f8fa57e-7814-0410-bad4-adc449f26b7c
2012-04-10 13:34:53 +00:00
Wanne d199d90c9f - Removed the "USE_XML_TILESETS" from ja2.ini and ALWAYS set it to enabled (1) in the game, so the game always uses the ja2set.dat.xml file, because with the old way (USE_XML_TILESETS = 0) it will not work anymore.
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5175 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2012-04-10 13:34:33 +00:00
Wanne 1dc958c7f9 - Bugfix: Fix Inventory AP costs when soldier has negative APs (by JMich)
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5174 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2012-04-10 12:24:22 +00:00
inshy 696aa787ab -Added translated files to French for WF mercs
-Fixed OldAIMArchive file for all languages (need translation)
-Added new names in Russian.MercProfiles.xml
-Fixed Russian AIMBIOS.EDT after last changes... 

***USE UTF-8 when open and save any EDTs for ALL LANGUAGES!!!***

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameData@5173 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2012-04-10 11:17:25 +00:00
MaddMugsy 021df752fa 1. AttachmentClass and Silhouette xml files moved from Lookup folder to main TableData folder
2. Added and updated some of the required files from HAM5.  Others will be added when the code is ready.  HAM5 XML changes have been included for use with the latest XML Editor code.  These changes will be ignored by the game.
3. AttachmentClass changes by Flugente applied to xml file.


git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1383 4f8fa57e-7814-0410-bad4-adc449f26b7c
2012-04-09 22:35:54 +00:00
Wanne 69b3a5bef1 - Bugfix: Fix for unable to leave overview map after pressing key (by tazpn)
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5171 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2012-04-09 10:26:21 +00:00
Wanne d73074206a - Bobby Ray Fixes (by tazpn)
- Region button lingers after order screen is closed 
- Crash when closing order form

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5170 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2012-04-09 10:24:30 +00:00
MaddMugsy 443f1c7a70 reverted tonyin pventory.xml and saminventory.xml to restore zero values
added attachment tag =1 to kac masterkey

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1382 4f8fa57e-7814-0410-bad4-adc449f26b7c
2012-04-08 17:47:18 +00:00
Wanne 6c8a1905ca - Fixed Qarray variables aka MercQuote.xml data not fully externalized (by Buggler)
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5167 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2012-04-06 08:41:48 +00:00
Wanne 3c1940a260 - Improved gameloop unhandled exception handler to retrieve the line and source file (if PDB is available) and display in the fault screen instead of the location of the fault handler (by tazpn)
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5166 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2012-04-06 08:39:16 +00:00
Wanne bfe4a7b08e - Fixed issue with pointer arithmetic and wchar_t in method "PolulateSectionFromCommandLine()" (by tazpn)
o Now this working method is enabled again in the source

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5164 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2012-04-06 07:46:47 +00:00
Wanne bfe22f24f8 - Fixed compilation error in VS 2005
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5162 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2012-04-04 21:09:03 +00:00
Wanne 0c282a818a - ARSP Bugfix: Fixed hit cursor missing (not shown) in the left side of the screen (by Lejardo)
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5156 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2012-04-04 09:00:25 +00:00
Wanne bdb4e2cc3d - Bugfix: Fixed Tactical Placement hotkeys bug (by Buggler)
o Using hotkeys to activate e placement buttons e.g. 'c', 'g' or 's' will do bonkers to mouse clicking & keyboard input. Only way out is to kill process.



git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5155 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2012-04-04 08:52:04 +00:00
MaddMugsy 9786f78da4 Fixed a bug that was potentially introduced with the underbarrel weapons. Now checks for pSoldier != NULL when removing attachments, so Ctrl+Shift+F doesn't break.
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5152 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2012-04-03 22:41:17 +00:00
Wanne 7236283508 - Updated comment in Language Defines.h about the /p:TargetName parameter
o With this parameter you can set the output file name

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5151 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2012-04-03 09:30:00 +00:00
Wanne 076f390aba - Bugfix: Fixed the problem with not initialized merc quotes
o The problem was, that the file "MercQuote.xml" was never initialized. Now it should read from the file, but only if READ_PROFILE_DATA_FROM_XML = TRUE, otherwise it reads the values from prof*.dat

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5150 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2012-04-03 08:46:59 +00:00
Wanne 628e54cfe8 - Temporary disabled the call to the PopulateSectionFromCommandLine() method, because the game crashes in a build when trying to debug directly from any VS by pressing F5
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5149 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2012-04-03 08:44:51 +00:00
Wanne d1b01a30ce - Restored the mouse capture whenever the laptop is open (by tazpn)
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5148 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2012-04-03 08:23:46 +00:00
Wanne c443b27182 - Fixed mouse repeat issue in Bobby Ray's guns (by tazpn)
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5147 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2012-04-03 08:23:22 +00:00
Wanne f95deab024 - Fixed compilation error in VS 2008 version (by tazpn)
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5146 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2012-04-03 08:22:54 +00:00
MaddMugsy ef220e65c1 fixed uiIndex ordering in SamInventory.xml and TonyInventory.xml
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1381 4f8fa57e-7814-0410-bad4-adc449f26b7c
2012-04-02 16:34:39 +00:00
Wanne b2ab0a29c8 - Exception patch update note from previous commit (5141)
o The command line option hidden in the exception patch would be used like the following:

o This overrides the vfs config to use the aimnas config. (useful for desktop shortcuts)
  JA2_EN_Release.exe /VFS_CONFIG_INI=vfs_config.JA2113AIMNAS.ini

o This overrides vfs file and disables the highspeed timer:
  JA2_EN_Release.exe /VFS_CONFIG_INI=vfs_config.JA2113AIMNAS.ini /HIGHSPEED_TIMER=FALSE 


git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5142 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2012-04-02 09:01:17 +00:00
Wanne de062448b4 - Exception patch (by tazpn)
o Fix the crash exception handler to work with VFS
o Add version numbers of loaded dlls to crash dump file
o Add call stack with source line numbers if PDB is present to crash dump file
o Add ability to specify addition JA2.INI settings from command line


git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5141 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2012-04-02 08:57:17 +00:00
Wanne fc76c7fc87 - Queue patch (by tazpn)
o Cleanup saveload and laptop screen event queue processing


git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5140 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2012-04-02 08:56:19 +00:00
Wanne 4fb05f2254 - Video patch (by tazpn)
o Patch to limit number of errors before giving up in routines. Can help prevent hang on shutdown


git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5139 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2012-04-02 08:55:28 +00:00
Wanne de37581daf - Utils patch (by tazpn)
o Expand length of gMoneyStatsDesc buffer for Italian and Dutch builds
o Move EnumToString to text utils from keymap
o Add ParseCommandLine utility function for parsing command line strings


git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5138 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2012-04-02 08:54:47 +00:00
Wanne ca873a8222 - Updated VS 2008 project files (by tazpn)
o Set /Zi to be standard for Release, ReleaseWithDebugInfo
o Enable PDB for Release builds so crash dump is more effective (have to deliver PDB with releases)


git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5137 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2012-04-02 08:53:05 +00:00
Wanne 0333be5eb2 - Updated VS 2010 project files to allow different ways for building the executable (by tazpn)
o Take a look in the comment header for the "Language Defines.h" file for further informations
o Enable PDF for Release builds, so crash dump is more effective (of course if we release a version we also have to release the PDB file)

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5136 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2012-04-02 08:51:48 +00:00
Wanne 841e08de1c - Bugfix: Fixed problem with the registration of global variables (lua) for initializing a new game (by Jazz)
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5135 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2012-04-01 19:28:31 +00:00