1dot13/source
1
0
Fork 0
mirror of https://github.com/1dot13/source.git synced 2026-07-29 13:52:17 +02:00
Code Issues Packages Projects Releases Wiki Activity
7,604 Commits 9 Branches 6 Tags
master
Commit Graph
7604 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Wanne b932d1accf - Multiplayer Updates: 
o Fixed problem in score screen (stack around variable szPlayerMisses was corrupt)
o Increased connection timeout to 120 seconds, which hopefully avoids the ID_CONNECTION_LOST when trying to connect with high ping
o Fixed wrong message in message box, when clients connection got lost

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@4523 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2011-06-22 21:20:38 +00:00
inshy 0d661ec0cf Translated new line in Russian lang 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@4521 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2011-06-22 05:27:21 +00:00
ChrisL bf4ae66494 BUGFIX 538 - Added a condition so that if a door is not openable, iChance will be reset to 0 in time for the merc to make the "this is impossible" speech. 
2nd correction.  My fix left iChance uninitialized when the personality modifiers were being applied, meaning they no longer counted.  I've put the iChance initialization back where it was and slightly altered the condition so we simply resent iChance to 0 when the lock is impossible.

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@4519 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2011-06-21 16:54:24 +00:00
ChrisL edf1aaa302 BUGFIX 538 - Added a condition so that if a door is not openable, iChance will be reset to 0 in time for the merc to make the "this is impossible" speech. 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@4517 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2011-06-21 16:46:35 +00:00
ChrisL 9073f66572 BUGFIX 536 - Fixed it so we don't lose items when attempting to hand an invalid item to an NPC. 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@4516 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2011-06-21 16:07:49 +00:00
ChrisL 19416a395b BUGFIX 534 - Added code to restrict non-ammo item status to 100. 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@4515 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2011-06-21 15:33:39 +00:00
Wanne f14fa1f66d BUGZILLA #537: Robot can now move through fire/gas tiles without stopping each tile. No need to stop each tile for the robot, because the robot does not get hurt by fire/gas. 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@4513 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2011-06-21 14:26:20 +00:00
Wanne 1252675d7e BUGZILLA #535: Fixed CTD that could occur every day on strategy screen at 08:58 when initializing the inventory for the arms dealer 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@4512 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2011-06-21 13:18:58 +00:00
Wanne 4b55d692c7 BUGZILLA #539: Formatting of "No funds available" output screwed due to tab char 
o I also moved the hardcoded English text to the proper language text files.

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@4511 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2011-06-21 13:03:56 +00:00
Wanne e51e7399e7 - Bugfix: Removed quest reward points for the WHOLE team after you won the boxing and impressed kingpin, because you gained too much experience if you do the boxing stuff again and again. 
o Now we have vanilla behavior again.

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@4510 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2011-06-21 12:41:07 +00:00
Wanne 816f697ac2 - Bugfix: Improved previous Bugfix 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@4508 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2011-06-20 21:37:54 +00:00
Wanne beeb01e0b4 - Bugfix: Fixed CTD if weapon doesn't have ubDeadliness set it causes a division by zero and a CTD. (fix by Dougster) 
o Specifically an enemy had binoculars in his hand, and went to pick up a weapon off the ground, and it would crash.

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@4506 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2011-06-20 20:03:35 +00:00
inshy 47e9e2f6ba -Small fixes in russian lang 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameData@4505 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2011-06-19 13:29:22 +00:00
Wanne 4be8c4f88c - Removed unused old files 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@4503 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2011-06-17 10:56:48 +00:00
ChrisL 4adeed2f4b BUGFIX 479 - Because GearAimBonus was altering iSightRange during the CTH calculation, it was possible for an apparently visible target to be effected by the SHOOT_UNSEEN_PENALTY. By moving the penalty directly against iChance, this should resolve this. 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@4501 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2011-06-14 15:05:36 +00:00
ChrisL d9437117bb BUGFIX 523 - When retreating from combat, the code was designed to add 5 minutes to the game clock. Not sure why. Possibly to resolve an exploit? Anyway, if another travel group had an arrival time within that 5 minute span, an Assertion error would result. This fixes that by removing the 5 minute "retreat charge". 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@4500 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2011-06-14 14:43:30 +00:00
ChrisL 11889ee846 BUGFIX 527 - Corrected weapon placement when 2handed weapon is held in off hand during a successful steal attempt. 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@4499 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2011-06-13 16:47:21 +00:00
ChrisL 2bd354af32 BUGFIX 522 - Coded some popup box position adjustments so that popup boxes can't be drawn off the screen. 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@4498 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2011-06-13 16:33:38 +00:00
Wanne 3e5ab3767b - Deleted old and unused VFS folder (project) 
o I forget to delete that, when merging the complete development trunk back into the official trunk

