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
Lesh 75f70a13e3 - added possibility to dismiss a vehicle without passengers 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@643 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2006-12-03 18:15:40 +00:00
Starwalker 186346d148 added C7CT to Tony's inventory 
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@608 4f8fa57e-7814-0410-bad4-adc449f26b7c
 2006-12-03 14:10:41 +00:00
Starwalker 13b26d19ea changed RPK-74 from 75rnd drums to 45rnd magazines 
added C7CT gun

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@607 4f8fa57e-7814-0410-bad4-adc449f26b7c
 2006-12-03 14:10:16 +00:00
Starwalker 7d8cd1b61a replaced pic of RPK-74 with new one by Marlboro Man 
added pic of C7CT, made by Marlboro Man
added pics of two .454 Casull guns for later use, by Starwalker
added pics for 45rnd RPK-magazine and for .454 Casull ammo, all made by Marlboro Man

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@604 4f8fa57e-7814-0410-bad4-adc449f26b7c
 2006-12-03 14:07:27 +00:00
Lesh cb12aacadc - added ability to use ogg-files in speech sound files. 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@642 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2006-12-02 12:10:47 +00:00
Wanne 5615c2a075 - bugfix: Wrong text placement in the florist gallery website 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@639 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2006-11-29 23:49:44 +00:00
Starwalker a652b2f945 new pic (made by Marlboro Man) for FN F2000 
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@601 4f8fa57e-7814-0410-bad4-adc449f26b7c
 2006-11-28 17:28:42 +00:00
Starwalker b0c7b4dbb8 made Sniper Scope and Reflex Sight incompatible for future projects. 
changed available and built-in attachments of FN F2000.

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@600 4f8fa57e-7814-0410-bad4-adc449f26b7c
 2006-11-28 17:27:23 +00:00
Lesh 4a2a790b76 - bug fixing in the sam site externalization code 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@638 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2006-11-27 18:19:50 +00:00
Starwalker 3e67488439 added German descriptions made by Malborex for the .45 Winchester Magnum ammo and pistols. 
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@599 4f8fa57e-7814-0410-bad4-adc449f26b7c
 2006-11-23 08:32:07 +00:00
Starwalker 3b5dea5d06 added some items to the game: 
item 567    .45 Winchester Magnum magazine
item 568    .45 Winchester Magnum HP magazine
item 569    .45 Winchester Magnum AP magazine
item 766    Automag IV pistol
item 767    LAR Grizzly .45 WM pistol
item 768    Wildey Survivor pistol
item 920    M203 CLS grenade launcher

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@598 4f8fa57e-7814-0410-bad4-adc449f26b7c
 2006-11-22 08:16:00 +00:00
Starwalker 6e86bcd496 added several ammo pics for later use: 
528  .45 Winchester Magnum
529  .45 Winchester Magnum HP
530  .45 Winchester Magnum AP

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@593 4f8fa57e-7814-0410-bad4-adc449f26b7c
 2006-11-21 08:11:07 +00:00
Starwalker 19976cbdc5 Trying to repair broken xml by uploading unopened version. 
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@592 4f8fa57e-7814-0410-bad4-adc449f26b7c
 2006-11-20 11:18:42 +00:00
Wanne d4e410f629 - fix: RUNTIME-ERROR after starting the game. The problem occured in ArmyComposition.xml in the comment block. "--" is not allowed in the comment block. Strange, don't ask me why ;-) 
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@591 4f8fa57e-7814-0410-bad4-adc449f26b7c
 2006-11-19 18:47:12 +00:00
Lesh 9941ae98d6 - comments on army externalization (3/3) 
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@590 4f8fa57e-7814-0410-bad4-adc449f26b7c
 2006-11-19 15:36:01 +00:00
Lesh 1db5aa5005 - comments on army externalization (3/3) 
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@589 4f8fa57e-7814-0410-bad4-adc449f26b7c
 2006-11-19 15:35:22 +00:00
Lesh 49c33bfdfb - bug fix: reinforcements 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@636 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2006-11-19 14:04:11 +00:00
Lesh ff814b7fc7 - bug fix: secrets on strategic map and other externalized stuff were not properly initialized, if user loads a saved game before he creates a new game. 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@635 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2006-11-18 19:16:58 +00:00
Starwalker 6d471d0ec0 added German descriptions made by Malborex for M16A1, XM177-E1, CMMG 7.3, and OA-93 
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@588 4f8fa57e-7814-0410-bad4-adc449f26b7c
 2006-11-17 08:33:33 +00:00
Lesh ad596339c3 - army xmls comments, files: 2 of 3 
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@587 4f8fa57e-7814-0410-bad4-adc449f26b7c
 2006-11-16 17:06:47 +00:00
Lesh 520df9152e - army xmls comments, files: 2 of 3 
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@586 4f8fa57e-7814-0410-bad4-adc449f26b7c
 2006-11-16 17:06:18 +00:00
Starwalker 57c59b7de1 replaced SPAS-15 pic with one made by Marlboro Man. 
added several gun pics for later use:
276  Automag IV
277  LAR Grizzly .45WM
278  Wildey Survivor
279  KP m/31 Suomi
280  Colt Launcher System

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@583 4f8fa57e-7814-0410-bad4-adc449f26b7c
 2006-11-16 07:51:02 +00:00
