1dot13/source
1
0
Fork 0
mirror of https://github.com/1dot13/source.git synced 2026-09-02 14:36:06 +02:00
Code Issues Packages Projects Releases Wiki Activity
7,607 Commits 9 Branches 6 Tags
dc351889db7ba01cccae559847e25776fe450afe
Commit Graph
7607 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
inshy 37005d7d1c Translated Manuels texts and voice 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameData@5829 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2013-01-31 21:12:40 +00:00
inshy 841b0a2411 Fixed mistakes in Russina text 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5828 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2013-01-31 21:09:32 +00:00
Wanne 169273be93 Laptop & Mail Fixes (by Buggler) 
- left click to close, right click for delete prompt when viewing email messages
- alternative hotkey 'Enter' to close new email message notification
- fixed bugged mouse region render behavior on returning to view another mail message after right click in other laptop modes

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5827 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2013-01-31 20:22:54 +00:00
inshy 1b645a4710 Added NPC speech of Manuel for Russian version 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameData@5826 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2013-01-29 22:15:41 +00:00
inshy fa09614080 Update Russian text 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5825 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2013-01-29 13:49:44 +00:00
inshy 90111ad727 -Add missing items to all languages 
-Transtated French items by hrvvillers

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameData@5824 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2013-01-28 21:29:10 +00:00
Wanne a2d68d7212 - Translated Russian texts (by Inshy) 
- Fixed missing texts in French and Polish text files

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5823 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2013-01-28 14:38:26 +00:00
Wanne 95588dcf81 New Feature: Added shift hotkey to move all when assigning militia (by vertax) 
- Completely removes / puts the militia when you click while holding the SHIFT

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5822 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2013-01-28 14:26:28 +00:00
Wanne 6304283891 Fixes (by Buggler) 
- Fixed shopkeeper & repair interface IMP portrait bug due to wrong image size in 33Face & 65Face for IMP

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1600 4f8fa57e-7814-0410-bad4-adc449f26b7c
 2013-01-28 14:15:48 +00:00
Wanne 9ed906a553 Fixed (by Buggler) 
- Fixed wrong image size in Personnel/Departure screen by correcting sti directory pointer 
- Fixed shopkeeper & repair interface IMP portrait bug due to wrong image size in 33Face & 65Face for IMP


git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5821 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2013-01-28 14:15:20 +00:00
Wanne 9bed6087b3 - Bugfix: Hopefully fixed problem with RPC/NPC speech in russian version (thx to Inshy) 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5820 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2013-01-28 14:04:44 +00:00
Wanne a9532dc4db - Updated project files in VS 2008/VS 2010 (now it compiles again) 
- Fixed missing libraries in VS 2008 to compile "MapEditorD" without compilation errors

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5819 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2013-01-27 23:21:54 +00:00
Wanne 1a1d75850c - Translated missing German texts 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5818 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2013-01-27 20:34:27 +00:00
inshy 01efb8c297 Update Russian XMLs 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameData@5817 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2013-01-27 00:12:59 +00:00
Wanne d6f4a7e1e4 - Moved SoundsProfiles.xml to the correct folder 
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1599 4f8fa57e-7814-0410-bad4-adc449f26b7c
 2013-01-26 19:56:50 +00:00
Wanne 4825a5a212 - Added *.Vehicles.xml files 
- Translated Russian.Vehicles.xml (by Inshy)

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameData@5816 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2013-01-26 19:07:20 +00:00
Wanne 3c9b43ebef - Bugfix: WF and DG merc speech was not working 
o The file "SoundProfiles.xml" was referenced in the wrong directory
- XML file reference cleanup and check
- Deleted unused files

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5814 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2013-01-26 18:33:26 +00:00
Wanne c0c291e5dc - Fixed (cleaned up) problematic initialization of AmmoStrings.xml and *.AmmoStrings.xml 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5810 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2013-01-24 09:49:18 +00:00
Wanne 4fdf0570d4 Fixed M.E.R.C hiring (by Buggler) 
- Fixed CTD on MERC hiring by calling ETA msg box later in MERC main page due to optional gear msg box

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5808 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2013-01-23 13:09:00 +00:00
Wanne f6c72c6479 - Translated missing Chinese texts (by zwwooooo) 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5807 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2013-01-23 12:59:29 +00:00
Wanne c71991da8c - Fixed problem loading ammostrings for non-english version (by zwwooooo) 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5806 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2013-01-23 12:32:37 +00:00
Wanne 0503550f75 - deleted // TODO.Translate comment for English text file 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5803 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2013-01-22 13:21:51 +00:00
Wanne 127b9695e4 Optional Skill Tooltip On Merc Portrait (by Buggler) 
- Option to show skill/traits tooltip on merc portrait in AIM/MERC hire screen

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1598 4f8fa57e-7814-0410-bad4-adc449f26b7c
 2013-01-22 13:21:13 +00:00
