Commit Graph
1240 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
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 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 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
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
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
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
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 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
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
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
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
Wanne 7ca53fadc7 *** MERGED source code 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:

INFO: There will be no further development in the development source trunk, so is obsolete from now on!

This commit contains the following features (bugfixes are not listed):

- New Feature: Show merc ranks in Strategy Screen before merc name
o Toggle on/off in the ingame options screen
o For each experience level (0-10) there are defined rank names in the language specific text files
o Additional language text that is not translated yet is marked with // TODO.Translate

- New Feature: Faster Bobby Ray Shipments
o This feature is selectable in the ja2_options.ini
o When activated Bobby Ray shipments will be really fast
-> Overnight Express: 5 - 7 hours
-> Air Service: 10, 12 or 14 hours
-> Standard Service: 15, 18 or 21 hours
o In a multiplayer game, this feature is disabled (because shipment arrive immediately in the destination sector)

- New Feature: AP cost for manipulating the merc inventory
o This feature is selectable in the start new game screen
o For example, putting a weapon from hand in the backpack costs APs
o The AP costs are defined in the APBPConstants.ini
o In a multiplayer game, this feature is disabled

- New Feature: Added possibility to set individual Gear Kit names
o Set individual names in the optional new tag <mGearKitName> inside the <GEARKIT> root element (File: TableData\MercStartingGear.xml)

- New Feature: Externalized the maximum purchase amount (JA2 vanilla: 10) for Bobby Rays purchases per shipment
o Define the max. amount in the ja2_options.ini: BOBBY_RAY_MAX_PURCHASE_AMOUNT, Range: 10 - 100)
o Nice scrolling bars to scroll through all the purchases

- New Feature: Now it is possible to walk on "water" tiles or handle those tiles like "normal" tiles 
o (instead of showing the swimming animation and counting the APs for swimming), when the soldier is located on the second level (level > 0)

- New Feature: Externalized AIM Veterans laptop site
o Add maximum of 4 pages
o Add  new AIM to veterans page, and remove AIM from veterans page.
o New XML file: OldAIMArchive.xml (language specific XML files: *.OldAIMArchive.xml)

- New Feature: Added possibility to choose from 254 IMP faces
o Modified IMPPortraits.xml
o Added new GameDir folder "IMPFaces" which contains the IMP face portraits
o Moved IMP faces in the new "IMPFaces" folder

- New Feature: ARSP - All Resolution Support Project
o See here: http://www.ja-galaxy-forum.com/board/ubbthreads.php?ubb=showflat&Number=298698&page=1
o Support any kind of screen resolution. This works by choosing the matching full supported resolution (640x480, 800x600, 1024x768) and then centering the graphics
o See ja2.ini for defining the screen resolution

- New Feature: AI Turn Speed Up (FF-MOD)
o see here: http://www.ja-galaxy-forum.com/board/ubbthreads.php?ubb=showflat&Number=298699#Post298699
o When this feature is activated it allows fast enemy turns
o New entry in ja2.ini to enable this feature: HIGHSPEED_TIMER = TRUE
o Turn on/off auto fast turns in ingame options
o New ja2_options.ini settings for fine tuning: [Clock Settings] ini block

- New Feature: "Lock" / "Release" mouse cursor in tactical windowed mode, so the mouse can stay within window boundary
o This is very helpful for doing scrolling with the mouse (by moving the mouse to the window edge) in windowed mode
o You can toggle on/off the feature by pressing CTRL + Z. It is also possible to press CTRL + Y. So the user can decide which fits better :)
o Whenever you toggle on/off a screen message appears on the tactical log to notify the player

- New Feature: Weapon overheating
o Basically, every shot fired from a gun increases its temperature. On higher temperatures, the gun jams more frequently
o On/off toggle in the ingame options
o Graphical thermometer indication on the weapon picture
o New ja2_options.ini section with a few options, Section: [Tactical Weapon Overheating Settings]
o XML changes (New Tags)
--> AmmoTypes.xml: <temperatureModificator>
--> Items.xml: <barrel>, <usOverheatingCooldownFactor>
--> Weapons.xml: <usOverheatingJamThreshold>, <usOverheatingDamageThreshold>, <usOverheatingSingleShotTemperature>
o Added a few barells to Items.xml (end of the file)
o more infos: http://www.ja-galaxy-forum.com/board/ubbthreads.php?ubb=showflat&Number=301059&page=1

