1dot13/source
1
0
Fork 0
mirror of https://github.com/1dot13/source.git synced 2026-08-26 14:30:26 +02:00
Code Issues Packages Projects Releases Wiki Activity
7,603 Commits 9 Branches 6 Tags
858c149584bb07216cb488cd33b304ec5656b307
Commit Graph
7603 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Flugente 62786c483e Fix: previous fix did not fix enough 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6003 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2013-04-14 22:02:59 +00:00
Flugente 3856bb30ba Fix: VS2010 could not compile 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6002 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2013-04-14 21:34:27 +00:00
Wanne 92726dd3e7 - Added the new project "ModularizedTacticalAI" to the VS 2005 solution 
- Renamed the VS 2008 project file "ModularizedTacticalAI" to "ModularizedTacticalAI_VS2008"
- Added new project to vsprops file and changed output folder to keep it the same like the other project folders
- INFO: VS 2010 project files will be updated later by Flugente/DepressivesBrot 

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6001 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2013-04-14 21:03:23 +00:00
feynman 8f3bff764b Forgot to commit the source changes in the last commit. Sorry. So, here they are. 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5999 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2013-04-14 15:54:56 +00:00
feynman 44f5941f3d Added ini files for new modularized tactical AI 
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1648 4f8fa57e-7814-0410-bad4-adc449f26b7c
 2013-04-14 15:43:16 +00:00
Flugente 25de719d79 Fix: under certain circumstances, militia gear was not dropped correctly (a result of fixing the 'drop gear twice' bug) 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5997 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2013-04-14 13:32:10 +00:00
Flugente e8d9acba8c - added team-specific modifiers for AI suppression 
- Fix: incorrect platoon spawning wehn initializing Cambria counter attack

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5996 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2013-04-11 21:33:28 +00:00
Flugente 16c6969518 added team-specific modifiers for AI suppression 
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1647 4f8fa57e-7814-0410-bad4-adc449f26b7c
 2013-04-11 21:32:00 +00:00
Wanne cb9fc37cbc - Updated MercProfiles.xml and MercStartingGear.xml (by Thor) 
o Ira: Added compact binoculars to the gear
o Hurl: new paramedics skill
o A few other adjustments
o Cleaned MercStartingGear.xml file (removed tags with default values) which shrinks the xml file

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1646 4f8fa57e-7814-0410-bad4-adc449f26b7c
 2013-04-11 20:07:27 +00:00
Wanne 9587e4fcf0 - Fixed and reworked LUA scripts (by Jazz) 
o Updated LUA documentation (moved to new server): http://legion.itzg.pl/mzgb/pmwiki/pmwiki.php?n=JaggedAlliance2UBV1.Jav113lua 

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1645 4f8fa57e-7814-0410-bad4-adc449f26b7c
 2013-04-11 19:18:19 +00:00
Wanne 738d31e29b - Reworked the initialization of LUA functions, fixed and added new ones (by Jazz) 
o You also need to update the GameDir, cause some LUA scripts have been changed and fixed

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5995 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2013-04-11 19:16:34 +00:00
Flugente 6058a3d3d8 - Fix: calculation of squadleader suppression boni was wrong 
- Fix: possible underflow averted

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5993 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2013-04-10 23:42:26 +00:00
Flugente 5e5103635a Fix: no bullet when not targetting a soldier 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5992 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2013-04-10 22:52:35 +00:00
Wanne 90005cd800 - Added random stats for Hurl and Doc (by Thor) 
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1643 4f8fa57e-7814-0410-bad4-adc449f26b7c
 2013-04-10 12:56:51 +00:00