Wanne 6c91b61e6f Skill Tooltip on Merc Portrait (by Buggler) 
- Skills/Traits tooltip over merc portrait in Tactical & Strategic screen
- Fixed Traits tooltip on 'more' popup in personnel screen 
- Increased Energy Bar Color Contrast
- Swapped Mechanical & Explosive Skill in Tactical & Strategic screen to standardize across all screens including AIM, MERC & Personnel screen

Optional Skill Tooltip On Merc Portrait (by Buggler)
- Option to show skill/traits tooltip on merc portrait in AIM/MERC hire screen
- Enhanced merc inventory tooltip to show full BR info in AIM/MERC hire screen
- Fixed BR heavy weapon AP tooltip display bug
- Fixed MERC Exp Lv statistic color

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5802 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2013-01-22 13:21:01 +00:00
Flugente fb3d410dd9 - a few dialogue box button texts can now be easily changed 
- Fix: improved bomb defusal

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5795 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2013-01-20 05:12:19 +00:00
Flugente 8c60796982 code improvement: added a much easier way to add items in cheat mode. 'ALT' + '.' allows the user to input the item number he wants and spawns the item on the selected merc. 'CTRL' + 'ALT' + '.' spawns the previously selected item. (by IoP) 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5794 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2013-01-20 05:03:39 +00:00
Flugente 024a1a99c9 When talking to an enemy, we can surrender to him if he hasn't asked us to before. 
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1597 4f8fa57e-7814-0410-bad4-adc449f26b7c
 2013-01-19 20:23:26 +00:00
Flugente d55a57007d When talking to an enemy, we can surrender to him if he hasn't asked us to before. 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5793 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2013-01-19 20:22:51 +00:00
Wanne f8531461d3 Added ingame option to invert mouse wheel direction (by Iop) 
o Howto get synaptic touchpad working with 1.13: http://www.bears-pit.com/board/ubbthreads.php/topics/314276/Synaptic_touchpad_with_JA2_v1_.html#Post314276

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5792 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2013-01-19 20:08:11 +00:00
Wanne b2eb494e7b Enabled random merc stats for "Data-1.13" (by Thor) 
o See file "Data-1.13/TableData/RandomStats.xml
o To disable random merc stats for certain mercs, just set <Enabled>0</Enabled> in RandomStats.xml
o Additional Informations: http://www.bears-pit.com/board/ubbthreads.php/topics/314414/1.html



git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1596 4f8fa57e-7814-0410-bad4-adc449f26b7c
 2013-01-19 19:45:47 +00:00
Wanne 313eba28a4 - Fixed UB GameDir files. Now it should start again without errors 
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1595 4f8fa57e-7814-0410-bad4-adc449f26b7c
 2013-01-19 19:40:01 +00:00
Wanne 0789934d9a Fixes (by Buggler) 
- Fixed allow exception to Dr Q. skill trait code not fully functional
- Swapped Dr Q. skill trait xml order so that when exception disabled, he will still have his night ops minor skill due to code execution order
- Externalized allow_exception ID number for modding

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1594 4f8fa57e-7814-0410-bad4-adc449f26b7c
 2013-01-15 20:05:25 +00:00
Wanne 56e08dbeae Fixes (by Buggler) 
- Fixed allow exception to Dr Q. skill trait code not fully functional
- Swapped Dr Q. skill trait xml order so that when exception disabled, he will still have his night ops minor skill due to code execution order
- Externalized allow_exception ID number for modding

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5791 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2013-01-15 20:04:41 +00:00
Wanne 49b0eceb05 - Translated and reworked French texts (by Alex) 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameData@5790 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2013-01-15 09:38:02 +00:00
Wanne c49f59f66e - Fixed a few older texts with parameters (e.g: %s) 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5788 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2013-01-14 21:15:33 +00:00
Flugente 93e097b981 added missing xmls 
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1593 4f8fa57e-7814-0410-bad4-adc449f26b7c
 2013-01-14 20:18:04 +00:00
