Commit Graph
7616 Commits
Author SHA1 Message Date
Wanne dc62f4e918 Updated Ja2.ini description for windowed mode
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@713 4f8fa57e-7814-0410-bad4-adc449f26b7c
2007-02-26 14:29:00 +00:00
Wanne a04e548846 New build (742)
- fixed some crashes when loading 4xx built savegames.
- Added new, optional JA2.INI parameter to select windowed mode instead of Fullscreen (SCREEN_MODE_WINDOWED)
- tactical militia command: stopped merc from moving to militia in combat if he doesn't have a headset (radio)
- updated credits screen to the 1.13 Credits
- translated "low cpu usage" option text for german version
- improved existing "escorting kulbas" bugfix

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@712 4f8fa57e-7814-0410-bad4-adc449f26b7c
2007-02-25 14:42:38 +00:00
Wanne 8e5f803fc4 - updated credits screen to the 1.13 Credits
- translated "low cpu usage" option text for german version
- improved existing "escorting kulbas" bugfix

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@741 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2007-02-25 13:41:15 +00:00
Wanne 98f8fe6030 Correct wrong (some pixels) strategic map buttons alignment
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@739 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2007-02-24 19:55:01 +00:00
lalien b0ef70dbb8 - Tactical militia command: stopped merc from moving to militia in combat if he doesn't have a headset (radio)
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@736 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2007-02-24 10:13:46 +00:00
Sergeant_Kolja 035e6d5caa Added new, optional JA2.INI parameter to select windowed mode instead of Fullscreen ([Ja2 Setting] SCREEN_MODE_WINDOWED=1). To keep Fullscreen, simply omit this swith or set it to 0. Also, added a cmdline switch for the same effect, but with higher prio. /FULLSCREEN overwrites INI/SCREEN_MODE_WINDOWED=1 while /WINDOW overrides INI/SCREEN_MODE_WINDOWED=0.
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@734 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2007-02-23 21:13:20 +00:00
Sergeant_Kolja e40b062672 fixed some crashes when loading 4xx built savegames. The game can continue, but You'll probably loose your vehicles. The Team in the Laptop/Personel also consist only of Your AVATAR, but in strategic map the team is complete.
This is not a very well finished fix. Only glued some NULL assigned pointers. I recomend to NOT load too old savegames.

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@733 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2007-02-23 20:59:37 +00:00
MaddMugsy c5bcb17ea8 -xml files updated to work with xml editor
-fixed some IncompatibleAttachments.xml entries that didn't have corresponding reverse entries (fixed by editor)

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@711 4f8fa57e-7814-0410-bad4-adc449f26b7c
2007-02-22 23:43:15 +00:00
MaddMugsy 1faa6a9e55 -Data folder xml files updated for use w/XML Editor
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@709 4f8fa57e-7814-0410-bad4-adc449f26b7c
2007-02-22 22:42:24 +00:00
MaddMugsy a9059e3570 New build (728)
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@728 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2007-02-22 22:38:14 +00:00
Wanne c7729e9d44 Updated German.AmmoStrings.xml and German.Items.xml (thx to Toby)
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@708 4f8fa57e-7814-0410-bad4-adc449f26b7c
2007-02-22 21:13:27 +00:00
lalien ae9b49436a - menu descriptions fixed
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@727 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2007-02-22 13:51:19 +00:00
Starwalker 8e3165991f added Walther P99 to Tony's inventory
added 7.62x39mm Match ammo to Tony's inventory (though he won't sell drums...)

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@707 4f8fa57e-7814-0410-bad4-adc449f26b7c
2007-02-22 08:04:23 +00:00
Starwalker 7291d56871 added Walther P99
added 7.62x39mm Match ammo (thanks go to Marlboro Man for the BigItem pics)
raised reliability of AK-100 series rifles and lowered repair ease a bit

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@706 4f8fa57e-7814-0410-bad4-adc449f26b7c
2007-02-22 08:02:40 +00:00
Starwalker 77014c11ed added some gun and ammo pics for later use
added P99 pic
added 7.62x39mm Match ammo pics

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@703 4f8fa57e-7814-0410-bad4-adc449f26b7c
2007-02-22 07:51:31 +00:00
lalien 81f5b6e748 - new menu option: Low CPU Usage (patch from MTX/defrog)
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@725 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2007-02-21 17:17:00 +00:00
Starwalker 28f1dd20e4 corrected several mistakes:
- G36K can no longer take a Reflex Sight
- HK21E can no longer take a retractable stock
- AKS-74 can now take a Large Caliber Silencer
- AK-102 has a damage of 30 now (damage was too low for given barrel length before)
- corrected weight difference between AK- and AKS-models

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@702 4f8fa57e-7814-0410-bad4-adc449f26b7c
2007-02-21 07:33:27 +00:00
MaddMugsy ff2aa4f8e1 -increased inventory capacity for IMP items doled out in ImpItemChoices.xml
-changed ammo given to IMPs so they have at least two clips for their main gun

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@718 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2007-02-17 06:13:52 +00:00
MaddMugsy e2f086f514 -added category names to IMPItemChoices.xml
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@701 4f8fa57e-7814-0410-bad4-adc449f26b7c
2007-02-16 00:57:53 +00:00
MaddMugsy ef76508e7f -removed "unused" entry from ItemClass.xml
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@698 4f8fa57e-7814-0410-bad4-adc449f26b7c
2007-02-15 22:03:47 +00:00
Starwalker a7f5a0b506 activated .50 AE HP mag
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@697 4f8fa57e-7814-0410-bad4-adc449f26b7c
2007-02-12 13:37:19 +00:00
Starwalker 4e90ee064e replaced INSAS pic
added pic of .50 AE HP mag

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@696 4f8fa57e-7814-0410-bad4-adc449f26b7c
2007-02-12 13:36:27 +00:00
Wanne 99fc0c7c44 Added the 3 new weapons to German.Items.xml (thx to Toby)
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@693 4f8fa57e-7814-0410-bad4-adc449f26b7c
2007-02-11 18:06:22 +00:00
Starwalker 63b723a4a0 added three new guns to Tony's inventory: SA-24, KAC SR-47, and SAR 21
added .50 AE HP ammo to Tony's inventory, but deactivated it because pics are missing (big and tile size)

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@692 4f8fa57e-7814-0410-bad4-adc449f26b7c
2007-02-11 15:22:13 +00:00
Starwalker 34d323da60 added three new guns: SA-24, KAC SR-47, and SAR 21
added .50 AE HP ammo, but deactivated it because pics are missing (big and tile size)

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@691 4f8fa57e-7814-0410-bad4-adc449f26b7c
2007-02-11 15:18:57 +00:00
Starwalker 9cdc803d5a added pics for three new guns (items 780, 781, 782)
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@690 4f8fa57e-7814-0410-bad4-adc449f26b7c
2007-02-11 15:07:27 +00:00
Wanne 96c2e5e9bc Updated German.Items.xml (thx to Toby)
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@687 4f8fa57e-7814-0410-bad4-adc449f26b7c
2007-02-10 15:25:56 +00:00
MaddMugsy c8b4cbe8d9 -skip the CompatibleFaceItem check if either item is Nothing. This will let us trim some lines from compatiblefaceitems.xml that are screwing up the xml-editor.
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@705 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2007-02-09 23:54:20 +00:00
MaddMugsy 390cf88c1a -repaired reflex sight name -->removed "DOCTER"
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@686 4f8fa57e-7814-0410-bad4-adc449f26b7c
2007-02-08 22:40:53 +00:00
Starwalker 0222d15482 'repaired' scope entries (names and some descriptions)
named MP5/10 back to MP5/10A3
raised damage of .300 WinMag rifles by 2

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@685 4f8fa57e-7814-0410-bad4-adc449f26b7c
2007-02-08 12:17:17 +00:00
Starwalker 7eedf6375e changed MG4 back to MG43
made binoculars two-handed items to stop exploit (binoculars in /both/ hands added effect)

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@682 4f8fa57e-7814-0410-bad4-adc449f26b7c
2007-02-07 07:50:25 +00:00
AcyForsythe 5830cb9cc2 - Moved the AP bonus settings to appropriate section of INI file
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@681 4f8fa57e-7814-0410-bad4-adc449f26b7c
2007-02-07 02:30:17 +00:00
Wanne 793bde64ee - bugfix: CTD when Skyrider is escorted to his heli in drassen (before Skyrider talks to the mercs)
- changed: Location of the Heli information box in Strategy Screen in High Resolution

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@701 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2007-02-06 16:25:08 +00:00
Starwalker 4f2f8c5d65 replaced HK MG43 pic (again)
replaced pics of Skorpion, MAB PA 15, Tavor, and SKS

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@680 4f8fa57e-7814-0410-bad4-adc449f26b7c
2007-02-06 07:23:17 +00:00
Wanne 820006afb7 Updated Data-1.13\TableData\German.Items.xml and Data-1.13\TableData\Items.xml (thx to Toby)
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@677 4f8fa57e-7814-0410-bad4-adc449f26b7c
2007-02-03 18:38:11 +00:00
MaddMugsy d0d722d4df -added uiIndex to Russian and German AmmoStrings
-added flashbang to ExplosionType.xml

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@676 4f8fa57e-7814-0410-bad4-adc449f26b7c
2007-02-02 01:52:35 +00:00
Starwalker a3285e52cf added Benelli R-1, Blaser R93, and S&O Shorty to Tony's inventory
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@675 4f8fa57e-7814-0410-bad4-adc449f26b7c
2007-02-01 11:25:21 +00:00
Starwalker e5e4da4d8c added Benelli R-1, Blaser R93, and S&O Shorty (all .300 WinMag)
added ability to attach PSO-scopes to AEK-971/973 and AN-94
changed default attachment of SVU from PSO-P to PSO-1

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@674 4f8fa57e-7814-0410-bad4-adc449f26b7c
2007-02-01 11:24:02 +00:00
Starwalker 61bd0a67e0 changed pics of Groza (w/o GL) and HK MG43
changed pics of RPK-74 magazines
added another rifle pic for later use (KAC SR-47)

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@671 4f8fa57e-7814-0410-bad4-adc449f26b7c
2007-02-01 11:18:43 +00:00
Wanne c5fce58380 - bugfix: CTD in German Version if you press 'q' in tactical (-> Missing strings in _GermanText.cpp)
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@694 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2007-01-31 21:45:05 +00:00
Wanne 15e1435dea New Map Editor exe build
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@691 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2007-01-31 09:40:44 +00:00
Wanne 3f0385107f Updated Ja2_Options.INI
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@668 4f8fa57e-7814-0410-bad4-adc449f26b7c
2007-01-29 09:02:16 +00:00
Wanne 7c0943bc58 Some "cosmetic" changes in Ja2_Options.INI
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@667 4f8fa57e-7814-0410-bad4-adc449f26b7c
2007-01-29 08:29:58 +00:00
Wanne 01b0d31144 New Release / Update build
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@687 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2007-01-28 21:27:19 +00:00
Wanne 3b49006981 Updated German.Items.xml and German.AmmoStrings.xml (thx to Toby)
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@666 4f8fa57e-7814-0410-bad4-adc449f26b7c
2007-01-28 21:07:54 +00:00
Wanne 06a9541f24 Updated mapscreen.h and strategicmap.h (number of town, sams, ...) see revision 671
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@686 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2007-01-28 20:07:40 +00:00
Wanne 0ae307a316 - bugfix: German "Umlaute" were not displayed correctly for short item names
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@685 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2007-01-28 20:02:05 +00:00
MaddMugsy 58ffb8cdc0 -made pso-p scope default attachment for SVU instead of the incompatible western-style sniper scope
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@665 4f8fa57e-7814-0410-bad4-adc449f26b7c
2007-01-28 17:42:51 +00:00
AcyForsythe b13492d6ac - Add missing INI settings for Militia cost and delay options
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@664 4f8fa57e-7814-0410-bad4-adc449f26b7c
2007-01-27 15:56:11 +00:00
Wanne e83a274a68 Updated tooltip detail level to basic (2) in Ja2_Options.INI
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@662 4f8fa57e-7814-0410-bad4-adc449f26b7c
2007-01-26 20:16:27 +00:00