- Deleted old an unused Multiplayer/test_space.* files

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@4496 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2011-06-12 07:42:16 +00:00
Wanne 48a9816f6d - Fixed crash (could not load existing file) in Release version when initializing portrait icons 
o  "VObjectDesc.fCreateFlags = VOBJECT_CREATE_FROMFILE" was not set!


git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@4493 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2011-06-12 07:35:08 +00:00
ChrisL a180f038b1 Removed extra "External Attachment" slot since there is currently only a single external attachment in the Official Release. 
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1307 4f8fa57e-7814-0410-bad4-adc449f26b7c
 2011-06-11 00:17:18 +00:00
ChrisL c283d3c78b Removed unused NAS 0.6x xml files. 
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1306 4f8fa57e-7814-0410-bad4-adc449f26b7c
 2011-06-10 18:00:57 +00:00
ChrisL 39b9c10a82 Removed Barrel Extender support from the Super-Shorty 
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1305 4f8fa57e-7814-0410-bad4-adc449f26b7c
 2011-06-10 15:24:04 +00:00
ChrisL ba81d0de5a BUGFIX 526 - Bullet graphic rendering was causing an internal display error when attaching/removing Ammo attachments from the tactical panel. We don't need to actually redisplay the bullet graphic, however, in order to change the text that's on the bullet graphic. 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@4491 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2011-06-09 17:36:58 +00:00
ChrisL a9a88e4642 BUGFIX 525 - Corrected UDB display issue where ammo and RangeBonus are concerned. 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@4490 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2011-06-09 16:43:02 +00:00
ChrisL 7ddd54134f removed unnecessary weapons.xml write procedure from the ReadInWeaponStats function. 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@4489 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2011-06-09 15:34:57 +00:00
Starwalker b74e3daf9e removed ability to attach a foregrip to the Calico M-900 rifle. 
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1302 4f8fa57e-7814-0410-bad4-adc449f26b7c
 2011-06-08 09:56:31 +00:00
ChrisL 755b3f74aa BUGFIX# 489 - Gave Shadow a woodland camo item by default to resolve a concern when playing with STOMP traits active. 
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1301 4f8fa57e-7814-0410-bad4-adc449f26b7c
 2011-06-07 21:23:34 +00:00
ChrisL b8e5ebcf6c BUGFIX 514 - A vector error in the size of the world inventory was causing a mouse button to be deleted twice resulting in an assertion error. 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@4485 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2011-06-07 18:16:56 +00:00
ChrisL 61fac0c0f8 BUGFIX 501 - portraits weren't being re-initialized when changing the TOPTION_SHOW_TACTICAL_FACE_ICONS parameter. 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@4484 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2011-06-07 16:30:51 +00:00
ChrisL 1652167097 BUGFIX 500 - Corrected "equiped" spelling error 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@4483 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2011-06-06 23:56:35 +00:00
ChrisL 3f9cb6b833 BUGFIX 497 - Aim Level function was not allowing negative aim levels which might initially make sense, but if any modifiers would result in a negative value, we'd end up with an high value which would then get reset by the built in limits. I've recast the variable to an INT8 which will allow negative results, at least prior to the built in limits being applied. 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@4481 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2011-06-06 23:09:16 +00:00
ChrisL 7376ffbb68 BUGFIX 491 - Recast variables related to the Buddy/Hated system so that proper UINT8 values (0-255) are allowed. 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@4480 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2011-06-06 22:28:19 +00:00
ChrisL 42a2130043 BUGFIX 484 - Appears that some of the SM Panel pockets were out of alignment by 1 pixel to the right. I'm not sure if this is because of a recent sti alteration or if this has always been the case but the code has been updated to account for the current STI coords. 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@4479 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2011-06-06 21:06:06 +00:00
ChrisL ab7ecb51e6 BUGFIX 482 - Corrected several variable definitions so that large mag capacity is better supported. 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@4478 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2011-06-06 20:37:23 +00:00
ChrisL 25133e0afe BUGFIX 480 - When disarming a bomb when your inventory is full, the merc actually disarming the bomb will now be the active "ItemPointerSoldier". 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@4476 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2011-06-06 19:44:37 +00:00
Wanne 75b4d43964 - Fixed Tixa problem: When playing Realistic you could go down to underground level where crepitus are 
o When loading such a buggy savegame, we will fix it automatically