Wanne 7c6c919d6b - Translated and reworked French texts (by Alex) 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameData@5787 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2013-01-14 13:06:46 +00:00
Wanne ec01220108 - Translated and reworked French texts (by Alex) 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5786 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2013-01-14 13:05:24 +00:00
Wanne 29e432037b - Fixed Ambidextrous being discarded when affected merc has max allowed major traits + ambidextrous due to it being classified as 'TwoStagedTrait'/major trait (by Buggler) 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5785 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2013-01-14 12:28:20 +00:00
Wanne e386cb6484 - Fixed MERC <mAbsolutePrice> to -1 (by Buggler) 
(only 1.13 xml is bugged, vanilla classic is working as it is.)

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1592 4f8fa57e-7814-0410-bad4-adc449f26b7c
 2013-01-13 17:51:51 +00:00
Wanne a10e216c5f Fixes (by Buggler) 
- fixed autoplace object getting lost from merc inventory to sector when another sector shown (CTRL+LMB) 
- fixed LBE autoplace from merc inventory
- fixed CTRL/CTRL+SHIFT behavior when autoplace from merc inv
** Autoplace objects to & from between merc inv & map sector should work proper now (even in another sector inventory)
- fixed missing balance & amount during money withdrawal in vanilla classic

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5781 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2013-01-13 17:48:12 +00:00
Flugente d846f9c7ac added finetuned specific gun selections for enemy and militia (by ClarkeW) 
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1591 4f8fa57e-7814-0410-bad4-adc449f26b7c
 2013-01-13 16:23:12 +00:00
Flugente 499a207941 added merchant xml files in case someone plays withut the 1.13 folder 
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1590 4f8fa57e-7814-0410-bad4-adc449f26b7c
 2013-01-13 16:07:19 +00:00
Wanne f914a1da77 M.E.R.C Optional Gear (by Buggler) 
- Added MERC optional gear purchase
- Adopted Tais' gear cost format as previously gear cost uses MercProfiles.xml 'optional gear cost' value if hire without pressing any 'gear kit' button
- Added condition to settle bills first before hiring same merc from MERC
- Added MERC starting gear hotkey
- Fix for AIM starting gear hotkey when using old inventory
- Removed unused variable in fresh_header.h

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5780 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2013-01-11 20:24:36 +00:00
Wanne b08422ec1b BR Info Panel Enhancements (by Buggler) 
- Added more info on BR right panel (Melee Weapons AP, Damage & Stun Damage, Protection & Camo etc.)
- Fixed BR Item Info Helptext: AP for Heavy, Binoculars & Melee weapons
- Fixed CTD on using LEFT/Right arrow hotkey when there's only 1 page in AIM Facial Index
- Fix for AIM starting gear kit hotkeys
- Add Heavy Weapon ReadyAP value in InterfaceItem

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5779 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2013-01-07 21:35:26 +00:00
Flugente ab2b52b5d8 Fix: forgot to continously check for items 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5778 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2013-01-06 04:04:35 +00:00
Flugente 9ea7ebf393 New Feature: Multi-turn actions allow mercs to perform actions intended on a specific gridno over multiple turns. Currently demonstrated on the adding/removing/filling of sandbags. 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5777 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2013-01-06 03:51:09 +00:00
Flugente 4888e024aa - added ap and bp costs for adding/removing fortifications and filling sandbags 
- added face icon for multi-turn actions with regard to fortifications


git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1589 4f8fa57e-7814-0410-bad4-adc449f26b7c
 2013-01-06 03:40:35 +00:00
Flugente 153f55ace8 Fix: uninitialised variable could cause crash if subsequent checks failed 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5773 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2013-01-05 21:35:22 +00:00
Wanne d33471ad4a - Moved xml files to the correct TableData subfolders 
o *.Items.xml -> Items\Items.xml
o *.AmmoStrings.xml -> Items\*.AmmoStrings.xml
o *.Pockets.xml -> Inventory\*.Pockets.xml

- Deleted old unused xml files

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameData@5770 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2013-01-05 16:38:29 +00:00