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,680 Commits 9 Branches 6 Tags
f8be9a0db1dbe525826c5fee36e4420a9b30f3bd
Commit Graph
3680 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Sevenfm 6a3f5cf29e Fix for the uncertain enemies question mark location in higher resolutions (by Asdow). 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9234 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2022-01-04 19:59:16 +00:00
Wanne d7a48bbe1a Updated Chinese Text files (by kmoi) 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9232 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2022-01-04 17:11:38 +00:00
Sevenfm 5c7959adec Removed duplicate macro (by rftr). 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9231 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2022-01-03 23:13:44 +00:00
Sevenfm be80da650c Various improvements by rftr: 
- added more toggles to the features screen: drop all, suppression, drassen/city counterattacks, dynamic opinions and dialogue, and weather
- fixed weather rendering check for individual weather types
- added mousewheel support to options screen and features screen to navigate through pages
- added keyboard inputs to options screen and features screen: TAB toggles between features and options, and A/D/leftarrow/rightarrow navigates through pages

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9230 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2022-01-03 22:49:43 +00:00
Shadooow 038410db4a fix for the new cheat not updating mapscreen automatically 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9229 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2022-01-02 16:12:23 +00:00
Shadooow e20d0cb134 new cheat/debugging command for mapscreen: CTRL+SHIFT+A will reveal all sectors and enemies 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9228 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2022-01-02 14:13:02 +00:00
Shadooow e600134786 fixed bug allowing to move robot without soldier having control device if they were both in party where another soldier not chosen to move had the device 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9227 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2022-01-01 20:44:21 +00:00
Shadooow 1749d3adfb Surrender GUI when talking to boxing opponent replaced with MessageBox allowing to forfeit the match. 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9226 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2022-01-01 13:33:34 +00:00
Shadooow 9737bd9255 fixed bug allowing to plot path with Robot or NPCs that needs to be escorted on their own 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9225 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2022-01-01 12:36:03 +00:00
Sevenfm 27c0d1f8fe With ALTERNATE_MOUSE_COMMANDS = TRUE, mouse wheel allows to change active interface level. 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9224 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2021-12-31 20:46:44 +00:00
Sevenfm 9dbad2ace5 LOBOT option description update. 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9223 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2021-12-31 09:13:02 +00:00
Sevenfm 992c487176 Reverted r9221 change. 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9222 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2021-12-21 21:20:48 +00:00