1dot13/source
1
0
Fork 0
mirror of https://github.com/1dot13/source.git synced 2026-07-22 13:40:22 +02:00
Code Issues Packages Projects Releases Wiki Activity
685 Commits 9 Branches 6 Tags
36be370bca7b5a0405dfb339aaa7b0ae3d082c79
Commit Graph
685 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Wanne 36be370bca - bugfix: Only one M.E.R.C merc was available in single player mode. 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2165 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2008-05-14 05:37:33 +00:00
Wanne 3823ac6f06 - bugfix mp: ALT + TAB is working again in full screen mode. But if you like to play multiplayer you should use windowed mode or you should never do ATL + TAB, because this pauses the game in full screen mode! 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2164 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2008-05-14 05:09:28 +00:00
Wanne 28e9276006 - bugfix mp: Wrong savegame folder name for german version that leaded to a CTD when saving a multiplayer game. 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2163 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2008-05-14 04:41:48 +00:00
Wanne bf99b6d9e6 - bugfix mp: fixed up coop 
- bugfix mp: fixed bobby rays code my end

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2158 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2008-05-13 18:49:02 +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 c789c1953f Added changes from build 2137 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2145 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2008-05-12 08:35:50 +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
ChrisL c448713412 Minor adjustment to the NIV mode 800x600 thigh and combat pack pocket coordinates on the tactical panel so that the stealing menu doesn't inadvertantly "double hatch" our pockets and make them look solid black. 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2124 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2008-05-09 22:28:59 +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 0527d0a585 Minor update so that sector A9 will be the default map when a major version update has completed. 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2111 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2008-05-07 16:06:23 +00:00
ChrisL 82aec44382 Fixed bug #82: SHIFT+N allowed both sun goggles and NVGs to be worn at the same time. 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2108 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2008-05-06 17:32:34 +00:00
Wanne 2b3b6367f1 Fixed bug #93: Character name too long at IMP activation screen -> CTD 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2100 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2008-05-04 19:19:38 +00:00
Wanne 9445ded9e2 Fixed bug #94: Merc with no ammo in autocombat = CTD 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2099 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2008-05-04 18:53:49 +00:00
ChrisL 8e332178e4 Made an adjustment to the editor so that map version checking takes place when rebuilding the DevInfo folder. This will allow maps to update properly if you switch between maps alot, while not forcing a major version update when it's not needed. 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2096 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2008-05-02 23:09:58 +00:00
ChrisL 07549fdc68 Resolved a problem where ItemSize=99 items would cause a CTD because of a mission condition. 
Adjusted the ALT+W function so it runs a bit better.

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2094 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2008-05-02 16:39:16 +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 e2ad50963b Bugfix that removes a rare CTD that can occur if a non-LBE item accidentally gets associated with a merc. 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2077 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2008-04-25 18:17:53 +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
Wanne c9264b6101 updated 1.13 credits 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2056 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2008-04-20 17:29:49 +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 38ee990e9f Bugfix to stop a CTD that could occur if the system inadvertantly tries to stack two money objects that have a 0 uiMoneyAmount amount. 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2043 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2008-04-18 05:21:01 +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 0596b0a553 MadLab fix related to handing him a weapon with attachments. 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2029 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2008-04-15 16:14:14 +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
Wanne 9308131d17 - replaced wrong text for ironman in german version in the start new game screen 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2020 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2008-04-13 14:35:15 +00:00
ChrisL 4d4536a8ee Fixed an item duplication bug related to the item description window and unloading a weapon. 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2013 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2008-04-11 18:04:29 +00:00
Wanne 104f964760 fixed an exploit where no enemies are present in starting sector: Go to tactical before you hire any merc. Then hire a merc and compress time until merc arrives. Then you arrive in Omerta and no enemies are present. Also the chopper animation was not played. 
I simply disabled the "Go to tactical button" if the user has not hired any merc. This eliminates all the "bad" side effects.

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@1981 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2008-04-03 17:49:56 +00:00
ChrisL bbc4447ab6 Fixed a bug that would cause a freeze while in OldInv mode at the very start of the game if you didn't open the tactical inventory panel before trying to open the strategic inventory panel. 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@1977 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2008-04-02 21:34:11 +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
Wanne 2ff5aabf24 - fixed some compilation errors in VS 2003 (but not all) 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@1917 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2008-03-27 13:50:06 +00:00
Wanne 50377c2bae - updated _Ja25RussianText.cpp (thx to Inshy) 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@1886 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2008-03-13 19:18:09 +00:00
Wanne fab0aae9da Updated _RussianText.cpp (thx to Inshy) 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@1882 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2008-03-12 18:33:11 +00:00
Wanne 844c3445aa - translated some missing german texts, added one missing german text string for militia command 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@1880 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2008-03-11 21:02:22 +00:00
Wanne bf368a0013 - suppressed all the deprecated insecure functions warnings for VS 2005 if you build a Release or MapEditor Version 
For Debug version it is already set.
Project -> Properties -> Linker -> Command Line -> Additional options: /D "_CRT_SECURE_NO_DEPRECATE"

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@1878 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2008-03-10 19:58:45 +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
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
lalien e16d166277 Changed SVN properties 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@1870 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2008-03-08 14:40:47 +00:00
Wanne 5e5035458a - Improved previous bugfix: If the merc arrives with the helicopter at night (defined in the ja2_options.ini) it was daytime in tactical 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@1855 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2008-02-26 20:28:06 +00:00
Wanne 9649811083 - bugfix: If the merc arrives with the helicopter at night (defined in the ja2_options.ini) it was daytime in tactical 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@1854 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2008-02-26 19:41:45 +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