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,616 Commits 9 Branches 6 Tags
86b23474cfdca5efeb495c5732cd95171825f459
Commit Graph
7616 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Flugente 65c99e02a3 Fix: healing update relied on first merc 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8550 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2018-04-03 19:40:22 +00:00
Wanne 2ee912b20d Updated the Windows Fix and renamed it to Windows 7-10 Fix.zip 
- Updated Registry File (supports now Windows and Fullscreen)
- Replaced the WINE Dlls with new ones, that should not have problems with garbled air/mobile militia view in strategic screen

See: http://thepit.ja-galaxy-forum.com/index.php?t=msg&th=23364&goto=349616&#msg_349616

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@2418 4f8fa57e-7814-0410-bad4-adc449f26b7c
 2018-03-30 22:19:05 +00:00
Flugente 9d35edc4dc Fix: missing attachment 
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@2417 4f8fa57e-7814-0410-bad4-adc449f26b7c
 2018-03-27 18:32:42 +00:00
Flugente c5da533219 Fix: FAMAS has built-in bipod when it shouldn't 
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@2416 4f8fa57e-7814-0410-bad4-adc449f26b7c
 2018-03-27 18:01:54 +00:00
Flugente 64a971edec If MILITIA_STRATEGIC_COMMAND_REQUIRES_MERC is FALSE, militia can be controlled everywhere even without staffing a HQ 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8548 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2018-03-14 20:20:13 +00:00
Flugente 23f045803f If MILITIA_STRATEGIC_COMMAND_REQUIRES_MERC is FALSE, militia can be controlled everywhere even without staffing a HQ 
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@2415 4f8fa57e-7814-0410-bad4-adc449f26b7c
 2018-03-14 20:13:24 +00:00
Flugente 56f9864441 - Fix: wrong print format in militia battlereports 
- Added flag for militia desertion

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8547 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2018-03-14 19:46:43 +00:00
Flugente 524fc502f8 Fix: clean up email functions (WIP) 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8546 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2018-03-12 22:57:13 +00:00
Flugente 0250a41114 Added or deleted permanent attachments for AUGs, several MGs and SRs 
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@2414 4f8fa57e-7814-0410-bad4-adc449f26b7c
 2018-03-11 15:55:43 +00:00
Flugente c8a01e613f Fix: if militia groups arrive in combat alongside the player, it is possible they are interpreted as being already present, thus spawning in the sector instead of at the edges. 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8545 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2018-03-11 12:50:04 +00:00
Flugente b20c9a9de9 Fix: If 'forced turn mode' is active, sometimes enemy groups already present in an enemy-occupied sector are interpreted as pending reinforcements, causing them to spawn at the sector edges instead of inside the sector. 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8544 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2018-03-11 12:36:27 +00:00
Flugente 6b040c0eba Fix: deleted outdated setting 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8543 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2018-03-10 17:59:52 +00:00
Flugente d83dba46ff Updated ini descriptions. 
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@2413 4f8fa57e-7814-0410-bad4-adc449f26b7c
 2018-03-10 15:49:44 +00:00
Flugente 6384b53924 Deleted no longer necessary data in Data and Data-UB. 
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@2412 4f8fa57e-7814-0410-bad4-adc449f26b7c
 2018-03-10 15:40:39 +00:00
Flugente 9da3a0cd86 Deleted 'mobile militia feature', as 'militia strategic command' offered better ways to move militia. 
For more info, see http://thepit.ja-galaxy-forum.com/index.php?t=msg&th=23649&goto=352592&#msg_352592

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@2411 4f8fa57e-7814-0410-bad4-adc449f26b7c
 2018-03-10 15:32:03 +00:00
Flugente c0d77f79c7 Deleted 'mobile militia feature', as 'militia strategic command' offered better ways to move militia. 
For more info, see http://thepit.ja-galaxy-forum.com/index.php?t=msg&th=23649&goto=352592&#msg_352592

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8542 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2018-03-10 15:31:11 +00:00
Flugente d6db35f000 - Fix: possible crash if enemy forces arrive via non-group (enemy heli) 
- Fix: possible crash when ordering militia to move if previous path was not properly cleared

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8541 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2018-03-08 21:49:26 +00:00
Flugente 1e38e07ad9 Fix: if a militia group in movement is attacked and flees from autoresolve, they remain in the sector 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8540 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2018-03-07 21:09:27 +00:00
Flugente 88f6f8cc06 Make a note in a militia's history if they were promoted due to drill 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8539 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2018-03-06 22:38:27 +00:00
Flugente f6fe37bc3d Fix: possibly missing image 
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@2410 4f8fa57e-7814-0410-bad4-adc449f26b7c
 2018-03-06 00:06:32 +00:00
Flugente 2080e787dd - added translations 
- militia menu is always present so that the player has an easier time figuring out why he cannot do something

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8538 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2018-03-05 18:23:24 +00:00
Flugente 82a2b6c2db Added new assignments for training existing militia and doctoring them. 
For more info, see http://thepit.ja-galaxy-forum.com/index.php?t=msg&th=23044&goto=352617&#msg_352617

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8537 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2018-03-04 21:20:38 +00:00
Flugente 52759232ae Added new assignments for training existing militia and doctoring them. 
For more info, see http://thepit.ja-galaxy-forum.com/index.php?t=msg&th=23044&goto=352617&#msg_352617

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@2409 4f8fa57e-7814-0410-bad4-adc449f26b7c
 2018-03-04 21:18:43 +00:00
