Commit Graph
1284 Commits
Author SHA1 Message Date
Wanne d81e852e8b - Deleted unused File
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1289 4f8fa57e-7814-0410-bad4-adc449f26b7c
2011-05-26 10:56:41 +00:00
Wanne 7e5ba8bd71 ****************************************************************************************
** Merged (English) GameDir files from Development trunk, for the Spring 2011 Release **
****************************************************************************************
o Development Trunk (Revision: 4444):  https://81.169.133.124/source/ja2/branches/Wanne/JA2%201.13%20MP

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1288 4f8fa57e-7814-0410-bad4-adc449f26b7c
2011-05-26 10:54:58 +00:00
Starwalker 432bd657bf gave NCTH-values to the HK LMGs with integral bipods where they were missing.
removed NCTH-values from LMGs (and SRs) that no longer have an integral bipod.
FN MAG can mount a Grippod now (found an after-market rail on the web...)
raised the number of 6.8mm SPC ammo at BR's and added a clip to Tony's inventory as well.
made Rifle-LAMs attachable to AICW (it has a rail on top).

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1287 4f8fa57e-7814-0410-bad4-adc449f26b7c
2011-05-17 06:49:08 +00:00
Wanne cbb208dc7b - Fixed double entries in CivGroupNames.xml
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1286 4f8fa57e-7814-0410-bad4-adc449f26b7c
2011-05-17 06:16:56 +00:00
Wanne 0d995d1ee8 - Fixed "jumping letters" in "Multiplayer Game" titletext in main menu
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1285 4f8fa57e-7814-0410-bad4-adc449f26b7c
2011-05-09 10:09:42 +00:00
Starwalker d467e6653a changed binoculars back to being one-handed, because ChrisL will implement code that stops the exploit of having one in each hand to get double the bonus...
added a 'Use Item'-merge to get a Fumble Pak out of a Portable TV by using the Utility Knife.
changed Bubba's ammo from magazines to speedloaders (was mentioned on Bugzilla).

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1284 4f8fa57e-7814-0410-bad4-adc449f26b7c
2011-05-02 14:00:49 +00:00
Wanne cce2769d5e - Fixed some frames for Wildfire IMP camo faces (by Buggler)
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1283 4f8fa57e-7814-0410-bad4-adc449f26b7c
2011-05-01 18:43:43 +00:00
Wanne ac77ff9ded - Updated "Data-1.13/Scripts/initunderground.lua": Now it is possible to specify alternate loadscreens when loading a sector (by Realist)
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1282 4f8fa57e-7814-0410-bad4-adc449f26b7c
2011-04-25 08:27:59 +00:00
Wanne a2fa8f75e0 - Forget to set 50/50 chance for the new UB loadscreens
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1281 4f8fa57e-7814-0410-bad4-adc449f26b7c
2011-04-19 08:32:29 +00:00
Wanne fda90ed875 - Added 1.13 sector loadscreens (by Jazz)
- Added a few 1.13 matching sector loadscreens to alternate sector loadscreens in SectorLoadscreens.xml

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1280 4f8fa57e-7814-0410-bad4-adc449f26b7c
2011-04-19 08:20:27 +00:00
Wanne eab803e81f - Added missing camo faces for IMP 218.sti and 219.sti (by Jazz)
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1279 4f8fa57e-7814-0410-bad4-adc449f26b7c
2011-04-19 07:23:27 +00:00
Wanne 2d0919e12c - Added missing camo faces for IMP 216.sti and 217.sti (by Jazz)
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1278 4f8fa57e-7814-0410-bad4-adc449f26b7c
2011-04-16 16:13:30 +00:00
Wanne 810e55ee77 - Fixed a few face portraits (corrected some sti frames) (by Buggler)
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1277 4f8fa57e-7814-0410-bad4-adc449f26b7c
2011-04-11 07:59:12 +00:00
Wanne 398578e475 - Fixed wrong mouth and eyes coordinates for Tex and Biggins in all the different Prof*.dat files
o Without the fix this leads to wrong face coordinates and then to blitter crashes when playing with READ_PROFILE_DATA_FROM_XML = FALSE


