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,637 Commits 9 Branches 6 Tags
98c1e6a1f529104f2984c3192da76472ce7a53be
Commit Graph
7637 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Flugente 87bd1118d0 Fix: NPCs with profile > 170 have missing approach values, making it imposssible to fulfil opinion checks 
Fore more info, see http://thepit.ja-galaxy-forum.com/index.php?t=msg&th=20659&goto=353657&#msg_353657

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8566 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2018-06-02 01:23:59 +00:00
Flugente 2d31145d06 Manuel's .npc script uses flag 430, so take note of that. 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8565 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2018-06-02 01:00:26 +00:00
Flugente 492790cbf0 Fix: lua function CheckMiscFlags1 checks the wrong flags 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8564 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2018-06-02 00:56:15 +00:00
Flugente f945d164af Fix: Make sure MILITIA_VOLUNTEER_POOL_MULTIPLIER_FARM is not applied to farms inside towns 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8563 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2018-05-16 21:54:16 +00:00
Flugente 52b7de54e1 If a gun's currently used ammotype has <numberOfBullets> > 1, display the gun damage in EDB in 'bullet damage X bullets fired' format, taking <multipleBulletDamageMultiplier> / <multipleBulletDamageDivisor> into account. 
For more info, see http://thepit.ja-galaxy-forum.com/index.php?t=msg&th=20659&goto=353533&#msg_353533

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8562 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2018-05-16 21:15:37 +00:00
Flugente e15a61a5cc Fix: in OCTH, damage modifiers for guns are only displayed correctly if the gun fits into a small pocket 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8561 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2018-05-15 23:19:23 +00:00
Flugente 100eea196b New feature: quest & intel map overlay 
For more info, see http://thepit.ja-galaxy-forum.com/index.php?t=msg&th=23742&goto=353499&#msg_353499

Requires GameDir >= r2424

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8560 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2018-05-14 21:26:37 +00:00
Flugente c033d7ad8f New feature: quest & intel map overlay 
For more info, see http://thepit.ja-galaxy-forum.com/index.php?t=msg&th=23742&goto=353499&#msg_353499

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@2424 4f8fa57e-7814-0410-bad4-adc449f26b7c
 2018-05-14 21:22:43 +00:00
Flugente 70ad3387a8 - Fix: creature attack variables are not always cleaned up properly 
- Fix: game remains in pause state after using cheat to avoid creature attack in strategic

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8559 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2018-05-14 19:08:17 +00:00
silversurfer 2c7dae46b2 fix (by The_Bob): 
- Items.xml had an unneeded tag in it that could break parsing

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@2423 4f8fa57e-7814-0410-bad4-adc449f26b7c
 2018-05-06 08:15:19 +00:00
silversurfer a7ee7c8644 fixes (by Jolly_Reaper) to spelling and grammar errors in several XMLs 
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@2422 4f8fa57e-7814-0410-bad4-adc449f26b7c
 2018-04-21 09:55:20 +00:00
Flugente 9e71b31a30 - Fix: missing individual profiles for militia arriving in currently loaded sector 
- reduce number of warnings if no individual militia profiles are found

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8558 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2018-04-19 19:23:08 +00:00
Flugente 150b05e0b5 Fix: sound for drinking water played twice 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8557 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2018-04-18 23:12:33 +00:00
silversurfer 59f36a3edd fix (by Jolly_Reaper): 
- fixed Vickie's background description
- removed incorrect AP penalties from Vickie's background

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@2421 4f8fa57e-7814-0410-bad4-adc449f26b7c
 2018-04-15 19:51:03 +00:00
Flugente d6d283ca00 Fix: fixed raid attack times 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8555 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2018-04-15 17:56:33 +00:00
Flugente 80674249cc New feature: bloodcat/zombie/bandit raids on player-controlled sectors 
For more info, see http://thepit.ja-galaxy-forum.com/index.php?t=msg&th=23711&goto=353154&#msg_353154

Requires GameDir >= r2420

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8554 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2018-04-15 14:42:01 +00:00
Flugente 142568b079 New feature: bloodcat/zombie/bandit raids on player-controlled sectors 
For more info, see http://thepit.ja-galaxy-forum.com/index.php?t=msg&th=23711&goto=353154&#msg_353154

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@2420 4f8fa57e-7814-0410-bad4-adc449f26b7c
 2018-04-15 14:34:33 +00:00
Flugente 1ea69989ed Fix: bad radar/overhead map colours for creature team. 
For more info, see http://thepit.ja-galaxy-forum.com/index.php?t=msg&th=22776&goto=353150&#msg_353150

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8553 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2018-04-15 13:35:06 +00:00
Flugente f8e1fd1e74 Fix: zombies do not move due to low morale 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8552 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2018-04-14 18:34:49 +00:00
Flugente 77a8bf2827 Fix: changed Vicki's disability from 'afraid of heights' to 'claustrophobia' 
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@2419 4f8fa57e-7814-0410-bad4-adc449f26b7c
 2018-04-12 22:54:22 +00:00
Flugente 140e377d1e Fix: interrogation intel gains are wrong 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8551 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2018-04-09 19:21:06 +00:00
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