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,540 Commits 9 Branches 6 Tags
0a7330d5a491d64c828908c3edd47ea1f05dfdeb
Commit Graph
1540 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
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 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
Wanne 01e2d1b29c SaveLoadScreen Useability Enhancement & Fix (by Buggler) 
- Changed font color for better readability
- Enlarged highlight box
- Added LEFTARROW & RIGHTARROW hotkey for previous & next page
- Fixed minor graphical bugs

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5868 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2013-02-23 09:46:41 +00:00
Wanne de71a58bc4 - Externalized Florist Delivery Locations by tagging to externalized BobbyR locations (by Buggler) 
- Flower shipment now costs half of BobbyR's shipping rate (by Buggler)

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5867 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2013-02-23 09:45:27 +00:00
Wanne 5d141e0746 - Fixed reduced max range for explosives that has <fExplodeOnImpact> set to 1 (by Buggler) 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5866 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2013-02-23 09:44:05 +00:00
Flugente f6274eade2 Fix: replaced (UINT32) atol(pData->szCharData) with (UINT32) strtoul(pData->szCharData, NULL, 0) as atol renders the last flag unusable through casts 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5854 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2013-02-07 22:25:53 +00:00
Flugente e2c1a333fa Fix: regeneration drug effect ended prematurely 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5853 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2013-02-07 20:57:29 +00:00
Wanne 303fb661e5 - Fixed AP cursor calculation for melee weapons as no AP add costs incurred for changing targets (by Buggler) 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5845 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2013-02-05 10:14:49 +00:00
Wanne 6e8136495a - Corrected majority of AP cursor calculation bugs for melee attacks involving stance & direction change (by Buggler) 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5837 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2013-02-04 10:14:23 +00:00
Wanne 324fa4c5ec Fixed Melee/Blunt weapon AP used (by Buggler) 
- Have always wondered, why do attacks with blunt weapons (baton, nightstick, etc) cost the same AP (16) as hand-to-hand attacks? Shouldn't they be using the AP cost like how blades do?


git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5834 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2013-02-03 19:48:22 +00:00
inshy f2704673a4 Fix for Cyrillic layouts. Again. (by ViSoR) 
STOP TO BROKE RUSSIAN GAME 




git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5833 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2013-02-03 11:22:20 +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 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
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 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
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 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 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 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 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
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 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
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 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 0b9ff22642 - Deleted unused "SenderNameList.xml" references 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5769 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2013-01-05 16:37:13 +00:00
Wanne c04898d095 Interface Items & Sector Inv Readability Enhancement (by Buggler) 
- Adjusted font colors in Sector Inventory & Interface Panel (increasing dull contrast colors that only shows when activated, highlights & high contrast colors that's always displayed are toned down)
- Changed 'Item Name' font in non-zoomed sector inventory
- Changed 'Ammo Count' font in item description box
- Increased 'Max Bullet' font size in zoomed sector Inventory

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5768 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2013-01-05 15:20:43 +00:00
Wanne bf65559bef - Removed HIGHSPEED_TIMER option from the ja2.ini. Highspeed timer is now always ON 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5766 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2013-01-05 15:06:21 +00:00
Flugente cd35516037 added missing icon for alternate weapon holding (by Sandro) 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5765 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2013-01-04 23:34:54 +00:00
Flugente 79d6bb46ed - external feeding checks for invalid gridno 
- reordered xmls
- new feature: class specific gun and item choices allows finetuning of a soldier's equipment

WARNING! This exe needs GameDir revision >= 1584, as xmls have been reordered!
More info under http://www.bears-pit.com/board/ubbthreads.php/topics/313782/Re_New_feature_Class_specific_.html#Post313782

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5764 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2013-01-04 23:25:35 +00:00
Flugente 695a5013c0 if NO_STANDING_ANIM_ADJUSTMENT_IN_COMBAT is true, in turnbased combat, mercs do not automatically change animation from 'running' to 'standing' after arriving at target lcoation (same for walking etc.). This saves AP if we decide to immediately continue moving to another location. 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5763 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2013-01-04 21:45:01 +00:00
Flugente 6239438702 - Fix: moving strategically and then cancelling that order no longer awards stat gains. 
- Fix: On rare occasions, huge stat gains were possible when doing surgery after autoresolve.
- pepper spray does not work on soldiers wearing a gas mask

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5760 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2013-01-03 18:26:48 +00:00
Flugente dbdffeaa03 added missing texts 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5759 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2013-01-03 16:27:19 +00:00