Commit Graph
342 Commits
Author SHA1 Message Date
lalien 3e22dce318 Merged Multi Player Project into main branch
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2144 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2008-05-12 08:20:47 +00:00
ChrisL bdcc920c63 Build1936
Minor adjustments to some of the rendering functions to grant a bit more control to the code.
Adjusted the mouse areas for key and item popup windows.
Added the pocket capacity indicator to sector inventory when using NewInv mode.
Added the right click option to sector inventory so you can view/manipulate stacks and view item descriptions without first equiping an item.
Updated sector inventory so that capacity values appear in all pockets.  Not just currently filled one.
Updated sector inventory so that newly placed items could be right-clicked on for details.
Increased the mouse region for the various stack popups so there is always room to close the popup without activating the description box.
Fixed a bug in the sector inventory description panel that caused a crash when trying to remove an attachment.
Fixed sector inventory so you can add attachments to weapons.
Fixed some weight issues.
Fixed a crash resulting from right-clicking in sector inventory while Item Desc window was already open.
Fixed the "Active Squad" message so it displays the squad that is actually activated.
Fixed a bug that allowed you to start a new game in NewInv mode while in 640x480 resolution.
Updated the Item Description windows so you can load a gun as well as unload.
Added new CTRL+SHIFT+D hotkey to delete all items in sector.
Added new CTRL+SHIFT+S hotkey to sell all items in sector, assuming you have the ALT+LMB option turned on in your INI file.
Fixed a problem with sector inventory item description where the status did not appear for items that couldn't stack.
Fixed a problem with Nails so he always starts with his leather jacket, even if you don't buy his gear.
Incorporated a failsafe so that NewInv mode can't be selected, nor NIV saves loaded, when no custom data path is set.
Add new IC_BELTCLIP item class.
Update pocket definition restrictions to use bitwise compare.
Add failsafe so that you can't merge LBENODEs.
Reset VC2005 so it doesn't point to a specific drive.


git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@1936 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2008-03-29 20:35:03 +00:00
ChrisL 6d31772abd Altered the pName field from Pockets.xml to a CHAR16 value so it will support multilingual code.
Updated the Pockets.xml reader function so that we can include a german.pockets.xml and russian.pockets.xml (and any other language we eventually choose to support) just like we have with Items.xml.
I moved the "Sold Item" and "Delete Item" phrases to the language specific cpp files.
I updated the SHIFT+N hotkey so that it will now work from the strategic screen.  On tactical it handles the entire team.  On strategic, it handles only the one merc who is currently active.
I fixed a problem with the ALT+W cheat key so that it cycles properly.
I fixed a problem with the backpack buttons where the button key wasn't being properly deleted.  This could sometimes cause an "overload" which would result in a crash.

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@1873 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2008-03-09 17:26:55 +00:00
lalien 43ca24dda8 Merged New Inventory Project into main branch
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@1871 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2008-03-08 15:15:25 +00:00
Wanne 411fdd1584 - bugfix: Bug #79: Creatures are gone if you compress time in strategic and select auto battle
- bugfix: Bug #51: Speck sends wrong mail if any of the 4 new guys (Text, Stogie, Biggens, Gaston) level up.
- added missing description texts for IMP skill rooftop sniping and camouflage (also translated in german and russian)



git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@1796 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2008-02-12 18:56:38 +00:00
bugmonster c33b00d6ff - additional text moved to _*Text.cpp for localisation purposes
- refined Russian text

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@1667 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2007-12-12 18:21:35 +00:00
bugmonster 574b8e3218 - Improved compatibility with different russian JA2 distribs' resources
- International/russian *.npc file format unified, performed conversion on-the-fly
- New 1.13 messages' text moved to Text.h/_*Text.cpp
- Russian translation fixed/refined

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@1610 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2007-11-12 18:40:15 +00:00
Wanne ce31084ae7 Removed most of my thousands "WANNE" comments which goes back 2 years when I changed to higher resolutions. These were only internal comments for me, so they didn't include any useful meaning for others.
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@1172 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2007-08-07 21:39:23 +00:00
lalien 6cf3fbbe5a - added new militia control command
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@1020 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2007-06-29 21:19:11 +00:00
lalien 0530b53b9c bug fixes from Overhaul:
- Data type changes 
- Templates removed

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@871 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2007-05-09 13:16:37 +00:00
lalien a17a3f7cc8 - New feature: Remove attachments and unload all weapons in sector (Shift+F)
- Fix for grenade launchers (allow reloading with valid ammunition only)
- Fix for stacking items in sector



