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
Wanne cd300e83c0 - Fixed CTDs in Bobby Ray location drop down and florists drop down list because of double initialization of the locations and buffer overruns 
o I simply reverted the MainMenuScreen.cpp back to revision 5882 (which fixes the double initialization of the external data -> this results in the bug described above)

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5975 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2013-04-02 08:52:18 +00:00
Flugente 8137c04207 - wrapped fortify ap costs 
- Fix: drug effects weren't adjusted in turnbased

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5970 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2013-04-01 17:45:47 +00:00
inshy 5a3c529c78 Added new MERCs 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameData@5966 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2013-03-30 13:58:47 +00:00
Wanne 1aea5efd1b Editor Fixes (by Buggler) 
- Fixed unable to delete items in Merc Inventory Display screen
- Added keyboard hotkey item scrolling in Merc Inventory Selection screen

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5965 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2013-03-30 12:53:22 +00:00
Flugente 1435e4a679 - Fix: applying canteens/camo/clothes on persons still cost them APs 
- Fix: planting bombs was impossible

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5964 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2013-03-29 22:32:13 +00:00
Wanne ce2758be6d - Added INI option to enable/disable random merc stats (MERCS_RANDOM_STATS) 
0 = Do not use random stats (JA2 vanilla setting)
1 = Use random stats for ALL merc from the file "TableData\RandomStats.xml"
2 = Use random stats for SELECTED merc, that have random stats defined in "TableData\RandomStats.xml"

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1633 4f8fa57e-7814-0410-bad4-adc449f26b7c
 2013-03-27 23:20:51 +00:00
Wanne 43b94abe4d - Updated "Data-1.13/TableData/RandomStats.xml" (by Thor) 
o Added random stats for the new DG mercs

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1632 4f8fa57e-7814-0410-bad4-adc449f26b7c
 2013-03-27 23:18:26 +00:00
Wanne 9cc873368d - New Feature: Added INI option to enable/disable the use of random mercs stats ("RandomStats.xml") 
o INI option: MERCS_RANDOM_STATS (3 values)

0 = Do not use random stats (JA2 vanilla setting)
1 = Use random stats for ALL merc from the file "TableData\RandomStats.xml"
2 = Use random stats for SELECTED merc, that have random stats defined in "TableData\RandomStats.xml"

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5963 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2013-03-27 23:17:15 +00:00
Flugente 21a0108743 better cursor (by Thor) 
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1631 4f8fa57e-7814-0410-bad4-adc449f26b7c
 2013-03-27 22:15:31 +00:00
Wanne 36df0731cb Fixes (by anv & Thor) 
o Stella: Fixed salary
o Moses: Replaced "devolve" with "none"

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1630 4f8fa57e-7814-0410-bad4-adc449f26b7c
 2013-03-27 22:08:33 +00:00
Flugente 49932ef904 - new feature: items can be applied to other persons 
- reduced cyanide drug effect to more reasonable values

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5962 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2013-03-27 22:06:26 +00:00
Flugente c2c1a667f0 added apbp constants and icons (by Thor) for the 'apply items to persons'-feature 
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1629 4f8fa57e-7814-0410-bad4-adc449f26b7c
 2013-03-27 22:03:05 +00:00
Wanne a0486b6b3f - Allows militia training for town sectors even when <townUsesLoyalty> tag set to FALSE (by Buggler) 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5959 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2013-03-25 19:23:00 +00:00
Wanne 604ad13963 Editor: Bugfix (by Buggler) 
- Fixed wrong code placement in editor for r5953 submission resulting in unable to build ja2.exe


git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5958 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2013-03-25 12:16:59 +00:00
Wanne c4e7ac4d42 - Added Dyno and Turtle to M.E.R.C for German Version 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameData@5954 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2013-03-24 20:21:02 +00:00
Wanne c52a56e1e8 - Added a few comments to the Email/EmailMercLevelUp.xml file 
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1628 4f8fa57e-7814-0410-bad4-adc449f26b7c
 2013-03-24 20:19:08 +00:00
