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,552 Commits 9 Branches 6 Tags
49cf4a73dc526cc2fdc779fea34db95ff28f703d
Commit Graph
1552 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Wanne 49cf4a73dc - Fixed item picture not displayed in map editor selection area for those items beyond the old limit range (by Buggler) 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5883 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2013-02-28 23:13:52 +00:00
Wanne 2de29e73fa - Fixed assertion when clicking on "Multiplayer Game" in Main Menu Screen 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5882 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2013-02-28 09:56:57 +00:00
Wanne a018e77323 - Bugfix: After starting a new game with high screen resolution (> 1024x768) and reaching the tactical screen the first time, the loadscreen image was still visible in the lower left part of the tactical interface panel 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5881 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2013-02-28 09:12:12 +00:00
Flugente 8e909f12fc improvement of militia equipment choosing: 
- grenade launchers aren't overlooked anymore if sector sorting is bad
- ammo does not need to be converted to crates anymore
- less ammo deletion and recreation necessary
- added code documentation

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5880 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2013-02-28 02:08:55 +00:00
Flugente b4f60527cd added squadnames to a few locations 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5879 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2013-02-27 23:13:27 +00:00
Flugente 92cd435806 Fix: militia equipment was not dropped and saved if trashing world 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5878 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2013-02-27 20:54:40 +00:00
Wanne 834aa1eb13 - Recommit Kaiden's class item cap fix r1790 (lost during meager of Big Maps Project code) & other related variables from INT16 to INT32; increased the class item limit in mapeditor (by Buggler) 
- Map Editor: Items - Hotkeys (by Buggler)
o Hotkeys ',': Left Scroll
o Hotkeys '.': Right Scroll
o ('Shift': Jump 1 page; 'Ctrl': Jump 10 pages; 'Ctrl + Shift': Jump to first/last page)
- Changed saveloadscreen previous/next hotkey to ','/'.' due to interference with input_box navigation using arrow keys (by Buggler)

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5877 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2013-02-27 19:06:52 +00:00
Flugente dfc17ea9c6 Fix: assignment names were incorrect 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5876 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2013-02-27 01:04:21 +00:00
Flugente 34c87f0507 very minor code optimization 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5875 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2013-02-26 22:31:39 +00:00
Wanne 51bc188f0b git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5874 3b4a5df2-a311-0410-b5c6-a8a6f20db521 2013-02-26 14:12:27 +00:00
Wanne b107a916e1 - Disabled Tab hotkey for description tab switching in strategic screen so as not to interfere with militia equipment assignment (use Ctrl+Tab like in tactical screen) (by Buggler) 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5873 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2013-02-26 14:00:48 +00:00
Flugente 2cfe4bd7fc - externalised squad names 
- moved Pockets.xml an PocketPopups.xml
- requires GameDir >= r1608

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5872 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2013-02-25 22:25:45 +00:00
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