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
1,655 Commits 9 Branches 6 Tags
e508e91cff82d6df4d87523eef44b1b79eb862a0
Commit Graph
1655 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Flugente e508e91cff Fix: when accessing a teammember's inventory, circumstances could cause teammembers to attack the merc accessing 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6046 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2013-05-01 14:58:51 +00:00
Wanne cde29c1388 - MP: Removed wrong "#ifdef INTERRUPT_MP_DEADLOCK_FIX" 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6045 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2013-05-01 10:42:55 +00:00
Wanne fe4c6d7e8f - MP: Re-enabled the "share same FOV for friendly players" (in COOP and Team-DM), because it seems to work fine :) 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6044 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2013-05-01 10:28:33 +00:00
Wanne 0c99913cc1 - MP: Disabled (set to FALSE) the NO_STANDING_ANIM_ADJUSTMENT_IN_COMBAT (ja2_options.ini entry) in a MP game, because it leads to problems on the pure client 
o If ON, the ALWAYS tries to scroll to the AI soldier which is in running stance and therefore you are unable to do anyting and cannot play

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6043 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2013-05-01 10:09:59 +00:00
Flugente 2455c2c467 changed hardcoded numbers to enums in preparation for total merc number increase 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6042 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2013-04-30 21:31:04 +00:00
Wanne 82dec9404c - MP: Moved the FOV (friendly players share same field of view) to a define ENABLE_MP_FRIENDLY_PLAYERS_SHARE_SAME_FOV (currently disabled) 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6041 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2013-04-30 16:26:49 +00:00
Wanne 22a18ec262 - MP: Disabled the Enemy numbers count in the turnbar (because it shows different numbers on the clients) 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6040 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2013-04-30 16:14:27 +00:00
Wanne 3f13f630b0 - Enabled ZOMBIES in builddefines.h 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6039 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2013-04-30 16:13:29 +00:00
Flugente c29d55a1f3 Fix: no stealing on oneself 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6038 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2013-04-29 22:46:15 +00:00
Wanne 3e157ecfb4 - MP: Moved the update of the turnbar on interrupt to the INTERRUPT_MP_DEADLOCK_FIX define (disabled for now) 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6037 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2013-04-29 19:58:17 +00:00
Wanne 4456539663 - MP: Put the interrupt fix code in a define "INTERRUPT_MP_DEADLOCK_FIX 
o It seems the fix does not work 100% and if the fix code is enabled the ALT + E feature does not work correctly (for now, disabled the fix)

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6036 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2013-04-29 19:45:32 +00:00
Wanne cdc3abc694 - Fixed error in project files when trying to open solution (VS 2005 and VS 2008) 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6034 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2013-04-29 18:41:11 +00:00
Flugente 3b0d8613af Feature improvement: allow accessing other merc inventories when ACCESS_OTHER_MERC_INVENTORIES is TRUE. Even works with dying mercs. 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6033 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2013-04-28 22:59:09 +00:00
Flugente 7f467f4f80 Fix: militia equipment item fitness function still considered ammo even if MILITIA_USE_SECTOR_EQUIPMENT_AMMO was false, thus possibly ignored guns that had no ammo loaded 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6030 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2013-04-28 15:58:58 +00:00
Flugente 54ffaa2624 changed a few hardcoded numbers to enums (better, but still ugly) 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6029 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2013-04-27 22:23:04 +00:00
Flugente 130acec2e8 captured prisoners can now be bandaged even if life >= OKLIFE 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6028 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2013-04-27 15:57:11 +00:00
Flugente c4aa1da949 Fix: non-green-militia-tabooed objects did not retain their taboo value after inspection 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6027 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2013-04-27 02:09:24 +00:00
Flugente bcbe006a4a feature improvement: if MILITIA_USE_SECTOR_EQUIPMENT_CLASS_SPECIFIC_TABOOS is TRUE, one can taboo equipment for specific militia classes 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6026 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2013-04-27 00:59:38 +00:00
Flugente b503a6e95b - allow playback of .ogg files in Music folder (by Lesh) 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6025 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2013-04-26 21:11:36 +00:00
Flugente 40979fce1c code changes: 
- the amount of food points one gets for eating now depends on the current food situation
- food/drink percentage now goes from 0 to 200%, with 100% being the optimal value

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6024 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2013-04-26 00:54:22 +00:00
Flugente 3a133955ad added missing parser file 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6023 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2013-04-25 20:42:46 +00:00
Flugente 1e69c3a964 - new feature: load screen hints can now be defined in TableData/LoadScreenHints.xml. This feature requires GameDir revision >= 1655 
- added safety checks for automatic feeding of POWs

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6022 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2013-04-24 21:10:36 +00:00
Flugente 79874daf97 - Fix: compilation 
- Fix: zombie name generation

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6021 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2013-04-19 21:20:53 +00:00
Flugente 9cd897cf3c - Fix: picking up corpses restored their head 
- Fix: zombies from picked up corpses had gibberish names

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6020 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2013-04-18 21:32:11 +00:00
feynman aa5bed7850 Added missing from ModularizedTacticalAI :/ 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6019 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2013-04-18 21:14:34 +00:00
feynman 26383d83a8 Further refinement of new ModularizedTacticalAI architecture; added plans for Crows 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6017 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2013-04-18 20:02:54 +00:00
Flugente 52cb4ff424 Fix: error in skill display (dedicated to tais, who once again saved VS) 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6015 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2013-04-17 23:24:22 +00:00
Flugente 61aa29c390 Fix: VS2010 compilation did not work due to ModularizedTacticalAI 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6014 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2013-04-17 21:26:21 +00:00
Flugente 603a36826f increased number of merc opinions to 255 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6012 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2013-04-16 22:34:49 +00:00
Wanne 4f60d29cbf - Minor fix for mouse locking feature in tactical screen (by Buggler) 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6011 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2013-04-16 22:12:36 +00:00
Wanne ba6d5fc04c - Added files to svn ignore list 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6007 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2013-04-15 20:20:58 +00:00
Wanne 532710b53b - Updated project files 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6006 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2013-04-14 22:58:58 +00:00
Flugente c932a69027 added VS2010 filters, because tais said so 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6005 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2013-04-14 22:25:55 +00:00
Flugente 329b1cd878 Fix: savegame compatibility 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6004 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2013-04-14 22:09:27 +00:00
Flugente 62786c483e Fix: previous fix did not fix enough 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6003 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2013-04-14 22:02:59 +00:00
Flugente 3856bb30ba Fix: VS2010 could not compile 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6002 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2013-04-14 21:34:27 +00:00
Wanne 92726dd3e7 - Added the new project "ModularizedTacticalAI" to the VS 2005 solution 
- Renamed the VS 2008 project file "ModularizedTacticalAI" to "ModularizedTacticalAI_VS2008"
- Added new project to vsprops file and changed output folder to keep it the same like the other project folders
- INFO: VS 2010 project files will be updated later by Flugente/DepressivesBrot 

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6001 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2013-04-14 21:03:23 +00:00
feynman 8f3bff764b Forgot to commit the source changes in the last commit. Sorry. So, here they are. 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5999 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2013-04-14 15:54:56 +00:00
Flugente 25de719d79 Fix: under certain circumstances, militia gear was not dropped correctly (a result of fixing the 'drop gear twice' bug) 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5997 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2013-04-14 13:32:10 +00:00
Flugente e8d9acba8c - added team-specific modifiers for AI suppression 
- Fix: incorrect platoon spawning wehn initializing Cambria counter attack

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5996 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2013-04-11 21:33:28 +00:00
Wanne 738d31e29b - Reworked the initialization of LUA functions, fixed and added new ones (by Jazz) 
o You also need to update the GameDir, cause some LUA scripts have been changed and fixed

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5995 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2013-04-11 19:16:34 +00:00
Flugente 6058a3d3d8 - Fix: calculation of squadleader suppression boni was wrong 
- Fix: possible underflow averted

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5993 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2013-04-10 23:42:26 +00:00
Flugente 5e5103635a Fix: no bullet when not targetting a soldier 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5992 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2013-04-10 22:52:35 +00:00
Flugente 3d0be8101c - new drug: etorphine (DRUG_TYPE_STUNANDKILL) stuns the user for its duration. Warning: Lethal if overdosed (lethal dose depends on boytype) 
- show 'drugged' symbol for every drug (apart from alcohol)

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5991 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2013-04-09 21:03:42 +00:00
Flugente cc8fe02d98 Fix: when using scope modes and underbarrel weapons, NCTH functions searched underbarrel gun instead of main gun for attachments, resulting in no boni 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5990 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2013-04-08 22:29:26 +00:00
Flugente a466e7348a - cleaned up drug code 
- moved trait cth modifiers into a SOLDIERTYPE member function

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5989 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2013-04-08 21:13:54 +00:00
Flugente d0b9c0a032 Fix: underbarrel weapons did not properly cause explosions according to their ammotype 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5988 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2013-04-07 22:54:43 +00:00
Flugente a66a3ef61b - militia equipment choosing: object status is taken into consideration for NVGs and sungoggles 
- militia equipemnt choosing: do not give a 'bonus' for excess ammo we wouldn't take anyway

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5987 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2013-04-07 00:49:08 +00:00
Flugente e043ce0e70 Fix: name display repeated name if two names were used in one sentence 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5985 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2013-04-04 23:24:09 +00:00
Wanne 6bd8399bb9 - Changed INI-Property "RANDOM_STATS" from int (0 - 3) to boolean value 
FALSE = Do not use random stats (JA2 vanilla setting)
  TRUE = Use random stats for any mercs, that have random stats defined (Enabled = 1) in "TableData\RandomStats.xml"

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5982 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2013-04-04 21:49:33 +00:00