- New Feature: Resting weapons on a surfaces
o You can now rest your weapon on crates, low walls, rocks, debris, open windows etc. while you are crouched. Resting will give yu the superior gun handling modifiers from PRONE position.
o A little 'A' on your gun indicates if you are resting it or not.
o Both settings can be turned on and off in Ja2_Options.ini under 'Tactical Gameplay Settings'

- New Feature: Externalized option on whether mercs can exit sector using grid exit in turn based mode
o new ja2_options.ini property: GRID_EXIT_IN_TURNBASED
o This ini setting does not affect leaving sectors on map edges

- Rework/Update: Ammo boxes and Ammo crates
o Ammo crate items added for remaining calibers.  Tweaked prices to correspond to magazines, tweaked capacities and weights to be reasonable (~800 or less).
o Shift-R reload now looks at both boxes and crates in sector items and merc's inventory to reload, and tops off magazines in inventory as well.  Only possible outside of combat.
o Ctrl-Shift-A still creates crates as per usual, with some fixes to ensure all ammo is caught on the first press.
o Shift-A now creates ammo boxes in the same loop.  They mostly behave like crates, but fit in mercs inventories.
o Ammo boxes are available to purchase at BR and tony, sam, etc.  Individual magazines/drums/etc are no longer available.
o Removed ammo crate xml tag.  Added ubMagType tag to Magazines array.  This allows us to differentiate between magazines, bullets, boxes and crates.
o Changed ammo filtering in BR's to display boxes appropriately.  Added back the "Mag:" display (changed text to "Size:")
o Added ja2set.dat.xml file (WF map version in WF maps folder) to be used instead of ja2set.dat file (ja2.ini setting added) For now, if you want to play vanilla instead, just change the setting in the ini (see comments in file).
o Added P4-P9Items image files (up to 5k images each) and tileslots.  1.13 core items will continue to use Guns and P1-P3Items for the foreseeable future.  P4-P9 can be used by customizers/modders to avoid conflicts with Guns/P1-P3 items.  TODO: Need to discuss a strategy for this in the forums.
o Added in Ambient/0.bad and 32.bad to avoid an exception in the code.
o Updated the XML Editor
o Standardized the text on all the ammo items.

- New Multiplayer Feature: Sharing same FOV (field of view) in a coop/team-dm (for friendly teams) game
o You will also see enemies, that your teammate sees

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5108 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2012-03-23 18:46:54 +00:00
Wanne ab80b4e191 MERGED bugfix from revision: 5007
- Bugfix: Speck did not send Email when one of his merc leveled up
TODO: We have to add text from the Email.edt file to the externalized XML files in "TableData\Email" folder

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5008 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2012-03-01 15:54:58 +00:00
Wanne 95547fe620 MERGED bugfixes from revision: 4987
- Bugfix: Fixed crash, when you are in tactical turn based and you show the item description from a sector inventory item and then you close the sector inventory when the item description is still open
o Now you have to close the item description box first. A message box will output you the error and you can't close the sector inventory when the item description box is open

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@4988 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2012-03-01 12:53:42 +00:00
Wanne 9e84dc989e MERGED bugfixes from revision: 4966
- Nullpointer check-fix (by tazpn)
o random null pointer check

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@4978 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2012-02-29 00:57:48 +00:00
Wanne b95ae8b528 MERGED bugfixes from revision: 4935
- Changed encoding of Email.cpp to UTF8, because of compilation problems for our Chinese friends

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@4977 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2012-02-29 00:57:14 +00:00
Wanne 5d5dd0defa MERGED bugfixes from revision: 4927
- Bugfix: IMP pool already reduced before actual payment & character creation are done (by Buggler)

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@4976 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2012-02-29 00:56:21 +00:00