Wanne 7d40215eb3 - Added Dyno and Turtle to M.E.R.C (by anv) 
- Reworked camo faces and created non camo face for Shadow and Monk (by anv)
- Reworked Smoke animated portrait (by anv)
- Added small 65 and 33 portraits for IMP 218 (previously she used the same as IMP 219) (by anv)
- see: http://www.bears-pit.com/board/ubbthreads.php/topics/298288/28/Jagged_Alliance_Deadly_Games_M.html


git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1627 4f8fa57e-7814-0410-bad4-adc449f26b7c
 2013-03-24 19:50:15 +00:00
Flugente ac2ad02b1c added stun gun to enemy item choices 
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1626 4f8fa57e-7814-0410-bad4-adc449f26b7c
 2013-03-24 19:33:26 +00:00
Wanne 95e93c225d Editor Feature (by Buggler) 
- Hotkey 'Ctrl+/' & '/' to place item under mouse cursor when in item mode

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5953 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2013-03-24 19:27:43 +00:00
Flugente 664eb06bef - bodies are now twohanded 
- removed admin shirts from npc inventory

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1625 4f8fa57e-7814-0410-bad4-adc449f26b7c
 2013-03-24 18:58:29 +00:00
Flugente 90be8171ec upon decapitating or gutting, a knife may take damage 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5952 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2013-03-24 18:56:09 +00:00
Flugente 401323b524 - Fix: the food system doesn't aply to EPCs anymore, thus wont die from lack of food/water 
- Fix: MERCS_CAN_DO_ADVANCED_REPAIRS did not work as intended

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5950 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2013-03-24 00:52:19 +00:00
Wanne 728d2f7cfe Editor Fixes (by Buggler) 
- Fixed item deletion from item pool when no item selected
- Added Shift, Ctrl, Ctrl+Shift hotkeys to item scrolling click 
- Fixed Rdn button not depressed upon clicking other item buttons
- Fixed B, R, S text not shown for random items

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5949 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2013-03-22 14:39:37 +00:00
Flugente 9592be9122 - Fix: random items > 200 were not read 
- Fix: preplaced random items turned guns did not have ammo (WIP)

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5946 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2013-03-21 23:13:39 +00:00
Flugente ba5a5206a2 feature improvement: stealing items from a soldier while disguised has a chance to be discovered even in turnbased. 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5943 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2013-03-20 23:52:42 +00:00
Flugente 34bc4ea503 Fix: adrenalin drug effect was capped at max APs 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5942 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2013-03-20 21:20:06 +00:00
inshy e51649f778 Up for Russian 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameData@5941 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2013-03-20 14:36:58 +00:00
Wanne 028a325eda - Added starting gear for the 4 new DG merc (Stella, Smoke, Ears and Moses) (by anv) 
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1624 4f8fa57e-7814-0410-bad4-adc449f26b7c
 2013-03-19 12:06:23 +00:00
inshy 5d95d4af81 -Updated French data (by hrvvillers) 
-Translated new Russian civ52 

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameData@5938 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2013-03-18 17:15:16 +00:00
Wanne 94e6a5aa35 - Updated XML files for the new DG-Mercs for the German Version 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameData@5937 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2013-03-18 12:52:31 +00:00
Wanne 73ba67f6ea - Added 4 new DG-Merc: Stella, Ears, Smoke and Moses (by anv) 
o AIM: Stella, Moses, Smoke
o MERC: Ears
- Moved Rev and Elroy to MERC

Missing stuff:
o Currently the 4 new merc do not have StartingGear. Will be done soon.
o There are no entries set in MercOpinions.xml
o Some texts are missing for the merc in EmailMercAvailable.xml
o Speech is missing

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1623 4f8fa57e-7814-0410-bad4-adc449f26b7c
 2013-03-18 10:10:53 +00:00
