7604 Commits
Author SHA1 Message Date
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
Wanne 53dc3daf48 - Added the new missing items to the language specific Items (*.Items.xml) file. Translation is needed!
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameData@5134 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2012-04-01 16:11:19 +00:00
Wanne 452a247d14 - New Feature: Allow attaching and using underbarrel weapons (by Flugente & JMich, Pics by smeagol)
o Updated XML files and added new KAC masterkey which can be used as an underbarrel weapon
o Raider and Kelly have one in their starting kit 4 

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1380 4f8fa57e-7814-0410-bad4-adc449f26b7c
2012-04-01 15:38:40 +00:00
Wanne 7a40ecd777 - New Feature: Allow attaching and using underbarrel weapons (by Flugente & JMich)
o You can now attach weapons to other weapons (only one at a time). Comes with additional fire modes (by cycling in tactical with key 'b')
o A new item, the KAC masterkey, demonstrates this. Raider and Kelly have one in their starting kit 4. (pics by smeagol)
o works both in OCTh and NCTH. Aiming is done via the main gun, but all physical values of the attached gun are considered.
o reload an underbarrel gun while it is attached by dropping the ammo on the main gun while an underbarrel fire mode is active. Cycle firemodes in tactical by pressing 'b'
o Attachments to underbarrel weapons are inseparable while weapon is attached, but they do work.

- Overheating weapons additions (by Flugente)
o New option OVERHEATING_DISPLAY_THERMOMETER_RED_OFFSET controls how red the temperature bar is at the beginning.
o New option OVERHEATING_SET_ZERO_UPON_NEW_SECTOR sets temperature of items on the floor to zero if loading a new sector

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5133 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2012-04-01 15:36:55 +00:00
MaddMugsy 963b3b9e5a Added p4-p9items to Data folder to fix vanilla JA2
Updated comments in JA2.ini and Ja2_UB.ini.  XML Tilesets are now REQUIRED, unless someone changes the way they work in the exe somehow.

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1379 4f8fa57e-7814-0410-bad4-adc449f26b7c
2012-03-31 08:35:44 +00:00
Wanne e59a5621a6 Fixes: MercProfiles.xml (Vanilla & 1.13) (by Buggler)
- Fixed Gus <LearnToLikeTime> for Scully
- Corrected Scully biweekly salary to original 53000 from 63000
- Reverted Dr. Q to 4 NewSkillTraits
- Changed Buddy/Hated tags to 255 from -1 values (variable was changed to UINT8 from INT8 in SVN4480)
- other small fixes
1.13 only
- Fixed Monk <Buddy> to Laura from Scope
- Fixed Sidney pants colour
- Fixed Cliff Agi to 60 from 59
Vanilla only
- NewSkillTrait & CharacterTrait updated w 1.13 values (from LocknLoaded)

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1378 4f8fa57e-7814-0410-bad4-adc449f26b7c
2012-03-29 20:10:38 +00:00
MaddMugsy fa20e1fdec Trimmed off items with 0 quantities from shopkeeper inventory xmls.
Replaced remaining magazines with ammo boxes in Sam's inventory

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1377 4f8fa57e-7814-0410-bad4-adc449f26b7c
2012-03-26 23:09:26 +00:00
Wanne e4514b2cff - Updated a few Chinese Texts (by zwwooooo)
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5123 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2012-03-26 18:55:44 +00:00
Wanne e2970e7f79 - Forget to also revert the VS 2010 lua project changes from revision 5085 (thx to Buggler)
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5122 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2012-03-26 18:52:40 +00:00
Wanne da81430991 - Reverted the VS 2010 project file changes from development source trunk (Rev: 5081), because there were problems compiling foreign language executables
o Now it should work again

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5119 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2012-03-26 11:37:36 +00:00
MaddMugsy 69106c9bd6 Added AP to all ammo names for AP ammo. Fixed some ammo box BR descriptions.
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1376 4f8fa57e-7814-0410-bad4-adc449f26b7c
2012-03-26 07:28:17 +00:00
Wanne 87f58ea0c5 - Updated ja2_ub.ini
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1375 4f8fa57e-7814-0410-bad4-adc449f26b7c
2012-03-25 22:29:50 +00:00
Wanne f50f2b78bb - Updated ja2.ini & ja2_ub.ini
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1374 4f8fa57e-7814-0410-bad4-adc449f26b7c
2012-03-25 22:28:47 +00:00
Wanne 2fc305a1bf - Bugfix: Fixed Locked Pause State on 'Rehire' at the Drop Equipment msgbox after Merc Dismissal (by Buggler)
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5118 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2012-03-25 22:28:17 +00:00
Wanne 5ea8d277f7 - Bugfix: Bobby Ray shop shown wrong values under 'size' (by DepressivesBrot)
o Both guns and magazines use DisplayMagazine (Laptop\BobbyRGuns.cpp ll. 1989) to display capacity and both try to get their capacity from the Magazine array whereas guns should get it from the Weapon array.

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5117 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2012-03-25 22:22:34 +00:00
MaddMugsy 4e6881ccb4 fixed br name and desc for 12 gauge slug box
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1373 4f8fa57e-7814-0410-bad4-adc449f26b7c
2012-03-25 07:32:06 +00:00
Wanne b4d664426d - Fixed random crashes in option screen when turning on/off options in a DEBUG build (by tazpn)
o The bug was related to the timing changes introduced by the new thread. By allowing mouse events to be asynchronously put into the queue while the gameloop is running

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5116 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2012-03-24 11:13:39 +00:00
MaddMugsy 0f8bf8090e -removed two unused entries from the end of TonyInventory.xml
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1372 4f8fa57e-7814-0410-bad4-adc449f26b7c
2012-03-24 02:32:13 +00:00
Wanne c7a191542e - Replaced wrong Magazines.xml (by Madd Mugsy)
- Added JA2_Map_Editor_Tutorial.pdf

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1371 4f8fa57e-7814-0410-bad4-adc449f26b7c
2012-03-23 21:29:27 +00:00
Wanne ac35024843 MERGED source game dir files from development trunk revision 4890 up to latest current revision 5105
Development Trunk (now obsolete): https://ja2svn.dyndns.org/source/ja2/branches/Wanne/JA2%201.13%20MP
A detailed list of all the features (changes) is visible in the history log of the development trunk:

- New JA/DG Merc: Version 2.9
o Up to 20 new characters with complete speech from JA/DG
o see JA2_DG_Merc.txt for more infos

- A few more adjustments to the GameDir files

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1365 4f8fa57e-7814-0410-bad4-adc449f26b7c
2012-03-23 20:30:23 +00:00