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
896 Commits 9 Branches 6 Tags
87f58ea0c5fc83577fdf90a48d2fcfcd4dfdb4ba
Commit Graph
229 Commits
Author SHA1 Message Date
Wanne ac35024843 MERGED source game dir files from development trunk revision 4890 up to latest current revision 5105 
Development Trunk (now obsolete): https://ja2svn.dyndns.org/source/ja2/branches/Wanne/JA2%201.13%20MP
A detailed list of all the features (changes) is visible in the history log of the development trunk:

- New JA/DG Merc: Version 2.9
o Up to 20 new characters with complete speech from JA/DG
o see JA2_DG_Merc.txt for more infos

- A few more adjustments to the GameDir files

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1365 4f8fa57e-7814-0410-bad4-adc449f26b7c
 2012-03-23 20:30:23 +00:00
Wanne 298c33d36c - Added alternate shooting animation for big merc (M_SR_AM2.sti) (by Sandro) 
- Added alternate shooting animation for big merc when standing in water (MW_SR_AM.sti) (by Sandro)
- Added and renamed the original animations with a *.original" suffix

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1363 4f8fa57e-7814-0410-bad4-adc449f26b7c
 2012-03-15 09:23:06 +00:00
Wanne 2a3f2f97cb - Fixed Terry's 064_099 sound files ( by Buggler) 
o see: http://www.ja-galaxy-forum.com/board/ubbthreads.php?ubb=showflat&Number=301454#Post301454


git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1362 4f8fa57e-7814-0410-bad4-adc449f26b7c
 2012-03-15 08:58:51 +00:00
Wanne d1b02dd028 - Translated EncyclopediaQuests.xml to English (by Asthner) 
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1361 4f8fa57e-7814-0410-bad4-adc449f26b7c
 2012-02-29 09:57:28 +00:00
Wanne 82c708445d - Reworked the comments block in the Vehicles.xml file 
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1360 4f8fa57e-7814-0410-bad4-adc449f26b7c
 2012-02-26 16:10:34 +00:00
Wanne b7b61f917d - Fixed "Hummer" going hostile when encountered in a sector 
o The <neutral> tag was set to 0 (enemy) instead of 1 (neutral, friendly)

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1359 4f8fa57e-7814-0410-bad4-adc449f26b7c
 2012-02-08 12:11:37 +00:00
Wanne 431a7011a3 - Updated comments for the 3 new item size properties 
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1358 4f8fa57e-7814-0410-bad4-adc449f26b7c
 2012-02-01 16:31:21 +00:00
Wanne 467b91e355 - New Externalization: Item size and weapon limits (by JMich) 
o 3 new ja2_options.ini properties: MAX_ITEM_SIZE, MAX_WEAPON_SIZE, OLD_INVENTORY_ITEM_NUMBER
o see here: http://www.ja-galaxy-forum.com/board/ubbthreads.php?ubb=showflat&Number=276115&page=1

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1357 4f8fa57e-7814-0410-bad4-adc449f26b7c
 2012-02-01 16:16:55 +00:00
Wanne 425443ab37 Fix for NPC Inventory Tabledata (by Buggler) 
- NPC Inventory Tabledata IndexNo sort according to ItemID
- Removed double entries for same Item ID


git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1355 4f8fa57e-7814-0410-bad4-adc449f26b7c
 2012-01-29 19:11:21 +00:00
Wanne f647e94f49 MERGED GameDir files from the development GameDir folder from revision 4545 up to 4882 
Development GameDir folder: https://ja2svn.dyndns.org/source/ja2/branches/Wanne/JA2%201.13%20MP/GameDir




git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1353 4f8fa57e-7814-0410-bad4-adc449f26b7c
 2012-01-18 11:58:16 +00:00
inshy 3b393b7953 -Added 2 letters for French (Ligatures Æ, æ, Œ, œ). Now we have support for all French alphabet 
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1352 4f8fa57e-7814-0410-bad4-adc449f26b7c
 2012-01-07 21:02:31 +00:00
Wanne 1fc32aa472 - Updated alternate shooting pistol animation for small merc (by PasHancock) 
o To use this new animation, just rename it to "S_N_SHOT.sti"

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1351 4f8fa57e-7814-0410-bad4-adc449f26b7c
 2012-01-02 10:40:44 +00:00