inshy 5d61f473f8 -Some French translation by hrvvillers; 
-Some fixes for Russian translation;
-Repair broken Polish letters after converting to UTF-8. Man, you make me cry. If you don't know how - just ask someone or don't do it.

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5935 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2013-03-18 08:29:13 +00:00
Flugente 5ca112947d - Fix: metal detectors did not detect bombs planted by high-level eplosion experts 
- Fix: non-buried explosves retained some bomb parameters after defusing

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5929 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2013-03-17 21:41:06 +00:00
Flugente 25471acf1f CalculateForceFromRange() takes an item number instead of an object 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5928 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2013-03-17 19:53:59 +00:00
Flugente 9512f4d7ed PRISONER_INFO_DETECT_CHANCE is obsolete 
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1621 4f8fa57e-7814-0410-bad4-adc449f26b7c
 2013-03-17 00:34:15 +00:00
Flugente e5f8799d07 reworked prisoner info chance, PRISONER_INFO_DETECT_CHANCE is obsolete 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5927 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2013-03-17 00:33:40 +00:00
Flugente 923664ca40 - Fix: When retreating from tactical combat, militia gear was not dropped correctly 
- Fix: Under certain circumstances, militia dropped gear twice in autoresolve

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5926 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2013-03-16 23:49:28 +00:00
Flugente 89666fa78c Fix: applying a rag removed camo, but did not refresh face 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5925 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2013-03-16 21:47:26 +00:00
Wanne 05600adf33 Fixes / Improvements (by Buggler) 
- Display Item Index No in Map Editor
- Hotkey for squad 11-20 in tactical set the same as strategic screen
- Hotkey previous/next page in save screen changed to PgUp/PgDn

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5924 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2013-03-16 14:26:51 +00:00
Wanne 265f5dabf7 - Fixed wrong folder location for *.Pockets.xml (moved from "Inventory" to "Items") 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameData@5923 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2013-03-16 14:19:42 +00:00
Flugente db6b0cb917 spies can now test their disguise by using option #6 in the tactical function selection menu - they will evaluate their disguise (see the resulting messages for hints on how to improve disguise) 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5922 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2013-03-16 02:28:04 +00:00
Flugente 0152976365 - began cleaning of buggy LuaInitNPCCode (WIP) 
- Fix: enemy NPCs (Mike) cannot surrender
- Fix: in combat, ordering cleaning of guns only applies to the currently selected merc

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5921 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2013-03-16 00:24:30 +00:00
Wanne f74e9b54f7 - Added the 4 new DG merc to the German.MercProfiles.xml 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameData@5920 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2013-03-12 21:53:07 +00:00
inshy 63c106901b Added new AIM members to all languages 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameData@5919 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2013-03-12 17:30:52 +00:00
Wanne bc5344b10a - Added missing MW_SR_HIP_AIM.STI (renamed the original animation file) (thx to Buggler) 
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1620 4f8fa57e-7814-0410-bad4-adc449f26b7c
 2013-03-10 16:54:50 +00:00
Flugente f5f114e52e - if MERCS_CAN_DO_ADVANCED_REPAIRS is TRUE, mercs with the technician trait can raise an item's damage threshold(by merc05) 
- Fix: blade weapons ignored their damage chance

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5917 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2013-03-10 16:07:08 +00:00
Flugente 6483ab9048 added MERCS_CAN_DO_ADVANCED_REPAIRS, DIRT_GLOBAL_MODIFIER and OVERHEATING_TEMPERATURE_GLOBAL_MODIFIER (UB) ini options 
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1619 4f8fa57e-7814-0410-bad4-adc449f26b7c
 2013-03-10 16:04:50 +00:00
Flugente 29867c0302 Fix: check wether a building is in a town 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5916 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2013-03-10 15:33:47 +00:00
Flugente 94a55654d1 Fix: militia reinforcements tried to take equipemnt from the wrong sector 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5915 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2013-03-10 15:23:36 +00:00
Flugente 6c0d94dadd - DIRT_GLOBAL_MODIFIER is a global modifier to dirt generation 
- second cleaning button in menu now orders entire team to clean their guns
- global overheating modifier now also multiplies attachment modifiers
- cleaning kits always use up 1% on use


git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5913 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2013-03-10 01:15:19 +00:00