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
Flugente 9c74bb75dc To make it easier to search for dialogue and understand what a line is supposed to mean, changed a few dialogue enums. 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8503 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2017-10-31 19:18:35 +00:00
inshy 0312081223 Fixed mistranslation for some lines for Russian language. 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameData@8502 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2017-10-30 14:30:01 +00:00
Flugente e4e58e81d0 Fix: stealing from or in transit 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8499 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2017-10-19 17:46:17 +00:00
Flugente fd868ada14 Fix: wrong limits used 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8498 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2017-10-18 19:59:44 +00:00
Flugente 5cf3bfd665 Fix: BP costs not read correctly 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8497 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2017-10-17 19:14:40 +00:00
Flugente babe4732d6 Changed a few BP csot modifiers (most notably lowered BP_MODIFIER_WEAPON_READY, otherwise crouched movement with gun raised drains breath way too fast) 
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@2398 4f8fa57e-7814-0410-bad4-adc449f26b7c
 2017-10-17 19:02:28 +00:00
Flugente 5bdd23ac13 New animations: added animations for crouched walking with weapons aimed for all merc bodytypes (made by Taro) 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8496 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2017-10-15 17:10:49 +00:00
Flugente e56e44b596 Added animations for crouched walking with weapons aimed (standing against standing/crouched targets) for all merc bodytypes (by Taro) 
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@2397 4f8fa57e-7814-0410-bad4-adc449f26b7c
 2017-10-15 17:08:29 +00:00
silversurfer 4f42dcbfe5 Update to folding stocks (by Cardinal): 
- adjusted mostly the AK variants (standard AR- size 7, carbines - size 6, compact carbines - size 5), and some others

- removed <ToHitBonus>-1</ToHitBonus> from weapons that used to have modifiers representing permanent folding stocks, since stock items now carry the penalty

- removed the folding stock from xm-8 compact carbine and added fixed recoil penalties - apparently the one in the game is the stockless butt-cap version

- fixed some mistakes I made previously with assigning default attachments

- Unrelated to the stocks, I changed the PercentHandling modifier for the combat knife and the KCB knife from -10 to 10. Unless I'm mistaken, this should mean that when used as bayonets they now properly add a handling penalty instead a bonus

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@2396 4f8fa57e-7814-0410-bad4-adc449f26b7c
 2017-10-15 08:41:44 +00:00
Flugente 298fc4dd58 Improved bayonet animations (by Taro) 
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@2395 4f8fa57e-7814-0410-bad4-adc449f26b7c
 2017-10-07 17:36:43 +00:00
silversurfer 2577a22ebb Enhancement (by Cardinal): 
- folding/retractable stocks can now be folded/unfolded with item transformations
- weapons with built-in folding/retractable stocks come with transformable stocks too (unfolded by default). These stocks cannot be removed.

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@2394 4f8fa57e-7814-0410-bad4-adc449f26b7c
 2017-10-07 10:58:55 +00:00
Flugente d701f26919 Added bayonet animations (standing against prone targets) for all merc bodytypes (by Taro) 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8494 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2017-10-06 17:52:26 +00:00
Flugente fabd27c376 Fix: various individual militia issues 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8493 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2017-10-05 19:57:26 +00:00
Flugente d321bf8abe Fix: difficulty introduction texts were cutoff 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8492 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2017-10-04 19:22:52 +00:00
Flugente f82dad3712 Removed non-default output entries 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8491 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2017-10-02 13:05:50 +00:00
Flugente 380d858d2c Added VS2017 solution and project files (by DepressivesBrot) 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8490 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2017-10-02 13:00:46 +00:00
Flugente 3f057567dc - Added bayonet animations (standing against standing/crouched targets) for all merc bodytypes (by Taro) 
- Initiating a bayonet attack immediately after running adds a melee damage bonus (+20%)

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8489 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2017-10-02 10:38:12 +00:00
Flugente c3592c23f3 Slightly speed up overhead map display 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8488 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2017-10-01 12:30:39 +00:00
Flugente 2d2e789ce0 Fix: display riot shields only if soldier is seen (relevant on non-player controlled soldiers) 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8487 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2017-10-01 12:02:38 +00:00
Flugente a57d9455f3 Dynamic dialogue boxes cause less issues when scrolling 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8486 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2017-10-01 11:08:38 +00:00
Flugente 8de2a8601e New: if REDUCED_INSTANT_DEATH is TRUE, damage from guns/knives that would normally instantly kill non-comatose player-controlled mercs is lowered so that they instead fall into a coma (and can be saved by other mercs) (by sevenfm) 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8485 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2017-09-29 19:48:32 +00:00
Flugente 5e2dac40e0 New: if REDUCED_INSTANT_DEATH is TRUE, damage from guns/knives that would normally instantly kill non-comatose player-controlled mercs is lowered so that they instead fall into a coma (and can be saved by other mercs) (by sevenfm) 
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@2391 4f8fa57e-7814-0410-bad4-adc449f26b7c
 2017-09-29 19:47:42 +00:00
