1dot13/source
1
0
Fork 0
mirror of https://github.com/1dot13/source.git synced 2026-08-05 14:00:23 +02:00
Code Issues Packages Projects Releases Wiki Activity
7,621 Commits 9 Branches 6 Tags
latest
Commit Graph
7621 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Flugente 16d0d1ea8a - Fix: crash when checking for muzzleflash 
- Fix: under certain conditions, AI-selffeeding could lead to invalid inventory sizes
- information from prisoner interrogation is about new sectors
- no autoriot in a prison sector if militia is present


git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5912 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2013-03-09 21:24:08 +00:00
Wanne 44000a98b9 - Added 4 new JA/DG Merc to A.I.M (by anv) 
o Hector, Elroy, Mouse and Rev
- Updated Portraits: Vinny, Bud, Screw (by anv)

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1618 4f8fa57e-7814-0410-bad4-adc449f26b7c
 2013-03-09 17:04:58 +00:00
Flugente 787c085b47 Fix: check for a room before punishing a team for damaging a room 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5909 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2013-03-09 00:18:17 +00:00
Flugente 14113159bd Fix: NO_STANDING_ANIM_ADJUSTMENT_IN_COMBAT worked on all animations, which caused explosion victims to not update anims correctly. As a fix, we check for individual animations 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5908 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2013-03-08 20:09:36 +00:00
inshy 1f96f1a644 Updated French data (by hrvvillers) 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameData@5907 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2013-03-08 16:23:08 +00:00
Flugente fe8d572068 Fix: ubGunAmmoItem was not set, which could lead to magazines disappearing during reloading 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5906 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2013-03-07 20:43:58 +00:00
inshy 35e5d12433 Translated files to French language (by hrvvillers) 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameData@5905 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2013-03-07 13:41:42 +00:00
Flugente bb47fae308 fixed typo 
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1617 4f8fa57e-7814-0410-bad4-adc449f26b7c
 2013-03-07 02:32:24 +00:00
Flugente 86d6d60959 dirt system: added an option that controls wether a gun also gets cleaned on fully repairing it 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5904 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2013-03-07 02:21:46 +00:00
Flugente e5b7d871b0 dirt system: added an option that controls wether a gun also gets cleaned on fully repairing it 
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1616 4f8fa57e-7814-0410-bad4-adc449f26b7c
 2013-03-07 02:21:03 +00:00
