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
3,692 Commits 9 Branches 6 Tags
6ca75431aed49cecd5b8cb7cd0b7afa297fd82ca
Commit Graph
3692 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Shadooow 6ca75431ae Disallowed to pick up items from openable structures like crates if they are currently closed. This additionally fixes bug where Bobby Ray's delivery wouldn't show up if the player had sector of the delivery currently loaded and there were any unpicked items from previous delivery in the delivery crate. 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9285 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2022-01-31 03:39:50 +00:00
Shadooow 0c95fd4f2a Fixed crash in debug mode when opening BR Order Page without any item selected first. 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9284 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2022-01-31 00:29:11 +00:00
Shadooow 44eccb5eab Adds mouse wheel functionality to AIM member page when hovering mouse over the merc photo and for browsing Bobby Rays inventory pages. If mouse is over an item's big picture, 'ctrl' + mouse wheel will allow adding or removing items from shopping cart (by Asdow). 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9283 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2022-01-27 22:02:13 +00:00
Shadooow ad8edc869e Fixed bug introduced in r9275; not being able to assign mercs to facilities or train militia 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9282 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2022-01-27 20:44:06 +00:00
Sevenfm 531849f7aa Disabled muzzle flash when trying to fire jammed gun. 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9281 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2022-01-27 10:04:21 +00:00
Sevenfm 49989da8b1 Dropping items from hand when being hit: 
- civilians with profile should not drop items from hand as it may break quests
- fixed possible incorrect type conversion which could result in dropping too often if weapon in hand marked as undroppable

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9280 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2022-01-27 01:24:11 +00:00
Shadooow c29e070ccf Fixes the missing muzzle flash lighting when firing in the dark. The flag was actually never set when using NCTH, and UseGunNCTH() that was supposed to set it gets called after the animation control checks whether a muzzleflash is true or not, so I had to add the setting the flag just before that check (by Asdow). 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9279 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2022-01-26 16:12:06 +00:00
Shadooow 5c938440c2 Fix for decals not being cleared properly causing graphical issues on strategic map. 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9278 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2022-01-26 14:58:32 +00:00
Sevenfm 0fdaba84f6 World items patch (by Asdow). 
Adds timing logs to savegame function, similar to how we already had in loading a save file. 
Uses a global struct for unloaded sectors' inventory instead of using map item temp files every time unloaded inventory is accessed.
From timing loading and saving functions with a save that has dozens of sectors with hundreds of items each, saving is a little bit slower than before, because map item temp files have to be written to disk just before the save, when that wasn't the case before (from ~0.3 s -> ~0.5s). It is offset by a decrease in loading a game (from ~1.1s -> 0.745s), once an older save is saved at least once. Any unloaded sector inventory access during gameplay is considerably faster and for example the autoresolve lag when militia is using sector equipment is completely gone for me.
Preserves save game compatibility

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9277 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2022-01-26 01:02:30 +00:00
Sevenfm be14552e32 Prevented the game trying to delete an already deleted button when leaving mapscreen and fixed visual bug for popup boxes drawing in item description box in widescreen UI (by Asdow). 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9276 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2022-01-25 22:24:53 +00:00
Sevenfm bc8fac5c3e Fix: memset bugs (by Asdow). 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9275 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2022-01-25 11:25:03 +00:00
Sevenfm e887f85a44 ProcessNoise: fixed incorrect noise terrain check. 
Reverted r9259.

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9274 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2022-01-25 04:15:39 +00:00
Sevenfm f8be9a0db1 AI: minor code improvements (best cover calculation). 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9273 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2022-01-23 03:10:13 +00:00
Shadooow 24775ee398 Fixed crash when the cheat command to teleport on mapscreen assigned previous sector into sector from which the destination cannot be entered. 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9272 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2022-01-22 20:08:37 +00:00
Shadooow 9668618b68 Demand surrender feature will now work on each team separately, ie. demanding surrender from regular enemy will not count hostile civilians or bandits and neither it will capture them. 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9271 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2022-01-22 16:46:13 +00:00
Sevenfm 7803378388 Militia: don't always spare RPGs when in tactical combat. 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9270 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2022-01-21 19:22:12 +00:00
Sevenfm 8c59159213 Added "select all" option for strategic movement popup box (by Asdow). 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9269 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2022-01-20 19:48:56 +00:00
Sevenfm 5282553a8c Stop being able to change assignments of in transit mercs (by Asdow). 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9268 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2022-01-20 17:48:39 +00:00
Sevenfm abdfd022ae Implements mouse wheel scrolling for switching mercs in strategic map when hovering mouse above teamlist, character inventory and character info panels (by Asdow). 
Simplified the r9266 inventory scrolling and made it obey inverted mouse wheel scrolling direction that is in the options screen (by Asdow).

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9267 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2022-01-18 22:05:01 +00:00
Sevenfm f1ba48f51f Added mouse wheel scroll functionality for changing pages in strategic map inventory (by Asdow). 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9266 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2022-01-18 19:29:50 +00:00
Shadooow 8e60b4d442 Fix&Revert of previous commit, I messed it up with my other edits in code that are not tested yet. 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9264 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2022-01-18 08:03:12 +00:00
Shadooow bbd6b1393f Fixed Daily Expenses to no longer count salary of dead mercs or POW NPCs and RPCs. 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9263 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2022-01-18 07:53:06 +00:00
Sevenfm b06b9132a7 Added functions for utf8 <> wstring conversion. 
Added message when AI breaks deadlock because cannot complete action.

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9262 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2022-01-16 17:09:09 +00:00
Sevenfm 43c46b9284 Updated ingame options tooltip to reflect hotkey change for grenade launcher angle. 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9261 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2022-01-16 14:07:30 +00:00
Sevenfm c972655886 ESC key: 
- close active skill sub-menu
- stop moving merc
- stop moving group of mercs
- stop dragging
- unready weapon