- Simplified (reworked) IF-conditions with crepitus

- new define in luaglobal.h: LUA_GAME_INIT_NEW_GAME, LUA_GAME_INIT_NPCS.
o So we can select if we want to use lua script (GameInit.lua) or the hardcoded JA2 stuff

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@4475 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2011-06-06 19:04:56 +00:00
Wanne a6cade76ca BUGZILLA #510: Crepitus were still present in Tixa underground even in Realistic GameMode 
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1300 4f8fa57e-7814-0410-bad4-adc449f26b7c
 2011-06-05 22:09:48 +00:00
Wanne bfbe6b0311 git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@4472 3b4a5df2-a311-0410-b5c6-a8a6f20db521 2011-06-05 07:44:32 +00:00
Wanne da8d90a1b6 - Updated a text from the option screen 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@4471 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2011-06-03 13:18:24 +00:00
Wanne 7ff31b59b0 BUGZILLA #492: Fixed CTD when switching from IMP page to another web page 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@4469 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2011-06-02 20:52:24 +00:00
Wanne 6b72751538 - Bugfix: Fixed CTD that could occur on enemy soldier pathing 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@4466 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2011-05-31 19:03:21 +00:00
Wanne ad90dcc884 - Fixed comment for STRENGTH_TO_LIFT_HALF_KILO 
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1295 4f8fa57e-7814-0410-bad4-adc449f26b7c
 2011-05-30 10:45:13 +00:00
Wanne 68757bfda0 - Changed output name to match language selection 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@4464 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2011-05-30 02:39:13 +00:00
Wanne 38bd7da7bb *** Hotfix: Build 4462 *** 
- This fixes the problem with the merc portraits (game freeze, portraits not showing up when talking, ...)
- It also fixes the problem with the wrong opponent counters on the merc portraits

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@4462 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2011-05-30 02:31:51 +00:00
Wanne ef59f6e415 - Reverted the fix to set the correct camo face in the save load method, cause I am not exactly sure if that also leads to the merc faces bugs 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@4461 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2011-05-30 01:42:12 +00:00
Wanne 1b60a67678 - Fixed game hang when merc tries to exermine a door with explosives 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@4459 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2011-05-29 21:46:00 +00:00
Wanne 2b7f79db94 - Fixed problems with merc faces when doing certain actions. This bug was introduced in revision: 4396 
o Fixes endless loop when clicking on items with explosives and merc starts to talk
o Fixes hidden merc faces
o Fixes wrong merc faces (merc face instead of skull) when merc is dead

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@4456 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2011-05-29 16:08:27 +00:00
Wanne 993f3a204c - Reverted BUGZILLA #338 fix, because the fix lead to problems with enemy soldier opponent count 
o Now it should work again

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@4455 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2011-05-29 10:14:10 +00:00
Wanne e98e6a3f26 - Bugfix Merc Profile Editor: Wrong personality traits were shown in the drop down list. 
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1294 4f8fa57e-7814-0410-bad4-adc449f26b7c
 2011-05-28 12:41:44 +00:00