git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1276 4f8fa57e-7814-0410-bad4-adc449f26b7c
2011-03-14 09:09:49 +00:00
Wanne 9105294d49 - Re-added the OPTIONSCREENADDONS2.sti that Inshy deleted, because this one is needed. This is needed for the reworked option screen with the next/previous pages
o The original OPTIONSCREENADDONS.sti has bigger buttons, so we need this one. I replaced the first index of the STI (which was from Ron's interface) with an empty one.


git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1275 4f8fa57e-7814-0410-bad4-adc449f26b7c
2011-03-13 22:00:23 +00:00
Wanne 1f7fb9c562 - Fixed wrong comment description in Additional Merchants Modifications.txt
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1274 4f8fa57e-7814-0410-bad4-adc449f26b7c
2011-03-12 10:04:24 +00:00
inshy 1e5a7b2456 -Deleted Credits.sti because this file exist in original Interface.slf
-Deleted modified OPTIONSCREENADDONS2.sti because this file from Rons Modified Interface. We have original STI in Interface.slf

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1273 4f8fa57e-7814-0410-bad4-adc449f26b7c
2011-03-10 06:51:33 +00:00
Wanne 70f040217f - Deleted 3 STI files, that are no longer in use, because ChrisL made changes to the development source code.
o The changes are in Revision 4202
o ChrisL updated the following STIs: ATTACHMENT_SLOT.sti, INFOBOX_INTERFACE.sti, ITEMINFOC.sti
o I just deleted the 3 STI files, cause otherwise we forget to do it later when merging the stuff back from the development trunk

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1272 4f8fa57e-7814-0410-bad4-adc449f26b7c
2011-02-23 09:29:35 +00:00
Starwalker 15e17dfa8a exchanged ammocrate pictures with better ones made by Smeagol
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1271 4f8fa57e-7814-0410-bad4-adc449f26b7c
2011-02-21 10:33:13 +00:00
Starwalker 5b34d10f5e exchanged ammocrate pictures with better ones made by Smeagol
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1270 4f8fa57e-7814-0410-bad4-adc449f26b7c
2011-02-21 10:32:41 +00:00
Starwalker f5897e7cde corrected some wrong ammo-pointers.
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1269 4f8fa57e-7814-0410-bad4-adc449f26b7c
2011-02-15 15:32:23 +00:00
Wanne 47d20449e0 - Deleted unused STI files
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1268 4f8fa57e-7814-0410-bad4-adc449f26b7c
2011-02-13 15:37:23 +00:00
inshy 32c03750a7 -Added missing sounds for WF mercs
-Small fixes in edts for WF mercs

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1267 4f8fa57e-7814-0410-bad4-adc449f26b7c
2011-02-04 20:58:49 +00:00
Starwalker 29a322396f adjusted Singleshot-AP costs for all guns, according to weapon overhaul results.
Fine-tuned values, so they should now show more differences if an AP-system above 100AP is used.

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1266 4f8fa57e-7814-0410-bad4-adc449f26b7c
2011-02-02 15:18:35 +00:00
inshy d914d8f248 Replace large NOTIFICATION.STI with small NOTIFICATION.PNG
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1265 4f8fa57e-7814-0410-bad4-adc449f26b7c
2011-02-01 20:07:14 +00:00
Wanne aa1de35aac - Corrected a few values from Data\TableData\Weapons.xml (thx to Starwalker)
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1264 4f8fa57e-7814-0410-bad4-adc449f26b7c
2011-02-01 13:40:23 +00:00
Wanne 4cfd2763c7 - Restored and reworked TableData/Items.xml and TableData/Weapons.xml. Both had items and weapons from Data-1.13 and therefore invalid Data!
- Fixed wrong price for 9x39mm Mag

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1263 4f8fa57e-7814-0410-bad4-adc449f26b7c
2011-02-01 10:19:21 +00:00
Starwalker e5c6da39c8 corrected some gun and ammo weights
corrected some very wrong MinRangeForAimBonus values that somehow sabotaged some scopes (I have no idea how these crept in, SVN 1256 still had correct values)

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1262 4f8fa57e-7814-0410-bad4-adc449f26b7c
2011-02-01 10:01:07 +00:00
inshy 96186ac7db - Fixed broken sound scheme for all tilesets (log file say that "AMBIENT\32.bad" does not exist)
This bug was committed in rev. 1257 when gamedir was updated for UB Tilesets... For the future updates of ja2set.dat don't use buggy editors.
- Deleted unused folder


git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1261 4f8fa57e-7814-0410-bad4-adc449f26b7c
2011-01-25 06:45:31 +00:00
inshy 2cbde8d37d -Replaced multilayer STI for Main Menu by singlayer
-Updated 176.EDT
-Deleted wrong speech files for prof 175 and 176 (In original WF6 there is no this files... Someone must do it in audio studio)

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1260 4f8fa57e-7814-0410-bad4-adc449f26b7c
2011-01-21 10:05:19 +00:00
inshy e54c4cb0c5 -Translate to russian some lines
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1259 4f8fa57e-7814-0410-bad4-adc449f26b7c
2011-01-19 21:03:28 +00:00
Wanne ebc391cd4a - Deleted old executables of "ja2.exe" and "Map Editor.exe"
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1258 4f8fa57e-7814-0410-bad4-adc449f26b7c
2011-01-18 15:02:35 +00:00
Wanne 71cb695318 ************************************************************
* Merged GameDir from Development Trunk: Revision 4063 *
************************************************************
- Merged from SVN: https://81.169.133.124/source/ja2/branches/Wanne/JA2%201.13%20MP

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1257 4f8fa57e-7814-0410-bad4-adc449f26b7c
2011-01-18 10:24:49 +00:00
Starwalker 71760e4d79 added single 43mm grenades for use with NAS. May not be fully functional at this time and WILL NOT work without NAS. Item descriptions contain warning.
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1256 4f8fa57e-7814-0410-bad4-adc449f26b7c
2010-12-06 09:54:14 +00:00
Starwalker 1f3eac16b3 added big pics of single 43mm grenades (ChrisL)
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1255 4f8fa57e-7814-0410-bad4-adc449f26b7c
2010-12-06 09:47:54 +00:00
Starwalker 60f75c8129 added interface pics of single 43mm grenades (ChrisL)
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1254 4f8fa57e-7814-0410-bad4-adc449f26b7c
2010-12-06 09:47:18 +00:00
Starwalker 5aa18a87a0 added small pics of single 43mm grenades
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1253 4f8fa57e-7814-0410-bad4-adc449f26b7c
2010-12-06 09:46:53 +00:00
Starwalker a32b5533a1 repeated upload of items.xml due to earlier problems with foreign language descriptions of 9x18mm Glaser ammo.
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1252 4f8fa57e-7814-0410-bad4-adc449f26b7c
2010-11-30 16:21:35 +00:00
Starwalker 5facf05a0b added 9x18mm Glaser ammo.
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1251 4f8fa57e-7814-0410-bad4-adc449f26b7c
2010-11-30 15:46:21 +00:00
Starwalker f4bff25368 big pics for 9x18 Glaser ammo added
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1250 4f8fa57e-7814-0410-bad4-adc449f26b7c
2010-11-30 15:45:24 +00:00
Starwalker c411289ce6 interface small pics for 9x18 Glaser ammo added
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1249 4f8fa57e-7814-0410-bad4-adc449f26b7c
2010-11-30 15:45:00 +00:00
Starwalker 5fb24cd0e5 small pics for 9x18 Glaser ammo added
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1248 4f8fa57e-7814-0410-bad4-adc449f26b7c
2010-11-30 15:44:40 +00:00
Wanne a1b30ff635 - Fixed data\TableData\Magazines.xml
- Fixed "MINIMUM_CTH_DIVISOR" default value in Data\ja2_options.ini

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1247 4f8fa57e-7814-0410-bad4-adc449f26b7c
2010-11-02 09:24:09 +00:00
Starwalker 88f55fbfd5 added .38 Match and HP Solid ammo (including ammo crates).
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1246 4f8fa57e-7814-0410-bad4-adc449f26b7c
2010-10-28 11:32:17 +00:00
Starwalker b8d5fe8d67 added .38 Match and HP Solid ammo (including ammo crates).
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1245 4f8fa57e-7814-0410-bad4-adc449f26b7c
2010-10-28 11:31:51 +00:00
Starwalker 4905ee1517 added pics for new .38Spc ammunition.
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1244 4f8fa57e-7814-0410-bad4-adc449f26b7c
2010-10-25 13:13:56 +00:00
Starwalker b096ca18dd added pics for new .38Spc ammunition.
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1243 4f8fa57e-7814-0410-bad4-adc449f26b7c
2010-10-25 13:13:37 +00:00
Starwalker ef20011a07 added pics for new .38Spc ammunition.
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1242 4f8fa57e-7814-0410-bad4-adc449f26b7c
2010-10-25 13:13:23 +00:00
Starwalker c6bbb23d7a replaced small pic of First Aid Kit, because it was still the old 'white box' pic.
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1241 4f8fa57e-7814-0410-bad4-adc449f26b7c
2010-09-24 10:15:56 +00:00
Wanne acc2745efa - Fixed wrong Y offset of "P90" and "First Aid Kit" which leaded to a CTD im Map Editor when you select those items for merc inventory
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1240 4f8fa57e-7814-0410-bad4-adc449f26b7c
2010-09-22 10:27:04 +00:00