inshy c14ecd02e1 Translated files to French language (by hrvvillers) 
But beware (W

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameData@5901 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2013-03-06 12:57:59 +00:00
Flugente 30a7e22a3d new key combinations: 
- SHIFT + K: switch to and from riflesling
- SHIFT + K + ALT: switch to knife, or from knife to gun
- SHIFT + K + CTRL: switch to sidearm, or from sidearm to non-sidearm gun
the switches will search for a valid spot for the replaced hand items, thus a LAW won't go into a holster etc.

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5900 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2013-03-06 00:36:57 +00:00
Flugente 41851c0bf5 added ini option to turn off eating sounds 
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1615 4f8fa57e-7814-0410-bad4-adc449f26b7c
 2013-03-05 21:29:07 +00:00
Flugente ce0a49e4b4 - added ini option to turn off eating sounds 
- morale now influences surrender strength
- placing prisoners now accounts for missing xml values
- damaging a building with eplosives alters loyalty depending on attacker's team

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5899 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2013-03-05 21:26:58 +00:00
inshy 88cb595c23 Small fixes in translation 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5898 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2013-03-05 13:28:35 +00:00
Wanne 581e56dde6 - Added civ52.edt file for the prisoners quotes 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameData@5897 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2013-03-05 09:10:04 +00:00
Wanne 05bb53d1c7 - Fixed "corrupt" civ52.edt file (prisoners quotes). The file had wrong file size and empty lines 
@all: Please use the EdtMegaEditor when editing EDT files, cause other EDT-Editors can damage the file

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1614 4f8fa57e-7814-0410-bad4-adc449f26b7c
 2013-03-05 09:04:31 +00:00
Flugente d5f47fb8a3 Fix: removed test hack 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5896 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2013-03-05 01:21:23 +00:00
Flugente 402470851e - Prisoners of war are now spawned in prison sectors. They have fitting dialogue etc. Harming them slightly lowers global loyalty. The roomnumbers are set in SectorNames.xml. 
- Prisoner system: added ini options that allow display of surrender strength sum, and externalised surrender strength modifier. Proabilities for prisoner events were increased to more reasonable values.

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1613 4f8fa57e-7814-0410-bad4-adc449f26b7c
 2013-03-05 01:17:21 +00:00
Flugente 36f7399d3b - Prisoners of war are now spawned in prison sectors. They have fitting dialogue etc. Harming them slightly lowers global loyalty. 
- Prisoner system: added ini options that allow display of surrender strength sum, and externalised surrender strength modifier
- Fix: wrong assignment string in strategic view

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5895 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2013-03-05 01:02:59 +00:00
Wanne 42a39082ab - Updated JA2 - DG Faces & added Camo Faces (by anv) 
o Updated: Bud, Gary, Needle, Postie, Sparky
o New: Elroy, Mouse -> Added to the TODOs trunk (until we have valid entries in the XML files)
-> http://www.bears-pit.com/board/ubbthreads.php/topics/298288/25/Jagged_Alliance_Deadly_Games_M.html

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1612 4f8fa57e-7814-0410-bad4-adc449f26b7c
 2013-03-04 09:24:28 +00:00
Wanne ca20403bc4 Fixes (by Buggler) 
- Map Editor: Added fasthelp text for map editor hotkeys
- Map Editor: Disabled key repeat in map editor due to double character entry in input box
- Fixed other minor hotkey/fasttext related issues

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5893 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2013-03-04 09:12:28 +00:00
Flugente 50c4982f91 - prisoners give information only on mobile patrols, not on city sectors 
- if using militia equipment, items stolen by militia are dropped after combat if their class is distributed to militia by the player
- Fix: do not delete world items with invalid gridno
- Fix: militia drop gear on valid GridNo

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5892 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2013-03-03 23:26:03 +00:00
Flugente 48c66c8662 - added AP & BP cost setting for arming bombs/grenades in inventory 
- Fix: blowing up grenades in inventory now correctly costs APs
- a message now shows how many prisoners were taken

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5891 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2013-03-03 16:24:34 +00:00
Flugente 210e703625 added AP & BP cost setting for arming bombs/grenades in inventory 
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1611 4f8fa57e-7814-0410-bad4-adc449f26b7c
 2013-03-03 16:19:21 +00:00
Flugente fc2e10314b - Fix: crash when trying to delete an item with invalid GridNo 
- Fix: adjusted squadname when discovering NPCs

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5890 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2013-03-03 08:57:26 +00:00
Flugente b41653aeea Fix: capturing soldiers who were members of reinforcement groups led to incorrect group size 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5889 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2013-03-03 00:15:08 +00:00
Flugente 72dbd9e33f - fixed an instance of wrong assignment strings 
- prisoner decision messagebox now allows to select a specific prison
- Fix: under certain conditions, calling militia reinforcements with militia equipment selection could get sector items with invalid GridNo to become lost

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5888 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2013-03-02 19:14:46 +00:00
Wanne a798d66ae4 - Fixed and reworked initialization (SP vs MP) of external data after clicking new game / options 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5887 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2013-03-01 23:45:15 +00:00
Flugente 1c84a131c1 Fix: AI deadlocks in black state were caused by the AI falsely deciding to climb rooftops 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5886 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2013-03-01 20:20:48 +00:00
Flugente c3462f9163 code improvement: no need to evaluate guns in 1st loop, do total evaluation with ammo in 2nd loop 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5885 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2013-03-01 20:19:55 +00:00
Wanne 1ccb4209cd - Improved dirty assertion fix in Main Menu from Revision 5882 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5884 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2013-03-01 14:34:34 +00:00
Wanne 49cf4a73dc - Fixed item picture not displayed in map editor selection area for those items beyond the old limit range (by Buggler) 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5883 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2013-02-28 23:13:52 +00:00
Wanne 2de29e73fa - Fixed assertion when clicking on "Multiplayer Game" in Main Menu Screen 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5882 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2013-02-28 09:56:57 +00:00
Wanne a018e77323 - Bugfix: After starting a new game with high screen resolution (> 1024x768) and reaching the tactical screen the first time, the loadscreen image was still visible in the lower left part of the tactical interface panel 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5881 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2013-02-28 09:12:12 +00:00
Flugente 8e909f12fc improvement of militia equipment choosing: 
- grenade launchers aren't overlooked anymore if sector sorting is bad
- ammo does not need to be converted to crates anymore
- less ammo deletion and recreation necessary
- added code documentation

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5880 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2013-02-28 02:08:55 +00:00
Flugente b4f60527cd added squadnames to a few locations 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5879 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2013-02-27 23:13:27 +00:00
Flugente 92cd435806 Fix: militia equipment was not dropped and saved if trashing world 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5878 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2013-02-27 20:54:40 +00:00
Wanne 834aa1eb13 - Recommit Kaiden's class item cap fix r1790 (lost during meager of Big Maps Project code) & other related variables from INT16 to INT32; increased the class item limit in mapeditor (by Buggler) 
- Map Editor: Items - Hotkeys (by Buggler)
o Hotkeys ',': Left Scroll
o Hotkeys '.': Right Scroll
o ('Shift': Jump 1 page; 'Ctrl': Jump 10 pages; 'Ctrl + Shift': Jump to first/last page)
- Changed saveloadscreen previous/next hotkey to ','/'.' due to interference with input_box navigation using arrow keys (by Buggler)

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5877 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2013-02-27 19:06:52 +00:00
Flugente dfc17ea9c6 Fix: assignment names were incorrect 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5876 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2013-02-27 01:04:21 +00:00
Flugente 34c87f0507 very minor code optimization 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5875 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2013-02-26 22:31:39 +00:00
Wanne 51bc188f0b git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5874 3b4a5df2-a311-0410-b5c6-a8a6f20db521 2013-02-26 14:12:27 +00:00
Wanne ba8196ee91 - Moved the following XML files in the correct "Data\TableData" location (thx to Buggler) 
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1610 4f8fa57e-7814-0410-bad4-adc449f26b7c
 2013-02-26 14:11:12 +00:00
Wanne b107a916e1 - Disabled Tab hotkey for description tab switching in strategic screen so as not to interfere with militia equipment assignment (use Ctrl+Tab like in tactical screen) (by Buggler) 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5873 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2013-02-26 14:00:48 +00:00
Flugente 2cfe4bd7fc - externalised squad names 
- moved Pockets.xml an PocketPopups.xml
- requires GameDir >= r1608

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5872 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2013-02-25 22:25:45 +00:00
Flugente 6ce154def2 - externalised squad names 
- moved Pockets.xml an PocketPopups.xml

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1608 4f8fa57e-7814-0410-bad4-adc449f26b7c
 2013-02-25 22:18:32 +00:00
Flugente 0a7330d5a4 updated minor map version, necessary due to object changes 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5871 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2013-02-25 21:12:39 +00:00
Flugente ef5fa36536 Fix: decapitating/gutting/stripping/taking a corpse did not cost any APs 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5870 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2013-02-24 15:56:50 +00:00
Flugente 4d846f81f1 militia equipment feature is off by default 
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1607 4f8fa57e-7814-0410-bad4-adc449f26b7c
 2013-02-24 14:25:01 +00:00
Flugente 59b2549bd6 - new feature: we can now equip militia with gear from sectors, see http://www.bears-pit.com/board/ubbthreads.php/topics/315664.html#Post315664 for more information 
- increased the object flag size to UINT64, this breaks savegame compatibility

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5869 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2013-02-23 18:32:55 +00:00