Changed hotkeys:
- [A]: activate skills menu.
- [Alt]+[A]: start autobandage
- [Q]: change scope mode
- [Ctrl]+[Q]: change grenade launcher angle

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9260 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2022-01-16 13:59:59 +00:00
Sevenfm 94b7d5611d Improved door noise sound playing: only play sound if merc opening/closing door is visible on screen or if player team hears noise from door. 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9259 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2022-01-16 13:33:11 +00:00
Shadooow 5bb4de2484 Fixed bug where kicking out a merc and telling him to drop items in current sector while having that sector map inventory open would fail to move his items into sector inventory. 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9258 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2022-01-15 14:08:41 +00:00
Shadooow 7c40f27359 Dismissing vehicle will drop items in its inventory in current sector without asking. 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9257 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2022-01-14 22:58:32 +00:00
Shadooow 67f62736ed Changed assignment text for destroyed vehicles in merc list. 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9256 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2022-01-14 22:27:37 +00:00
Shadooow a9fa54e69a Fixed not being able to remove vehicle from merc list. 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9255 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2022-01-14 22:12:18 +00:00
Sevenfm 8f03709936 Updated text description for sector deployment screen with hint to use arrow keys to scroll map view. 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9254 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2022-01-13 20:26:05 +00:00
Sevenfm 76472eed0a Separated cover view area update from RemoveCoverObjectsFromViewArea() into its own function to make it more explicit when and where we do it (by Asdow). 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9253 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2022-01-12 16:09:10 +00:00
Shadooow ec30fcde64 Fixed helicopter sound playing in loop indefinitely when quick-loading during helidrop animation. 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9252 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2022-01-12 03:33:27 +00:00
Shadooow 18b21ce561 Fixed bug splitting escort-requiring npc with another merc, who is under that npc in squad list, from existing squad resulting in putting the two into different groups and disallowing to plot movement. 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9251 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2022-01-12 03:12:33 +00:00
Shadooow 5aad9fc2dc Fixed bug where clicking where radar screen would be during Tactical Placement GUI broke it and allowed to enter map without placing anyone. 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9250 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2022-01-12 02:44:17 +00:00
Shadooow 0792d70583 Fixed ALLOW_SKYRIDER_HOT_LZ = 1 actually not enforcing the center restriction and allowing to place mercs anywhere. 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9249 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2022-01-12 02:19:57 +00:00
Shadooow beb6e35c09 Improved behavior of buttons in Tactical Placement GUI when hot-dropping. 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9248 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2022-01-12 02:11:34 +00:00
Shadooow 586e3dd0d4 Disabled Spread button in Tactical Placement GUI when hotdropping as the group always appeared together anyway. 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9247 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2022-01-12 01:32:32 +00:00
Shadooow d2ccd4a307 Correction to not disable retreat when ALLOW_SKYRIDER_HOT_LZ is 2 or 3. 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9246 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2022-01-12 01:31:08 +00:00
Shadooow 2bf3549142 fix for error in last commit 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9245 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2022-01-12 00:02:28 +00:00
Shadooow a577db2752 Disabled retreat when hot dropping and only center of the map is allowed. 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9244 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2022-01-11 23:54:17 +00:00
Shadooow 3f0ccb0a56 Implemented the missing option of hot drop merc via helicopter into center of the map only, ie. ALLOW_SKYRIDER_HOT_LZ = 1 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9243 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2022-01-11 23:52:50 +00:00
Shadooow b320052d6b Revert of 9241 and a new more coherent solution which works for hot drops as well. 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9242 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2022-01-11 20:49:37 +00:00
Shadooow 48f61bd7bf Fixed regression when newly arriving merc in Omerta was facing north instead of east if player pressed ESC key during helidrop animation. 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9241 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2022-01-11 19:59:49 +00:00
Sevenfm 082d9838a5 When taking/dropping corpse as object, use object's ubWireNetworkFlag and sRepairThreshold variables to store palette and camo status of corpse, instead of hardcoded flags. 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9240 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2022-01-11 17:52:06 +00:00
Shadooow a57cc79c83 enabled new attachments to be shown even without EDB for all items except LBE gear 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9239 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2022-01-11 01:11:50 +00:00
Shadooow 61f1dd4acb fixed MAX_BACKPACK_WEIGHT_TO_CLIMB not being checked in all places which caused: 
- mouse cursor showing blocked path incorrectly and jumping over fence via mouse failing
- endless clock issue at the end of the boxing match if player merc had backpack

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9238 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2022-01-10 22:44:52 +00:00
Sevenfm 7b9d12ff2e Removed extra 'q' case which may prevent compiling debug version. 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9237 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2022-01-09 18:02:35 +00:00
Sevenfm 6704eca440 Added requirements for thrown object to break window glass: 
- ubWeight >= 4
- sinks
- not unaerodynamic
- made of metal or rock

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9236 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2022-01-06 12:54:34 +00:00
Sevenfm f986129ab7 Fixes by rftr: 
- options screen: fixed crash related to handling inputs while the screen was loading/refreshing
- options screen and features screen: added 'Q' input handling to quit to the main menu

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9235 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2022-01-05 09:26:29 +00:00