Flugente 2c84cbe48d Change: AI does not attack mercs that are already dying, thus focusing on more dangerous opponents while giving the player a chance to rescue dying mercs (by sevenfm) 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8483 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2017-09-28 21:27:59 +00:00
Flugente dfc55c286d Fix: boxing exception to covert behaviour only works between 2 boxers 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8482 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2017-09-28 19:40:49 +00:00
Flugente dc4846a464 Fix: as being covert breaks boxing fights, boxers are not covert 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8481 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2017-09-27 21:18:35 +00:00
Flugente bc85245a53 Fix: Squadleader level bonus for other mercs was applied in strategic. 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8479 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2017-09-24 15:49:41 +00:00
silversurfer 0450b7a32c Fixes: 
- missing laser range in OCTH
- missing compare functionality for laser ranges
- missing ToHitBonus display for crouched stance

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8478 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2017-09-23 11:16:37 +00:00
Flugente 6ef15f3952 Updated scripts 
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@2388 4f8fa57e-7814-0410-bad4-adc449f26b7c
 2017-09-21 18:47:53 +00:00
Flugente c20604f16a Fix: various individual militia issues 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8477 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2017-09-21 18:38:22 +00:00
Flugente e57c769720 Updated inis 
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@2387 4f8fa57e-7814-0410-bad4-adc449f26b7c
 2017-09-20 19:04:37 +00:00
Flugente f30482d939 Soldiers move slower when dragging someone 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8476 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2017-09-18 17:36:39 +00:00
Wanne f0698366e8 Updated Chinese texts (by TBS) 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8475 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2017-09-18 10:19:57 +00:00
Flugente 6031257dcd New feature: mercs can drag people and corpses 
Requires GameDir >= r2386.

For more info, see http://thepit.ja-galaxy-forum.com/index.php?t=msg&th=23508&goto=350989&#msg_350989

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8474 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2017-09-17 22:16:30 +00:00
Flugente 9f4e55d5db New feature: mercs can drag people and corpses 
For more info, see http://thepit.ja-galaxy-forum.com/index.php?t=msg&th=23508&goto=350989&#msg_350989

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@2386 4f8fa57e-7814-0410-bad4-adc449f26b7c
 2017-09-17 22:06:21 +00:00
Flugente 5becfe9004 Fix: warnings about individual militia errors were wrongly printed out 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8473 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2017-09-14 20:00:17 +00:00
Flugente 94a66ead9d - Fix: replaced stdext::hash_map with std::unordered_map, as the former is deprecated 
- Fix: missing header

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8472 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2017-09-13 20:05:54 +00:00
Flugente 2fe522db4b Fix: compiler warnings 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8471 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2017-09-13 20:01:48 +00:00
Wanne b851d9671f Updated Chinese GameDir files (by TBS & zwwooooo) 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameData@8470 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2017-09-13 06:49:03 +00:00
Wanne b6dde6a0da Updated Chinese texts (by TBS & zwwooooo) 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8469 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2017-09-12 11:19:56 +00:00
Sevenfm c24a5da97a - UseGunNCTH: initialize fBuckshot 
- CreatureDecideActionBlack: use CreatureDecideActionRed instead of DecideActionRed

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8468 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2017-08-31 15:46:33 +00:00
Flugente ff8a656040 Smoothen ballistic shield 'movement' by taking soldier position offsets into account 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8467 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2017-08-30 19:33:23 +00:00
Sevenfm fb61c74e40 - fix min/max bug in EVENT_SoldierApplyItemToPerson 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8466 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2017-08-29 18:07:43 +00:00
Flugente edbee58ca7 Fix: soldier alert status was not set correctly (by sevenfm) 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8465 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2017-08-29 17:57:16 +00:00
Flugente 49ca74848f Disable inventory popups for vehicles, as they don't need equipment and huge inventories result in display errors 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8464 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2017-08-28 22:33:26 +00:00
Flugente 8e85ce5acf When stacking ammo or kits, make the partially full object be the first instead of last on the stack 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8463 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2017-08-28 22:11:02 +00:00
Flugente 52558851f9 Fix: accidental commit 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8462 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2017-08-26 21:58:47 +00:00
Flugente 404e6f18ef Fix: stat loss on torso hit never causes STR loss 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8461 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2017-08-26 21:57:22 +00:00
Flugente a8197d5db7 Fix: crash when attempting to create illegal item 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8460 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2017-08-26 21:18:02 +00:00
Flugente 5f5b1f27c4 Fix: crash when clicking on empty inventory slot 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8459 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2017-08-26 19:49:05 +00:00
Flugente 04ce05bdf3 fallback solution if no image is found 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8458 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2017-08-26 16:10:15 +00:00