Wanne 1d83e4a9aa - New Externalization: Mute when item spotted in turn based mode 
ja2_options.ini: ITEMS_SPOTTED_NO_TALK

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1348 4f8fa57e-7814-0410-bad4-adc449f26b7c
 2011-12-11 20:28:39 +00:00
Wanne c86bfd63ab - Fixed wrong possible location for Micky from D14 to D13 
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1345 4f8fa57e-7814-0410-bad4-adc449f26b7c
 2011-11-28 11:00:42 +00:00
Wanne 931e98c9f9 - Added 3 INI-Properties (DISABLE_STRATEGIC_TRANSITION, DISABLE_LAPTOP_TRANSITION, FAST_WWW_SITES_LOADING) for fast loading and skipping transitions 
o The source code changes are in revision: 4806

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1344 4f8fa57e-7814-0410-bad4-adc449f26b7c
 2011-11-18 10:16:13 +00:00
Wanne f72e7fdcef - Bugfix: Chitzena Mine (B2-1) was missing 
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1343 4f8fa57e-7814-0410-bad4-adc449f26b7c
 2011-11-14 13:39:22 +00:00
Wanne 45b549a772 - Moved vanilla reworked animations from "Data-1.13/Anims" to "Data/Anims" 
o Renamed the reworked Animation "M_SR_AM2.sti" to "M_SR_AM2.sti.bak" so it will not be used ingame currently

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1340 4f8fa57e-7814-0410-bad4-adc449f26b7c
 2011-10-17 20:14:54 +00:00
Wanne 3c77fcb9d9 - Externalized a 3 properties where the user can set how the AI reacts when shooting. This should fix the bug, that AI acts strange when playing with NCTH system (by tazpn) 
o MAX_EFFECTIVE_RANGE_MULTIPLIER, MAX_EFFECTIVE_RANGE_REDUCTION, MAX_EFFECTIVE_USE_GRADIENT
o Bears Pit discussion: http://www.ja-galaxy-forum.com/board/ubbthreads.php?ubb=showflat&Number=291742&page=3


git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1338 4f8fa57e-7814-0410-bad4-adc449f26b7c
 2011-10-15 20:01:05 +00:00
Wanne fdfd215590 - Heli ETA Box 
o Graphical Fix on the Heli ETA Box for 1024x768 by correcting e coordinates due to larger font used


git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1335 4f8fa57e-7814-0410-bad4-adc449f26b7c
 2011-10-02 19:00:21 +00:00
Wanne b8cd4a4212 - Added new running with pistol animation (by PasHancock) 
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1334 4f8fa57e-7814-0410-bad4-adc449f26b7c
 2011-10-02 14:27:08 +00:00
Wanne a1aa760823 - New big mercs with either Throwing trait or Show-Off personality use a slightly more fancy animation for throwing knives. (by PasHancock) 
o INFO: it needs at least an official source EXE from revision 4661 or a development source EXE from revision 4660 to work

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1333 4f8fa57e-7814-0410-bad4-adc449f26b7c
 2011-09-25 18:15:33 +00:00
Wanne 711033da1e - New remote detonator animations (by PasHancock) 
o INFO: it needs at least an official source EXE from revision 4675 or a development source EXE from revision 4656 to work

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1332 4f8fa57e-7814-0410-bad4-adc449f26b7c
 2011-09-25 07:47:53 +00:00
Wanne 29f12fb7d1 - Fixed the wrong INI-Comments style "//" with the correct ones ";" and applied proper JA2 section formating style 
o With this fix, the VFS.log should not report the "WARNING : could not extract key-value pair" anymore 

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1331 4f8fa57e-7814-0410-bad4-adc449f26b7c
 2011-09-21 08:01:36 +00:00
Wanne bf24cce595 - Moved 4 animations from "Data\Anims" to "Data-1.13\Anims", because they are replacements of existing animations and should only be in the "Data-1.13" folder to keep the originals in the "Data" folder 
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1330 4f8fa57e-7814-0410-bad4-adc449f26b7c
 2011-08-26 18:08:12 +00:00
