Commit Graph
229 Commits
Author SHA1 Message Date
Wanne eedb409e48 - added multiplayer folder include for tactical project for release version
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2180 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2008-05-18 10:22:16 +00:00
Wanne 10e518110a - bugfix mp: ctd if client opens inventory in tactical, if server and client had selected different inventory in the start new game screen. Now I changed that, so each client can decide new or old inventory.
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2149 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2008-05-12 19:41:21 +00:00
Wanne 1b5393014d - added INI option for new tracer bullets (USE_BULLET_TRACERS)
- corrected some german spelling mistakes
- new release build (2147)

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2147 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2008-05-12 10:57:06 +00:00
Wanne 9dfd4e096e new exe build (2146) which also contains multiplayer
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2146 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2008-05-12 09:48:10 +00:00
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
Wanne d8590d3474 new release and editor (build: 2112)
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2114 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2008-05-07 16:55:24 +00:00
ChrisL 5a57354297 Fixed item "beaming" bugs that allowed items to be grabbed from a sector your merc wasn't currently in.
Fixed the map editor so that "Nada" items don't appear in the item lists.

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2088 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2008-04-29 17:33:49 +00:00
Wanne 6d4b38541b - Removed "Realist" from the 1.13 Credits, because he said to me it is a mistake that he is named there.
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2086 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2008-04-27 11:10:46 +00:00
Wanne d36ce7a019 - new exe build: 2083
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2083 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2008-04-26 08:28:50 +00:00
ChrisL b4b31cdb06 Fixed a CTD that occurs when closing sector inventory while the item description window is open.
Added a new ALLOW_SECTOR_DESCRIPTION_WINDOW flag to the ja2_options.ini that allows players to turn off the stack popup and item description functionality for the sector inventory panel.

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2063 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2008-04-21 21:04:35 +00:00
ChrisL ece7ec25bb Resolved an inadvertent memory leak I put into the code while fixing a previous CTD.
Cleaned up the cursor graphics so that the cursor is properly updated when reloading stacks of weapons from the stack popup screen.

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2058 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2008-04-21 06:39:01 +00:00
ChrisL 896891431d Fixed a CTD that occured when reloading a weapon from the sector inventory panel.
Fixed the sector inventory panel so that you could reload weapons that could be stacked.

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2046 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2008-04-18 22:41:09 +00:00
ChrisL 2d5c6e2996 Fixed a bug in the "sell all" strategic inventory screen options. Money now gets sold without modification and unreachable items can't accidentally be sold.
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2039 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2008-04-17 16:47:50 +00:00
ChrisL bffdfcc75d Fixed an OIV mode bug where RPCs don't get initial gear at hire.
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2037 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2008-04-16 16:42:43 +00:00
ChrisL 4ccad69873 Updated version number.
Bugfix to resolve a Map Editor problem where you would constantly receive a "Major Version Update" message.

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2032 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2008-04-15 18:56:39 +00:00
ChrisL 94eee4138c Updated game version to match the most recent SVN gamebranch upload. No idea why I missed this during the rev2013 update.
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2027 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2008-04-15 15:34:56 +00:00
ChrisL fbf63c8af0 Setup failsafe to block NIV Mode if "Data" is specified as the CUSTOM_DATA_LOCATION.
Setup language specific files to be optional.
Setup code to accept all language specific files for items.xml, pockets.xml and ammostrings.xml.

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@1953 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2008-03-31 19:02:34 +00:00
ChrisL a7e6b96bbe Build1937
This build includes the "Professional Sniper" skill and changes made to aiming and scopes in the CTH calculation functions.
Modified Sniper skill and "per click" aim bonus functionality.
Added some adjustments to how Scopes effect the CTH calculations.  This should drastically reduce the effectiveness of sniper weapons and scopes, while still leaving them effective at closer ranges.
Adjusted the scope vision bonus so that it plays on range with a minimum attainable reduction equal to the scopes minrange value.