git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@855 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2007-04-19 09:28:28 +00:00
lalien c2528cab4f - changed UINT16 to wchar_t for VS 2005 compliance
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@781 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2007-03-13 20:01:02 +00:00
Wanne 8e5f803fc4 - updated credits screen to the 1.13 Credits
- translated "low cpu usage" option text for german version
- improved existing "escorting kulbas" bugfix

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@741 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2007-02-25 13:41:15 +00:00
lalien 81f5b6e748 - new menu option: Low CPU Usage (patch from MTX/defrog)
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@725 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2007-02-21 17:17:00 +00:00
Wanne c5fce58380 - bugfix: CTD in German Version if you press 'q' in tactical (-> Missing strings in _GermanText.cpp)
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@694 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2007-01-31 21:45:05 +00:00
Wanne 243ed1bac7 Translated "Silent Skyrider" option text for German version
Added some missing option texts for Dutch, Polish, ...

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@669 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2007-01-21 10:20:34 +00:00
Wanne 358fc9e31c - feature: Added filter buttons for Misc items to Bobby Rays
new exe build (656)

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@657 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2007-01-07 21:03:32 +00:00
Wanne 3d1337ebeb - feature: Added armor filter buttons (helm, vest, legging, plate) to Bobby Rays
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@655 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2007-01-07 15:56:55 +00:00
Wanne c351c27e37 - bugfix: Endless clock after stealing
- changed: APs for stealing from 10 to 14 (because stealing is more than simple picking enemies gun)
- changed: You cannot steal items from head, body, leg or face until the enemy is collapsed (lying on the ground)

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@631 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2006-11-13 08:36:36 +00:00
Wanne 447ba8cbf7 - tooltips on the enemy are only displayed if the enemy can be seen by the selected merc. This only takes effect if tooltip detail level = 1 (limited) or 2 (basic)
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@624 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2006-11-08 21:27:13 +00:00
Wanne 099ce17225 - bugfix: Wrong APs deduction from stealing
- bugfix: Prevent Nada objects from stealing

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@622 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2006-11-07 21:25:26 +00:00
Wanne 941d745247 - moved hardcoded tooltip strings to the existing language string files
- translated tooltip strings for German Version

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@611 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2006-10-31 11:31:00 +00:00
Lesh c1bddf1c9c - provided code for:
1) changing max number of slots for towns (hardcoded value).
2) highest town index defines the number of towns on map (user defined value via xml).


git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@606 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2006-10-29 07:10:44 +00:00
Wanne cdf263093a - build of the new release & update (602)
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@602 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2006-10-13 12:42:10 +00:00
Lesh bd7e2c5b8f - enabled town names in cities.xml
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@597 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2006-10-09 18:52:11 +00:00
Wanne 4341409ded git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@590 3b4a5df2-a311-0410-b5c6-a8a6f20db521 2006-10-04 12:24:10 +00:00
Wanne ba83608c40 - bugfix: Wrong chance to hit calculation on RPG rocket launchers
- bugfix: CTD in German version when using auto fire (-> missing German language strings)
- updated German and English language files

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@548 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2006-09-22 21:10:48 +00:00
Wanne 67663339a3 - bugfix: Enemies do not wear NVGs at night
- add: Missing option screen text for "Random I.M.P personality"

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@541 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2006-09-20 09:23:48 +00:00
Wanne 6f06b9ce78 - bugfix (from build 529): IMPs have wrong voices
- bugfix: Multiple IMPs with same voice causes wrong data and CTDs. Now it is impossible to have multiple IMPs with the same voice. No more invalid IMP data with multiple imps (hopefully) ;)
- You can have a maximum number of 6 imps (3 women and 3 men). All have different voices
- If an IMP is cloned (90210, nickname) an unused voice is set. So we have correct data
- Prevent the user from selecting used voices in the IMP Voice selection screen


