7604 Commits
Author SHA1 Message Date
Wanne 9e40cee476 - New Shortcuts (by Buggler)
New Hotkeys
o Strategic Screen:
Hotkey 'r': Mobile Milita Restrictions

o Sector Inventory (with popup text):
Hotkey ',': Previous Page
Hotkey '.': Next Page
Hotkey 'Esc': Exit Sector Inventory 

o Addtional Changes:
Bobby Ray's button text 'Punch. W.' changed to 'Blunt W.' - more appropriate & consistent with XML Item Class name

o Cosmetic Corrections in Sector Inventory

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@4647 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2011-09-12 17:44:05 +00:00
Wanne 1687c148f9 - New Feature: Added option to disable the automatic cursor swap (between exchanging positions and other actions eg. talking). (by tazpn)
o if enabled in the option screen, the cursor will not change periodically to the exchange position.
o if enabled, you can manually exchange positions by pressing 'x'
o see here: http://www.ja-galaxy-forum.com/board/ubbthreads.php?ubb=showflat&Number=290487#Post290487

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@4643 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2011-09-09 06:50:17 +00:00
ChrisL 9b566f502c Fixed a NCTH bug where a negative PercentCap would not calculate properly because the uiCap variable it applies to could not support signed results.
Fixed a NCTH bug where a negative PercentTargetTrackingSpeed would not calculate properly because the uiTilesForMaxPenalty variable it applies to could not support signed results.

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@4637 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2011-09-06 21:19:52 +00:00
Wanne bf24cce595 - Moved 4 animations from "Data\Anims" to "Data-1.13\Anims", because they are replacements of existing animations and should only be in the "Data-1.13" folder to keep the originals in the "Data" folder
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1330 4f8fa57e-7814-0410-bad4-adc449f26b7c
2011-08-26 18:08:12 +00:00
Wanne c333679d35 - Added new gun and pistol shooting animation for big male (by PasHancock)
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1329 4f8fa57e-7814-0410-bad4-adc449f26b7c
2011-08-25 18:44:09 +00:00
Wanne 829ce0b902 - Fixed wrong version number for Map Editor (45522 -> 4552)
- Increased MP version from 1.7 to 1.8 (because the grenade throwing crash should be fixed -> see Revision 4610)

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@4621 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2011-08-23 06:47:48 +00:00
Wanne c04c93857f - New Feature: Quick attachment selection (by The_Bob)
o The popup will list attachments available for the given slot on the current weapon. Ones not in sector inventory will be greyed out.
o It should show up after clicking on an empty attachment slot, provided these criteria are met:
--> we are on the mapscreen
--> the sector inventory is open
--> the selected merc is in this sector
--> there is no combat in this sector