git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@1937 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2008-03-29 20:40:40 +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 88619fb555 1877 Release
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@1877 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2008-03-10 17:39:30 +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
MaddMugsy cb36b3db6d -updated game version
-suppressed soldier action data messages in cheat mode
-enabled enemy / militia ammo choosing to be limited by coolness

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@1853 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2008-02-26 02:37:23 +00:00
lalien 2ed23927f2 - fixes for VS2003
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@1806 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2008-02-16 16:34:47 +00:00
Wanne b43ec593fe - bugfix: for expert difficulty level, that leads to adding INSANE_ELITE_BONUS after applying of EXPERT_ELITE_BONUS (thx to Scorpion)
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@1501 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2007-10-11 18:05:50 +00:00
Wanne 29b883f59d new exe build (1202)
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@1203 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2007-08-14 18:23:58 +00:00
Wanne 17449feabd new exe build (1147)
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@1148 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2007-08-01 22:42:46 +00:00
Wanne cdedbe8375 New Release Build (1080): The Release build contains all the changes including revision 1079!!!
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@1082 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2007-07-20 10:36:03 +00:00
lalien 429ca31658 - fixed Ctrl+M not moving items from/to the roof
- fixed Ctrl+S, Ctrl+F, Ctrl+M, Ctrl+R affect not visible items

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@1078 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2007-07-19 14:29:05 +00:00
Wanne 089e08f202 Small fixes for compiling different language versions (German, Russian)
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@1053 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2007-07-15 11:12:27 +00:00
lalien ee6980bc5d - added console project for VS 2003
- new shortcut: Ctrl+Y deletes all items of selected type from the sector inventory
- new shortcut: Alt+Y sells all items of selected type from the sector inventory






git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@1051 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2007-07-14 13:51:39 +00:00
lalien 0c6b247cf5 - new shortcut: Shift+M moves all items in sector to location of selected merc
- fix for array initialization


git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@1047 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2007-07-13 23:32:44 +00:00
lalien 45b0868ace - fixed: shift-R (autoreload) doesnt check if the ammo is accesible/visible
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@1024 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2007-07-04 22:04:12 +00:00
lalien 5102293774 - reverted resource.h for VS 6/2003 compatibility
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@1022 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2007-07-01 20:48:33 +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 5299427465 - added project and lib files for Lua
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@933 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2007-06-10 13:58:34 +00:00
Wanne eebe112427 new exe build (911)
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@912 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2007-05-31 08:31:22 +00:00
Wanne d61f4ff935 - new exe build (888)
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@889 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2007-05-21 14:59:40 +00:00
Wanne 5661efc75b - new exe build (872)
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@872 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2007-05-09 20:38:22 +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 61d6152ce5 bug fixes from Overhaul:
- Disappearing corpses (and possibly items) when cursor hovers over a square on the rooftop; also fixes a "write to freed memory" heap check
- Fixed improper printf field in a debug message 

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@870 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2007-05-08 22:44:08 +00:00
lalien 8e80a6168a bug fixes from Overhaul:
- roof inaccessible tiles problem
- AI hang while deciding on an action (fire 0 rounds on auto)


git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@868 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2007-05-08 15:10:29 +00:00
lalien 30cc546c09 bug fixes from Overhaul:
- CTD when someone fell off the west side of a building 
- Assertion failure when Skyrider leaves a sector where a merc cannot be woken up 
- Boxing fixes: Opponent no longer "seeks cover", ie jumps back out of the ring; no longer will pick up a gun from the ground while boxing
- Disappearing corpses (and possibly items) when cursor hovers over a square on the rooftop; also fixes a "write to freed memory" heap check

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@867 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2007-05-08 14:42:28 +00:00
lalien 60b6b85801 Strategic AI changes:
- Removed Omerta from the list of "unimportant" sectors (Estoni and San Mona still "unimportant")
- Allowed queen to attack Omerta before day 2 at 7:45AM and Drassen before day 3 at 6:30AM
- The reinforcements are not reassigned anymore when the sector where they were going to is captured by player
- Omerta garrison is not reassigned anymore when queen fortifies cities
- Enabled investigation of lost city sector by the enemy 
*Limit for the investigation of the sector depends on difficulty level (4, 8, 12 and unlimited on INSANE)

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@861 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2007-04-27 21:30:59 +00:00
AcyForsythe e95a6463ad - Added INI options for RESTRICT_ROAMING and REVEAL_ITEMS_AFTER_COMBAT
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@858 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2007-04-25 22:46:27 +00:00
AcyForsythe f9fe75d5e7 - Added INI options for RESTRICT_ROAMING and REVEAL_ITEMS_AFTER_COMBAT
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@857 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2007-04-25 22:45:10 +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 0eb7e55a52 - Added translation table for Russian characters
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@839 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2007-04-07 15:26:43 +00:00
lalien 1ef4419b0d - Fixed misspelling of function names
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@822 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2007-04-01 10:37:34 +00:00
Wanne 68f05b3e6b new exe build (820)
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@821 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2007-04-01 10:09:59 +00:00
lalien 6d117f5c06 - Added rooftop CtH fix from AndroidXP
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@812 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2007-03-30 18:08:32 +00:00