1dot13/source
1
0
Fork 0
mirror of https://github.com/1dot13/source.git synced 2026-07-22 13:40:22 +02:00
Code Issues Packages Projects Releases Wiki Activity
1,626 Commits 9 Branches 6 Tags
4f60d29cbf18a371aa5d2cc138fbfb12546cbc26
Commit Graph
1626 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Wanne 4f60d29cbf - Minor fix for mouse locking feature in tactical screen (by Buggler) 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6011 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2013-04-16 22:12:36 +00:00
Wanne ba6d5fc04c - Added files to svn ignore list 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6007 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2013-04-15 20:20:58 +00:00
Wanne 532710b53b - Updated project files 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6006 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2013-04-14 22:58:58 +00:00
Flugente c932a69027 added VS2010 filters, because tais said so 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6005 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2013-04-14 22:25:55 +00:00
Flugente 329b1cd878 Fix: savegame compatibility 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6004 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2013-04-14 22:09:27 +00:00
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
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
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
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
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 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
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 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 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
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 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 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 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 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
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