1dot13/source
1
0
Fork 0
mirror of https://github.com/1dot13/source.git synced 2026-08-26 14:30:26 +02:00
Code Issues Packages Projects Releases Wiki Activity
7,603 Commits 9 Branches 6 Tags
858c149584bb07216cb488cd33b304ec5656b307
Commit Graph
7603 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Flugente 265fd3bc61 Fix: EPC inventory cannot be accessed, and Nails does not allow to take his vest 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6048 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2013-05-01 21:23:55 +00:00
Flugente 6cbcc995de replaced a few hardcoded numbers with enums/ini setting 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6047 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2013-05-01 17:03:31 +00:00
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 60674b63da Changes (all by anv): 
- added voicesets for It, Bernie and Ears
- added battle sounds for Elroy (previously overlooked somehow)
- added some hate talk to Spike, Boss, Leech, Rusty and Sidney
- fixed wrong ammo in Weasel's equipment
- added some cheap knives to Mouse's and Elroy's kits, so they can make use of their new traits right away
- unlocked extra banter dialogue for some mercs (quote 45)
- added new gargantuan MercOpinions.xml, containing 255 opinion records per merc. Most new ones are 0 by default, I changed those for buddies and foes to 25/-25.

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1661 4f8fa57e-7814-0410-bad4-adc449f26b7c
 2013-04-30 22:26:20 +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 86a6a5481c added a few hints 
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1660 4f8fa57e-7814-0410-bad4-adc449f26b7c
 2013-04-29 23:07:21 +00:00
Flugente 205aa6a852 added soundset for Stella (by merc05) 
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1659 4f8fa57e-7814-0410-bad4-adc449f26b7c
 2013-04-29 23:02:52 +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 7b0bd166d6 - German Version: Added Skitz and Weasel (Bio & Xmls) 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameData@6035 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2013-04-29 18:42:24 +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 a9d6c9e252 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_v1.13_data@1658 4f8fa57e-7814-0410-bad4-adc449f26b7c
 2013-04-28 22:57:53 +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 8fd19010d7 - added soundset for Smoke (by merc05 & steggieav) 
- fixed one sound for Moses (by merc05)

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1657 4f8fa57e-7814-0410-bad4-adc449f26b7c
 2013-04-27 02:22:12 +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 6b072ac5e6 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_v1.13_data@1656 4f8fa57e-7814-0410-bad4-adc449f26b7c
 2013-04-27 00:59:18 +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 6fbd96f538 new feature: load screen hints can now be defined in TableData/LoadScreenHints.xml. 
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1655 4f8fa57e-7814-0410-bad4-adc449f26b7c
 2013-04-24 21:08:14 +00:00
Flugente 6df161cebb added covert ops trait to Elroy and Mouse 
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1654 4f8fa57e-7814-0410-bad4-adc449f26b7c
 2013-04-21 02:45:24 +00:00
Flugente 2ddf45fe62 added soundset for Moses (by merc05) 
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1653 4f8fa57e-7814-0410-bad4-adc449f26b7c
 2013-04-21 02:18:13 +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 9b9b3fc64a -added Mouse's soundset (nice!) by merc05, with slight edits (by anv) 
-added soundsets for Elroy, Rev, Dyno, Skitz and Weasel (by anv)
-fixed few errors in Doc's and Hurl's dialogue (by anv)
-added Skitz and Weasel (by anv)
-improved Hurl's an Boss's face (by anv)

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1652 4f8fa57e-7814-0410-bad4-adc449f26b7c
 2013-04-18 22:44:43 +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
feynman 4253942b5a AI.ini: changed player plan to 'Legacy', otherwise autobandage no longer works. 
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1651 4f8fa57e-7814-0410-bad4-adc449f26b7c
 2013-04-18 20:01:51 +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 8deab53621 - Fixed wrong merc opinions for Blood 
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1650 4f8fa57e-7814-0410-bad4-adc449f26b7c
 2013-04-16 08:54:48 +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 a0b35720d6 git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1649 4f8fa57e-7814-0410-bad4-adc449f26b7c 2013-04-14 22:59:47 +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