git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@4620 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2011-08-23 06:42:39 +00:00
Wanne acbe830273 - Added new SMACKW32.DLL (from UC), which should allow to play custom smacker videos (e.g. UC videos, ...)
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1328 4f8fa57e-7814-0410-bad4-adc449f26b7c
2011-08-18 17:36:22 +00:00
Wanne e55fb6e54f - Changed codepage for Russian text files from 1252 to UTF 8 (so it is readable on all development PCs) (thx to Inshy for providing the files)
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@4619 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2011-08-18 14:10:10 +00:00
Wanne 4edd41a6bb - Finished the reworking of the Sun Goggles face gear
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1327 4f8fa57e-7814-0410-bad4-adc449f26b7c
2011-08-16 15:12:13 +00:00
Wanne 3adece943e - Disabled the sun goggles, cause not all images in the STI are reworked
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1326 4f8fa57e-7814-0410-bad4-adc449f26b7c
2011-08-16 07:25:55 +00:00
Wanne a40da542f7 - Added new face gear: Sun Goggles (by PasHancock)
o Only merc Index 0 - 10 is currently adjusted
o Empty Face_SunGoggles_IMP.sti. We need to add sun goggles for imps

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1324 4f8fa57e-7814-0410-bad4-adc449f26b7c
2011-08-15 14:54:41 +00:00
Wanne 7ab084838f - Added "PasHancock" to the official 1.13 credits
o PasHancock is working hard on new / updated animations

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@4616 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2011-08-14 21:27:27 +00:00
Wanne 8c1b491330 - Updated a few existing animations (by PasHancock)
o Fire in prone with rifle (S_R_PRN.STI) (Reg Male)
o Muzzle flash for pistols (S_N_SHOT.STI (Reg Male)
o Visible Pistol in prone (S_N_PRNE.STI) (Reg Male)

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1322 4f8fa57e-7814-0410-bad4-adc449f26b7c
2011-08-14 20:58:43 +00:00
Wanne 068c67c78c - Bugfix: Multiplayer: Fixed crash when trowing items (by Realist)
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@4610 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2011-08-14 09:22:21 +00:00
Wanne 8c7ae17f36 - Updated number of Traits in Skills_Settings.INI (because Dr.Q has 3 major traits)
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1321 4f8fa57e-7814-0410-bad4-adc449f26b7c
2011-08-11 20:05:48 +00:00
Wanne 549a8fc486 - Minor update by Off_topic
o Dr. Q now has all his original traits
o WF mercs repriced according to skill/experience. No longer all bunched together.
o Attitudes tweaked after brainstorming with several Bear'spit members.







git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1320 4f8fa57e-7814-0410-bad4-adc449f26b7c
2011-08-11 14:55:06 +00:00
Wanne ed3f6fbcdf - Added new female grenade throwing animation (by PasHancock)
o In this animation the persons takes out the pin from the grenade before throwing

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1319 4f8fa57e-7814-0410-bad4-adc449f26b7c
2011-08-08 17:41:43 +00:00
Wanne 98c4e23828 - Added new graphical faces gear: SWAT Helmet (by Jazz)
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1318 4f8fa57e-7814-0410-bad4-adc449f26b7c
2011-08-05 05:47:03 +00:00
Wanne 1a2c89eea1 - Improved Bugfix:
BUGZILLA #556: Fixed CTD if enemy bleeds to death at the end of a players turn

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@4598 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2011-08-01 21:57:47 +00:00
Wanne f64fc4133c BUGZILLA #556: Fixed CTD if enemy bleeds to death at the end of a players turn
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@4597 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2011-08-01 20:55:09 +00:00
Wanne ed2a8c4587 - Added possibility to use a new FONT\BLOCKFONT3.sti file in the code, which can be used for the 1024x768 map graphic texts
o Currently the variable used the FONT\BLOCKFONT2.sti, but we can change that later (once we have the STI file ready) easily in Font Control.cpp (Line 197)

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@4596 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2011-08-01 20:44:26 +00:00
Wanne fa20d0c079 BUGZILLA #557: Fixed CTD when entering Estoni I6 (fix by TheBob)
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@4595 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2011-08-01 20:41:58 +00:00
Wanne b16577d82a - Bugfix: Old IMP Creation
o Fixed bug with IMP Attributes selection, where you could lower value to 0 and get bonus points

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@4593 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2011-08-01 12:09:03 +00:00
Wanne 17c2c76bdf - Bugfix: Old IMP Creation
o Fixed bug with IMP Attributes selection, where you could lower value to 0 and get bonus points

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@4592 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2011-08-01 12:05:36 +00:00
Wanne 9773b338fd - Translated missing EDB Description Tooltip messages to German
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@4585 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2011-07-22 10:24:40 +00:00
Wanne 20e1e49964 BUGZILLA #549: Fixed mercs not showing up on MERC website
o Workaround for old bugged savegames: If passed day 30, make merc available on MERC website
o Fixed problems with merc not showing up after Larry was added
o Fixed white background graphic when MERC website is down (broken link)

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@4583 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2011-07-21 16:38:11 +00:00
Wanne 9630f0f21f BUGZILLA #548: Fixed crash (division to 0) when finishing training of mobile militia
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@4582 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2011-07-21 13:58:50 +00:00
Wanne 2170bd5b4e - Bugfix: Fixed incorrect email message text for new custom user merc (uiIndex >= 178), when merc is availabe for business on AIM
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@4581 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2011-07-21 13:47:46 +00:00
Wanne ba34e2d24c - LockNLoad MOD Update (by Off_Topic)
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1317 4f8fa57e-7814-0410-bad4-adc449f26b7c
2011-07-21 08:02:05 +00:00
Wanne 672012b640 - Changed usMouthY coordinate for Barry back to 28 (thats the original value in prof.dat)
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1316 4f8fa57e-7814-0410-bad4-adc449f26b7c
2011-07-20 10:14:58 +00:00
Wanne d2055c223f *** LockNLoad MOD v1 (by Off_Topic)
Link: http://www.ja-galaxy-forum.com/board/ubbthreads.php?ubb=showflat&Number=286021&page=1

#All Mercs now have their original 1.12 traits.

#STOMP traits revised to match original traits as closely as possible. Some Mercs have extra traits to make use of STOMP.

In some cases i used Demo instead of Throwing as this is how Grenades are linked now.

Raven and Lynx are the only AIM Mercs with Scouting as it is a very powerful trait. There are also 1 Merc & 1 RPC with this trait.

Because some traits have been made minor, a few Mercs like Igor have been given another trait. All STOMP traits have been used.

Electronics is a funny trait to translate into STOMP:

Old Trait: Improves chances (+15) of modifying/assembling electronics, picking electronic locks and disarming electronic traps, and attaching remote detonators.

So for some it means DEMO while for others it means Tech.

#All WF Mercs have been given their proper starting gear, minus the grenades and kevlar leggings etc...

#Every Merc has their 1.12 gear now, select *Kit 2 if you would like to experience how JA was originally released.

*Static,MD, & Spider kept their 1.12 gear, so for them it is Kit 1.

Kit 1 is their 1.13 gear. K2&3 are normally a choice of weapons/equipment etc... K5 is aimed at the Mid-Late game, but that's not to say you can't sacrifice manpower for equipment.

#All the 1.13 added weapons & equipment have had 100% condition replaced with how they would have shipped in 1.12 along with other minor fixes.

E.G. Malice MAT-49 100%->87%

#All Mercs now have 5 Kit to choose from.

#Corrected the Wildfire Mercs Bios.

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1315 4f8fa57e-7814-0410-bad4-adc449f26b7c
2011-07-20 10:12:27 +00:00
Wanne df77835fde -Fixed missing transparent (MBS_800x600.sti) (by Inshy)
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1314 4f8fa57e-7814-0410-bad4-adc449f26b7c
2011-07-19 09:49:50 +00:00
ChrisL 75e797f9ae BUGFIX 551: Prior fix would allow items to be auto placed into the wrong sector if you had a sector inventory panel already open. The code should now realize that the wrong sector inventory screen is displayed, close that screen, switch to the correct sector, and then open the sector inventory panel before placing the item into sector inventory.
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@4573 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2011-07-14 16:46:14 +00:00
ChrisL 49a7405861 BUG 551: Items auto placed into world inventory might accidentally be dropped into the wrong sector. Now, when you're on the map screen, the sector inventory panel is closed, and you try to drop something into the world, sector inventory should automatically open so that items can be placed directly to the sector panel.
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@4571 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2011-07-14 16:07:41 +00:00
ChrisL af82df815b Corrected Vision Range Bonus display issue on UDB.
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@4567 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2011-07-12 19:23:31 +00:00
Wanne 085180af3d BUGZILLA #546: Fixed crash in InitPreBattleInterface()
- It seems the wrong 2nd parameter was passed to the method call InitPreBattleInterface(), when calling this method from from Dialogue Control.cpp (Line: 933)

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@4565 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2011-07-11 11:42:22 +00:00
Wanne 0c8aa89f08 - Bugfix: Disabled the experimental fix from Headrocks HAM 3.2, were enemies with 0 APs can enter the battle
o This experimental fix caused assertion errors in AddPossiblePendingMilitiaToBattle()

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@4564 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2011-07-11 10:39:47 +00:00
Wanne 02f7f2037c BUGZILLA #545: Enlarged font size in 1024x768 for strategy map screen
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@4561 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2011-07-07 11:25:16 +00:00
inshy 483ccd334f -Update price for UB items
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1311 4f8fa57e-7814-0410-bad4-adc449f26b7c
2011-07-02 12:47:21 +00:00
ChrisL 69e0832a88 Bug 540: Fixed issue where CTRL + SHIFT + A was creating full ammo crates without consolidating any ammo.
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@4553 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2011-07-02 06:21:05 +00:00
Wanne fc24d5b2b7 *** Official Update Version: 4552 ***
- Increased Version number to 4552

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@4552 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2011-07-01 12:00:59 +00:00
Wanne f65f029305 MERGED FEATURE FROM DEVELOPMENT TRUNK: Enlarging Strategy Map (Revision: 4527 - 4534)
- This feature enlarges the strategy map in 800x600 and 1024x768 (like in Wildfire 6.0)
- You also have to update the GameDir folder from the official SVN GameDir folder with the latest graphics

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@4551 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2011-06-30 14:53:16 +00:00
Wanne ded6885ee5 Enlarging Strategy Map in 800x600 and 1024x768
o Added new/modified Game graphics
o The new game graphics only work together with a new executable which includes the enlarging strategy map feature!!
- You have to update the actual source trunk if you want to build your own executable or have to wait 2-3 days to get the official 2011 update

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1310 4f8fa57e-7814-0410-bad4-adc449f26b7c
2011-06-30 14:52:04 +00:00
Wanne 88e98b5023 - Fixed redundant code duplication when initializing SectorNames.xml for foreign (not English) language
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@4549 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2011-06-30 11:32:01 +00:00
Wanne 08c9bad363 - Fixed starting inventory for MD (thx to Off_Topic)
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1309 4f8fa57e-7814-0410-bad4-adc449f26b7c
2011-06-30 10:18:17 +00:00
Wanne 73a10dceaf - Singleplayer: Fixed exploit, when it is enemies turn, you can still move when pressing CTRL + L or CTRL + S to open the Save/Load screen and then close the screen without loading/saving
o I just disabled loading/saving via the load/save screen when it is the enemies turn
o You can still save load via the quicksave slot

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@4543 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2011-06-29 17:35:42 +00:00
Wanne 221bad1406 Multiplayer: Fixed exploit, where a client (which does not currently have the turn) can still move when pressing CTRL + L or CTRL + S to open the Save/Load screen and then close the screen without loading/saving
o I just disabled loading/saving while in turn based mode in a multiplayer game

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@4542 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2011-06-29 17:06:23 +00:00
Wanne 4c098a5097 - Fixed type mistakes (Hardest battle, Surgeries undergone) (thx to Zalpha)
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@4536 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2011-06-27 18:01:28 +00:00
Wanne 2cbc52e265 - Fixed "out of memory" crash when loading a savegame with NIV and the wrong "Items.xml" files
o In my case the ja2 process took ALL the memory (up to 2GB) and then crashed
o The problem is, that the "objectStack.resize(size);" consumes ALL the memory when passing in invalid huge size to the resize method
o The wrong "size" is calculated from the temporary files because of wrong items. Now I added a safety check on the size variable and if out of range ( > 1000) we simply fail loading the savegame instead of letting the ja2 process consume all the memory and then let it crash after a few minutes.


git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@4532 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2011-06-25 09:53:40 +00:00