Flugente 7b0b11675d new drug: M99 (#1634) uses the Etorphine drug effect (#22). Stuns a target, but can also kill it if overdosed. 
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1642 4f8fa57e-7814-0410-bad4-adc449f26b7c
 2013-04-09 21:11:39 +00:00
Flugente 3d0be8101c - new drug: etorphine (DRUG_TYPE_STUNANDKILL) stuns the user for its duration. Warning: Lethal if overdosed (lethal dose depends on boytype) 
- show 'drugged' symbol for every drug (apart from alcohol)

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5991 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2013-04-09 21:03:42 +00:00
Flugente cc8fe02d98 Fix: when using scope modes and underbarrel weapons, NCTH functions searched underbarrel gun instead of main gun for attachments, resulting in no boni 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5990 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2013-04-08 22:29:26 +00:00
Flugente a466e7348a - cleaned up drug code 
- moved trait cth modifiers into a SOLDIERTYPE member function

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5989 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2013-04-08 21:13:54 +00:00
Wanne 717d36333e - Added another missing files for the new DG mercs 
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1641 4f8fa57e-7814-0410-bad4-adc449f26b7c
 2013-04-08 07:51:51 +00:00
Flugente d0b9c0a032 Fix: underbarrel weapons did not properly cause explosions according to their ammotype 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5988 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2013-04-07 22:54:43 +00:00
Flugente a66a3ef61b - militia equipment choosing: object status is taken into consideration for NVGs and sungoggles 
- militia equipemnt choosing: do not give a 'bonus' for excess ammo we wouldn't take anyway

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5987 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2013-04-07 00:49:08 +00:00
Flugente e043ce0e70 Fix: name display repeated name if two names were used in one sentence 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5985 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2013-04-04 23:24:09 +00:00
Wanne d47477004d - Updated missing xml files for new Mercs: Hurl and Doc (German Version) 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameData@5984 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2013-04-04 22:32:19 +00:00
Wanne 7505505102 - Added missing Reuban to OldAIMArchive.xml 
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1639 4f8fa57e-7814-0410-bad4-adc449f26b7c
 2013-04-04 22:22:41 +00:00
Wanne 0ae20c8271 New Mercs: Hurl (MERC) & Doc (AIM) (by anv) 
- added Doc's voicepack (provided by steggieav), with slight edits
- added Hurl's and Turtle's voicepacks
- added hate talk for Fidel and Biff
- removed neon glow from Turtle face

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1638 4f8fa57e-7814-0410-bad4-adc449f26b7c
 2013-04-04 22:17:07 +00:00
Wanne 3d67cbc61c - Changed INI-Property "RANDOM_STATS" from int (0 - 3) to boolean value 
FALSE = Do not use random stats (JA2 vanilla setting)
  TRUE = Use random stats for any mercs, that have random stats defined (Enabled = 1) in "TableData\RandomStats.xml"

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1637 4f8fa57e-7814-0410-bad4-adc449f26b7c
 2013-04-04 21:50:47 +00:00
Wanne 6bd8399bb9 - Changed INI-Property "RANDOM_STATS" from int (0 - 3) to boolean value 
FALSE = Do not use random stats (JA2 vanilla setting)
  TRUE = Use random stats for any mercs, that have random stats defined (Enabled = 1) in "TableData\RandomStats.xml"

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5982 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2013-04-04 21:49:33 +00:00
Wanne 2fc4ccf167 - Bugfix: Random stats for mercs were still applied even if they shouldn't 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5981 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2013-04-04 21:25:50 +00:00
Flugente 6bf3775c3b cleaned up trait name displays 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5980 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2013-04-04 21:10:28 +00:00
Flugente a7a4ce09ef Fix: applying canteens on other persons did not work when food system was on 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5979 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2013-04-03 19:42:00 +00:00
Flugente d2ebeb8f03 Fix: allow merc to jump over prone soldiers (by merc05) (animation is runnin instead of jumping for unknown reasons) 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5977 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2013-04-02 23:00:49 +00:00
Flugente 2f1c433c22 wrapped the SOLDIERTYPE member variable name in GetName(). This will allow easier manipulation with pre/suffixes, ranks, titles etc. 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5976 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2013-04-02 22:00:02 +00:00
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