git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@535 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2006-09-18 19:31:34 +00:00
Wanne 18a1d0e519 - bugfix: Getting incorrect data & CTDs when using multiple IMP characters with same voices. Now it is possible to have up to 6 merc with the same voice without getting incorrect data. No more need to use different voices! (IF YOU PLAY WITH MULTIPLE IMPS, YOU SHOULD START A NEW GAME, BECAUSE THE IMP CHARACTERS GAME DATA IS INCORRECT!)
- bugfix: CTD when using Random personality in I.M.P creation
- moved Random personality flag from INI to option screen
- added MAX_IMP_CHARACTERS entry in the ja2_options.ini (Range: 0 - 6)

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@528 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2006-09-17 07:31:34 +00:00
Wanne 0eadcefc0d Bobby Rays Filter Buttons: Removed "Heavy Weapons" filter from ammo, renamed "LMG" to "MG", removed "Ammo" filter from Used items.
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@457 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2006-08-20 19:46:17 +00:00
Wanne fa0744a0d9 Bobby Rays: Added "Heavy Weapons" Filter to the Guns and Ammo.
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@429 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2006-08-12 11:41:39 +00:00
Wanne c739efc56e Bobby Ray: Filter Guns, Ammo and Used!
Filters for Armour and Misc will follow

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@423 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2006-08-11 10:21:36 +00:00
MaddMugsy aad2a17a6c -fixed "Crouched/crouched move" appearing in skill descriptions instead of "expert"
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@403 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2006-08-04 17:51:19 +00:00
Wanne 7e68050d01 Changed the text description of the "Rain noise" in the option screen.
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@366 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2006-07-22 10:49:27 +00:00
Wanne b6df04a08a Rain noise can be toggled ON/OFF in the Options Screen
Added Brightness Level string to the German Version, when pressing "F" in tactical screen

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@363 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2006-07-21 21:09:50 +00:00
lalien 819b94ecf9 - changed tool tips for launchers and armor
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@132 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2006-05-29 18:41:06 +00:00
lalien b9bd4cda26 - extended item info on tool tip
- new strings for item info in English/German/Russian
- German translation updated
- screen shots are not overwritten anymore
- bug fix: climbing on roof with 'j' caused CTD
- reinforcements in Omerta allowed on insane difficulty



git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@125 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2006-05-27 23:19:57 +00:00
lalien cebf24fb8e Little Alien
New feature: Rearrange sector inventory
- Press Shift+S in tactical to rearrange sector inventory

- Tactical militia command: "Find Items" menu disabled
- Tactical militia command: orders to dying militia now not possible







git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@69 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2006-05-13 15:29:30 +00:00
lalien 3e5e48af29 *********************************************************
*	2006/04/30                                      *
*	RoWa21                                          *
*	Developed in VS 2003                            *
*********************************************************

Source:

- Re-enabled Ironman-Feature in the "Start new game screen"
- Added a "Previous" and "Next" button to the merc account screen

Data:

- Added new data (data\laptop)



git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@43 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2006-04-30 13:13:21 +00:00
lalien 1dc64849d3 Source v1.13 Mod High Resolution version from 2006-04-16
*********************************************************
*	2006/04/16					*
*	RoWa21						*
*	Developed in VS 2003				*
*********************************************************

- Updated the language files in the utils project from lalienxx

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@26 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2006-04-19 18:29:45 +00:00
lalien e54aeb96aa Original Source for 1.13 Mod High Resolution version from 12/06/05
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@21 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2006-04-19 11:32:51 +00:00