Flugente a95c4fd614 Fix: UB compilation 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8536 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2018-03-04 17:11:56 +00:00
Flugente f45c0a3544 Fix: UB compilation 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8535 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2018-03-04 17:08:00 +00:00
Flugente 62f8b7d3e8 Cleaned up assignment menu code (WIP) 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8534 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2018-03-03 16:04:47 +00:00
Flugente cf2f219067 Cleaned up assignment menu code (WIP) 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8533 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2018-03-03 15:42:16 +00:00
Flugente 5501e390de Fix: math functions on VS2010 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8532 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2018-03-02 22:47:54 +00:00
Flugente 68c1de68c7 Additional dialogue can be used for consuming specific items 
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@2408 4f8fa57e-7814-0410-bad4-adc449f26b7c
 2018-02-28 20:33:00 +00:00
Flugente 90de5ed424 Additional dialogue can be used for consuming specific items 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8531 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2018-02-28 20:29:30 +00:00
Flugente f4171a3889 If a merc's background has <druguse> set, they occasionally consume beneficial drugs in combat for free. 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8530 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2018-02-28 20:01:07 +00:00
Flugente 8206a7b467 - Added green syringe item picture to better tell poisons apart 
- Removed C-mag adapaters as possible attachments for bullpup guns

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@2407 4f8fa57e-7814-0410-bad4-adc449f26b7c
 2018-02-27 18:54:23 +00:00
Flugente abb8152d24 Fix: missing files 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8529 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2018-02-27 00:49:42 +00:00
Flugente 3bbdd4a23a New ability: a disguised spy can distract unalerted enemies, making it easier to sneak by. 
For more info, see http://thepit.ja-galaxy-forum.com/index.php?t=msg&th=20228&goto=352562&#msg_352562

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8528 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2018-02-25 19:07:31 +00:00
Flugente c8e9a3fb8e Fix: if we steal from an enemy, they turn to us if they notice us 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8527 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2018-02-25 16:21:45 +00:00
Flugente 7a537c3a2e Fix: soldier automatically taunts us whenever we steal, making stealth impossible 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8526 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2018-02-24 20:45:27 +00:00
Flugente c6d98dec05 Added painkillers to pharmacy shopkeepers 
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@2406 4f8fa57e-7814-0410-bad4-adc449f26b7c
 2018-02-22 19:18:17 +00:00
Flugente c7d68dbd55 If DISABLE_EVOLUTION is TRUE, learning evolution is not used. 
For more info, see http://thepit.ja-galaxy-forum.com/index.php?t=msg&th=20659&goto=352514&#msg_352514

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8525 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2018-02-22 19:01:43 +00:00
Flugente 8cd2d82c5b If DISABLE_EVOLUTION is TRUE, learning evolution is not used. 
For more info, see http://thepit.ja-galaxy-forum.com/index.php?t=msg&th=20659&goto=352514&#msg_352514

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@2405 4f8fa57e-7814-0410-bad4-adc449f26b7c
 2018-02-22 19:00:59 +00:00
Flugente 9773e1d293 Fix: on low resolutions, the message log blocks parts of the inventory,so deactivate the log in that case 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8524 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2018-02-21 20:45:57 +00:00
Flugente 3f666a6c2b New item: painkillers (item #1752) works similar to a bottle of small regen boosters, but is much more addictive 
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@2404 4f8fa57e-7814-0410-bad4-adc449f26b7c
 2018-02-21 19:48:00 +00:00
Flugente 92e759555d - New enemy role: display whether an enemy carries a key 
For more, see http://thepit.ja-galaxy-forum.com/index.php?t=msg&th=21774&goto=352502&#msg_352502
- If ENHANCED_CLOSE_COMBAT_SYSTEM is on, stealing multiple items from an enemy is possible if he is not on alert

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8523 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2018-02-21 18:49:35 +00:00
Flugente aaa494c53a Fix: forgot data 
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@2402 4f8fa57e-7814-0410-bad4-adc449f26b7c
 2018-02-18 23:22:05 +00:00
Flugente e55b480996 New feature: Getting and using intel allows for more spy-related roleplay. 
For more info, see http://thepit.ja-galaxy-forum.com/index.php?t=msg&th=23643&goto=352475&#msg_352475

Requires GameDir >= r2401.

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8522 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2018-02-18 23:17:34 +00:00
Flugente 9cf666a038 New feature: Getting and using intel allows for more spy-related roleplay 
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@2401 4f8fa57e-7814-0410-bad4-adc449f26b7c
 2018-02-18 23:12:21 +00:00
Flugente ee73811cfe If PRINTOUTTILESET is TRUE, also print out the room number when pressing 'f'. 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8521 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2018-02-17 19:32:10 +00:00
Flugente 876b8f2502 Fix: possible crash during item transformation 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8520 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2018-02-17 19:23:03 +00:00
Flugente e7ce503e9e Cleaned up arms dealer code 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8519 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2018-01-28 20:51:07 +00:00
Flugente a9452840af Fix: gear templates: when creating a new ammo stack from non-fitting magazines, fill up the stack 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8518 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2018-01-22 21:37:51 +00:00
Flugente dd3129ac11 New feature: additional dialogue allows modders to play additional dialogue on man occasions, including reactions to other people speaking 
For more info, see http://thepit.ja-galaxy-forum.com/index.php?t=tree&goto=351982&#msg_351982 and for a demonstration http://thepit.ja-galaxy-forum.com/index.php?t=tree&goto=351981&#msg_351981

Requires GameDir >= r2400

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8516 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2018-01-10 23:41:52 +00:00