Wanne c333679d35 - Added new gun and pistol shooting animation for big male (by PasHancock) 
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1329 4f8fa57e-7814-0410-bad4-adc449f26b7c
 2011-08-25 18:44:09 +00:00
Wanne 8c1b491330 - Updated a few existing animations (by PasHancock) 
o Fire in prone with rifle (S_R_PRN.STI) (Reg Male)
o Muzzle flash for pistols (S_N_SHOT.STI (Reg Male)
o Visible Pistol in prone (S_N_PRNE.STI) (Reg Male)

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1322 4f8fa57e-7814-0410-bad4-adc449f26b7c
 2011-08-14 20:58:43 +00:00
Wanne ed3f6fbcdf - Added new female grenade throwing animation (by PasHancock) 
o In this animation the persons takes out the pin from the grenade before throwing

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1319 4f8fa57e-7814-0410-bad4-adc449f26b7c
 2011-08-08 17:41:43 +00:00
Wanne 98c4e23828 - Added new graphical faces gear: SWAT Helmet (by Jazz) 
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1318 4f8fa57e-7814-0410-bad4-adc449f26b7c
 2011-08-05 05:47:03 +00:00
Wanne df77835fde -Fixed missing transparent (MBS_800x600.sti) (by Inshy) 
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1314 4f8fa57e-7814-0410-bad4-adc449f26b7c
 2011-07-19 09:49:50 +00:00
Wanne ded6885ee5 Enlarging Strategy Map in 800x600 and 1024x768 
o Added new/modified Game graphics
o The new game graphics only work together with a new executable which includes the enlarging strategy map feature!!
- You have to update the actual source trunk if you want to build your own executable or have to wait 2-3 days to get the official 2011 update

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1310 4f8fa57e-7814-0410-bad4-adc449f26b7c
 2011-06-30 14:52:04 +00:00
Wanne 08c9bad363 - Fixed starting inventory for MD (thx to Off_Topic) 
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1309 4f8fa57e-7814-0410-bad4-adc449f26b7c
 2011-06-30 10:18:17 +00:00
ChrisL a180f038b1 Removed extra "External Attachment" slot since there is currently only a single external attachment in the Official Release. 
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1307 4f8fa57e-7814-0410-bad4-adc449f26b7c
 2011-06-11 00:17:18 +00:00
ChrisL c283d3c78b Removed unused NAS 0.6x xml files. 
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1306 4f8fa57e-7814-0410-bad4-adc449f26b7c
 2011-06-10 18:00:57 +00:00
Wanne a6cade76ca BUGZILLA #510: Crepitus were still present in Tixa underground even in Realistic GameMode 
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1300 4f8fa57e-7814-0410-bad4-adc449f26b7c
 2011-06-05 22:09:48 +00:00
Wanne ad90dcc884 - Fixed comment for STRENGTH_TO_LIFT_HALF_KILO 
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1295 4f8fa57e-7814-0410-bad4-adc449f26b7c
 2011-05-30 10:45:13 +00:00
Wanne f22df5f30d - Fixed wrong description text for CAN_TRUE_CIVILIANS_BECOME_HOSTILE (thx to Buggler) 
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1293 4f8fa57e-7814-0410-bad4-adc449f26b7c
 2011-05-28 08:47:04 +00:00
Wanne 39a6c78684 - Changed "Dr Q" Traits from "Hand-to-Hand/Martial Arts(Expert) & Night Ops" to "Hand-to-Hand/Martial Arts, Paramedic/Doctor & Night Ops", cause that fits better (thx to Buggler) 
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1291 4f8fa57e-7814-0410-bad4-adc449f26b7c
 2011-05-27 06:18:05 +00:00
Wanne 5c04b9b1e1 **************************************************************************************** 
** 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
Wanne 92524291d4 - 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 b593050059 - 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
Wanne 31e90b8ed2 - 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 ad2767d806 - 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 92305df425 - 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
inshy f354fee9de -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 2caf64d0fe - 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 2bd112dc08 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 78a347485a - 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 d232521d00 - 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
inshy 5166946b74 -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 0a62ebd22b ************************************************************ 
* 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