Wanne 0e8afa6c7a git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@634 3b4a5df2-a311-0410-b5c6-a8a6f20db521 2006-11-15 21:10:38 +00:00
Lesh 0f2aad2850 - army externalization 
- bugfix: proper sam site marking for Strategic AI

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@633 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2006-11-14 14:32:32 +00:00
Lesh 0fe685f0d0 - army xml set added 
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@582 4f8fa57e-7814-0410-bad4-adc449f26b7c
 2006-11-14 14:26:34 +00:00
Lesh afcd1f0b55 - army xml set added 
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@581 4f8fa57e-7814-0410-bad4-adc449f26b7c
 2006-11-14 14:26:14 +00:00
Starwalker ef905bdd92 added M16A1, XM177-E1, CMMG 7.3, and OA-93 to Tony's inventory. 
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@580 4f8fa57e-7814-0410-bad4-adc449f26b7c
 2006-11-14 08:15:33 +00:00
Wanne c351c27e37 - bugfix: Endless clock after stealing 
- changed: APs for stealing from 10 to 14 (because stealing is more than simple picking enemies gun)
- changed: You cannot steal items from head, body, leg or face until the enemy is collapsed (lying on the ground)

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@631 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2006-11-13 08:36:36 +00:00
Starwalker a523743a3b removed ability to mount Retractable Stock to QBZ-97, which is a bullpup rifle! 
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@573 4f8fa57e-7814-0410-bad4-adc449f26b7c
 2006-11-13 08:05:42 +00:00
Wanne ac117f7143 - bugfix: CTD after talking to Darren in San Mona (in the boxing club) 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@630 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2006-11-12 17:36:50 +00:00
Wanne b5601c78d9 updated soldier tooltips 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@629 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2006-11-12 16:24:53 +00:00
Wanne d69925e658 git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@572 4f8fa57e-7814-0410-bad4-adc449f26b7c 2006-11-12 16:24:02 +00:00
Lesh c0385017de - made small optimization 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@628 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2006-11-11 22:23:27 +00:00
Wanne 01da47d3b3 git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@571 4f8fa57e-7814-0410-bad4-adc449f26b7c 2006-11-11 09:21:57 +00:00
Wanne c0d8db06ed - updated solier tooltip again 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@626 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2006-11-09 19:38:29 +00:00
Wanne 18434383de git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@570 4f8fa57e-7814-0410-bad4-adc449f26b7c 2006-11-09 19:38:01 +00:00
Wanne 9fac33fe18 - updated Soldier tooltips 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@625 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2006-11-09 19:23:22 +00:00
Starwalker 9793ef70bc replaced big pics for HK SL8 and Thompson M1A1 with new ones made by Marlboro Man 
replaced big pics for Bizon, M16A1, Micro-Uzi, Mini-Uzi, Saiga, SIG Pro, Tavor, and Uzi with new ones made by Terry Thorne

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@567 4f8fa57e-7814-0410-bad4-adc449f26b7c
 2006-11-09 07:43:58 +00:00
Starwalker da71740ce0 added .357 Magnum AET ammo to Tony's inventory 
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@566 4f8fa57e-7814-0410-bad4-adc449f26b7c
 2006-11-09 07:38:03 +00:00
Starwalker baf8c2a2c3 corrected price for .357 Magnum AET ammo 
corrected explanation of 'SIG' in one gun description

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@565 4f8fa57e-7814-0410-bad4-adc449f26b7c
 2006-11-09 07:37:08 +00:00
Wanne c776809a68 git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@564 4f8fa57e-7814-0410-bad4-adc449f26b7c 2006-11-08 21:28:08 +00:00
Wanne 447ba8cbf7 - tooltips on the enemy are only displayed if the enemy can be seen by the selected merc. This only takes effect if tooltip detail level = 1 (limited) or 2 (basic) 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@624 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2006-11-08 21:27:13 +00:00
Lesh ac91cfb731 - fixed CTD when trying to add 13th town 
- preparations to increase number of town sectors

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@623 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2006-11-08 17:04:15 +00:00
Wanne 099ce17225 - bugfix: Wrong APs deduction from stealing 
- bugfix: Prevent Nada objects from stealing

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@622 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2006-11-07 21:25:26 +00:00
Wanne b53eec588d - reseted IMP activation text box after creating an IMP 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@620 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2006-11-06 21:09:37 +00:00
Starwalker d3c001a323 Added .357 Magnum AET ammo (both magazine and speedloader) 
Tagged 20mm and 25mm grenade ammo as SciFi, because the relevant launchers are tagged as SciFi as well.

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@561 4f8fa57e-7814-0410-bad4-adc449f26b7c
 2006-11-06 08:41:01 +00:00
Starwalker 79467eb60a Large pics for the new .357 Magnum AET ammo 
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@559 4f8fa57e-7814-0410-bad4-adc449f26b7c
 2006-11-06 08:02:58 +00:00
Wanne f839dcbe73 - bugfix: CTDs after you have placed your mercs before the attacking occurs 
- added notification when you try to create a new IMP and you already have the maxium number of mercs (18) in your team.


git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@619 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2006-11-05 21:21:51 +00:00
Lesh f072ee19ce - fixed issue with visibility of enemies after raising scoped gun (no need to look twice anymore) and versa, i hope. 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@618 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2006-11-05 18:22:05 +00:00
Wanne 1b25b0f093 - bugfix: CTD when trying to recruit John & Mary and there is only one free place left in the whole team. 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@617 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2006-11-05 00:32:06 +00:00