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 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
Flugente 0da98cc687 Trade menu background is no longer generated by random noise, but by cutting out a section of a much bigger picture. 
For more info, see http://thepit.ja-galaxy-forum.com/index.php?t=msg&th=23486&goto=350754&#msg_350754

Requires GameDir >= r2385

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8457 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2017-08-26 15:51:37 +00:00
Flugente 16b4597d77 added shopkeeper background image 
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@2385 4f8fa57e-7814-0410-bad4-adc449f26b7c
 2017-08-26 15:43:12 +00:00
Flugente 28ca52e2ed - Fix: possible mismatch of individual militia profiles if trained militia were immediately promoted 
- Fix: Armour/Misc. resources also limit training of green militia
- cleaned up button deletion

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8456 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2017-08-25 20:15:15 +00:00
Flugente e1f1437a95 Fix: some mercenaries can't refuel vehicles 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8451 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2017-08-15 13:48:02 +00:00
Flugente 8381e2395b Fixed typos (by 3iff) 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8450 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2017-08-15 12:28:01 +00:00
Flugente 874a006d06 Gear templates: multiple ammo item choices are possible via wildcards, but if item is a match, use ammo specified there 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8449 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2017-08-15 12:20:27 +00:00
Flugente 561f6387cd - Fix: individual militia are not properly disbanded if player runs out of funds 
- Fix: wrong website names used
- Removed confusing links on militia overview website

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8448 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2017-08-15 11:57:10 +00:00
Flugente 8e6cff9b5d Gear templates: An entry with '0' and a valid ammo item will try to fit that ammo to any gun used in the slot 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8447 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2017-08-12 12:45:33 +00:00
Flugente b64e0d0f91 Fix: enemy airdrops could cause a deployment screen when there shouldn't be one 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8446 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2017-08-10 22:54:07 +00:00
Flugente 54f9238ec0 Fix: weather occured underground 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8445 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2017-08-10 21:44:49 +00:00
Flugente b044a3a24f Trade menu background is now generated with the use of random noise. 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8444 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2017-08-09 20:28:56 +00:00
Sevenfm f4cbb59720 - DisplayLoadScreenWithID: use strcmp to correctly compare strings 
- CalcThrownChanceToHit: fix integer calculation
- CalcBestThrow: allow CTH bonus for mortars, new less restrictive CTH check to allow attack


git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8443 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2017-08-09 14:32:16 +00:00
Flugente 1646dd4606 When planning enemy helicopter attacks, increase the perceived threat from mercs 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8442 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2017-08-08 00:01:08 +00:00
Flugente faf2d272bc Loading a gear template also fills up canteens if the sector has drinkable water 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8441 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2017-08-06 22:56:30 +00:00
Flugente f7423782db New Feature: gear templates allow us to save and load a merc's equipment, thereby speeding up the equipment process. 
For more info, see http://thepit.ja-galaxy-forum.com/index.php?t=msg&th=23462&goto=350497&#msg_350497

Requires GameDir >= r2384

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8440 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2017-08-06 21:06:49 +00:00
Flugente 1eb0d7428f New Feature: gear templates allow us to save and load a merc's equipment, thereby speeding up the equipment process. 
For more info, see http://thepit.ja-galaxy-forum.com/index.php?t=msg&th=23462&goto=350497&#msg_350497

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@2384 4f8fa57e-7814-0410-bad4-adc449f26b7c
 2017-08-06 21:04:13 +00:00
Flugente 35cdd64a92 Fix: redraw ammo count in EDB if button is dirty 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8439 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2017-08-06 20:20:18 +00:00
Flugente 1e7a5772d0 Fix: message log occasionally appears and disappears in strategic view 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8438 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2017-08-06 20:18:32 +00:00
Sevenfm 99c72e4b3e - added ENEMY_JAMS option 
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@2383 4f8fa57e-7814-0410-bad4-adc449f26b7c
 2017-08-06 04:51:19 +00:00
Flugente de22a5f9ab Print a warning if a riot shield is destroyed 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8437 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2017-08-01 17:35:34 +00:00
Flugente 31ac8cb8d6 - Added riot shields for Grizzly, Raider and It 
- slightly adjusted shield strength

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@2382 4f8fa57e-7814-0410-bad4-adc449f26b7c
 2017-07-31 19:15:48 +00:00
Flugente a7bb8b9fe9 If placing an item fails due to invalid item size, at least inform the player before crashing the game on purpose 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8436 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2017-07-31 17:46:50 +00:00
Flugente 41056de164 Fix: wrong text displayed 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8435 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2017-07-30 09:31:15 +00:00
Flugente 11729a132e New feature: riot shields protect against damage from some directions. 
For more info, see http://thepit.ja-galaxy-forum.com/index.php?t=msg&th=23452&start=0&

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8434 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2017-07-29 21:18:13 +00:00
Flugente 9b898706e0 New feature: riot shields protect against damage from some directions. 
For more info, see http://thepit.ja-galaxy-forum.com/index.php?t=msg&th=23452&start=0&

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@2381 4f8fa57e-7814-0410-bad4-adc449f26b7c
 2017-07-29 21:11:32 +00:00
Flugente 8a82802932 - Fix: crash when handling flashing items 
- Fix: bad argument

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8433 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2017-07-26 13:57:29 +00:00
Flugente 0992a423e7 New feature: mercs with a gun-related trait (New trait system only) can use the 'Focus' skill via the skill menu ([$] in tactical). This skill grants an interrupt modifier bonus in the targeted area, but also a penalty outside of it. 
For more info, see http://thepit.ja-galaxy-forum.com/index.php?t=msg&th=20659&goto=350400&#msg_350400

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8432 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2017-07-26 13:49:38 +00:00
Flugente 00c754db33 New feature: mercs with a gun-related trait (New trait system only) can use the 'Focus' skill via the skill menu ([$] in tactical). This skill grants an interrupt modifier bonus in the targeted area, but also a penalty outside of it. 
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@2380 4f8fa57e-7814-0410-bad4-adc449f26b7c
 2017-07-26 13:23:51 +00:00
Flugente 7b00af164b - mercs are now used as prison guards regardless of sleep state 
- volunteers are now gained with a logarithmic rate, as otherwise the volunteer feature becomes pointless lategame

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

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8431 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2017-07-25 20:46:28 +00:00
Flugente 99fbc7cc9f volunteers are now gained with a logarithmic rate, as otherwise the volunteer feature becomes pointless lategame 
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@2379 4f8fa57e-7814-0410-bad4-adc449f26b7c
 2017-07-25 20:36:17 +00:00
Flugente fe45820b02 slightly improved cursor calculations 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8430 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2017-07-25 20:31:32 +00:00