1dot13/source
1
0
Fork 0
mirror of https://github.com/1dot13/source.git synced 2026-08-12 14:10:23 +02:00
Code Issues Packages Projects Releases Wiki Activity
7,623 Commits 9 Branches 6 Tags
latest
Commit Graph
7623 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
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 34bc85e344 new exe build (2147) 
- added INI option for new tracer bullets (USE_BULLET_TRACERS)
- updated German.Items.xml
- fixed one spelling mistake in Items.xml

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@999 4f8fa57e-7814-0410-bad4-adc449f26b7c
 2008-05-12 11:00:59 +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 c5581bc4d0 new exe build (2146) which also contains multiplayer 
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@998 4f8fa57e-7814-0410-bad4-adc449f26b7c
 2008-05-12 09:50:20 +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
Wanne ea0a3fa1cd - removed test comment from Ja2.ini 
- updated Russian.Items.xml (thx to inshy)

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@995 4f8fa57e-7814-0410-bad4-adc449f26b7c
 2008-04-29 19:15:09 +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 3faae3a89b new Map Editor.exe 
updated German.Items.xml (thanks to Dr_Deagle)
updated INIEditorInit.xml

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@993 4f8fa57e-7814-0410-bad4-adc449f26b7c
 2008-04-27 09:58:41 +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
Starwalker 97fcc92abe replaced Type 85 and 30rnd 7.62x25mm mag pictures with new ones made by Hruza 
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@991 4f8fa57e-7814-0410-bad4-adc449f26b7c
 2008-04-24 09:19:13 +00:00
Wanne f505fc194f new ja2.exe (Build: 2063): 
- 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_v1.13_data@989 4f8fa57e-7814-0410-bad4-adc449f26b7c
 2008-04-22 18:45:24 +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
Wanne b275f2d282 Deleted all the Slay Speech files that had a " " in the filename. These files are not used in the source code 
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@986 4f8fa57e-7814-0410-bad4-adc449f26b7c
 2008-04-15 19:13:45 +00:00
Wanne 26d596a948 Deleted Speech files from German version which had a " " in the name. They are not needed! 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameData@2034 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2008-04-15 19:10:39 +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
Starwalker 8a8ab35b81 changed Shadow's suppressor 
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@984 4f8fa57e-7814-0410-bad4-adc449f26b7c
 2008-04-15 14:16:37 +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
Wanne 859efc6c00 - New Exe Build 2013 (fixed item duplication bug) 
- Updated Russian specific xml files

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@982 4f8fa57e-7814-0410-bad4-adc449f26b7c
 2008-04-13 12:47:03 +00:00
Wanne 26438d9a00 - updated russian specific files (added slay files, ...) 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameData@2018 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2008-04-13 12:42:35 +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
Starwalker 4bacd1e6a2 added M14 EBR (pic by Kaerar) 
added M21 EBR (pic by Kaerar)
added EBR stock
added .44 Magnum AET ammo
added 7.62x25mm AET ammo
changed 7.62x25mm coldloaded standard ammo to coldloaded AP/FMJ, to fit the ammo pics

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@981 4f8fa57e-7814-0410-bad4-adc449f26b7c
 2008-04-09 06:57:15 +00:00
Starwalker 000d140401 added M14 EBR (pic by Kaerar) 
added M21 EBR (pic by Kaerar)
added EBR stock
added .44 Magnum AET ammo
added 7.62x25mm AET ammo
changed 7.62x25mm coldloaded standard ammo to coldloaded AP/FMJ, to fit the ammo pics

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@980 4f8fa57e-7814-0410-bad4-adc449f26b7c
 2008-04-09 06:56:36 +00:00
Starwalker df9adc32dd replaced SAW Pouch pic (Marlboro Man) 
replaced Triggergroup pic (Tbird)
added S&W M29 SATAN pic (Tbird)

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@979 4f8fa57e-7814-0410-bad4-adc449f26b7c
 2008-04-09 06:51:05 +00:00
Starwalker 1da55c793d replaced M14, M21 and Desert Eagle pics (Kaerar) 
added gun pics for later use (Kaerar)
added item pics for later use
added red stripe to some 7.62x25mm ammo pics to better show their type

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@976 4f8fa57e-7814-0410-bad4-adc449f26b7c
 2008-04-04 11:13:47 +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
Starwalker 52d7cbc6bb added (empty) other Polish language xml-files for later Polish-language support code to find. Translation needed! 
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@972 4f8fa57e-7814-0410-bad4-adc449f26b7c
 2008-03-31 13:46:56 +00:00