7604 Commits
Author SHA1 Message Date
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
Sevenfm 220fad2b7d Removed unsupported yet G11 from LOBOT xml to fix starting error.
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@2638 4f8fa57e-7814-0410-bad4-adc449f26b7c
2022-01-11 11:01:18 +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 74c5311047 Alternate hip aim animation for big male (by Asdow)
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@2637 4f8fa57e-7814-0410-bad4-adc449f26b7c
2022-01-10 18:57:00 +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 8606bb2c85 Fix for the wrong strategic map in the new widescreen strategic UI (by Asdow).
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@2636 4f8fa57e-7814-0410-bad4-adc449f26b7c
2022-01-09 13:41:54 +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 a57e4e6d11 Updated Chinese GameDir files (by kmoi)
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameData@9233 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2022-01-04 17:13:29 +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 d55568962c This will make LOBOT work on mercs with face index 200 (by Asdow).
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@2635 4f8fa57e-7814-0410-bad4-adc449f26b7c
2022-01-03 23:53:58 +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 02b5508bae New options for 1.13 features screen (by rftr).
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@2634 4f8fa57e-7814-0410-bad4-adc449f26b7c
2022-01-03 22:50:16 +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 29af8abd72 Full set of LOBOT animations (by Asdow).
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@2633 4f8fa57e-7814-0410-bad4-adc449f26b7c
2021-12-31 07:50:26 +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
Sevenfm ad044f38c6 Improved code for AI attack location randomization.
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9221 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2021-12-21 08:09:41 +00:00
Shadooow 210101463e fixed inability to turn around or aim gun while standing in a knee deep water
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9220 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2021-12-20 16:36:53 +00:00
Wanne 2c463fc6f6 Updated Chinese GameDir files (by kmoi)
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameData@9219 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2021-12-06 22:18:20 +00:00
Wanne c53721f0bd Updated Chinese Text files (by kmoi)
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9218 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2021-12-06 22:17:35 +00:00
Sevenfm 9c2fd350ea Fix for female, big male cowering LOBOT animations (by Asdow).
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@2632 4f8fa57e-7814-0410-bad4-adc449f26b7c
2021-12-06 07:06:38 +00:00
Sevenfm 170c855f55 Fix for female throwing animations causing a crash with lobot (by Asdow).
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@2631 4f8fa57e-7814-0410-bad4-adc449f26b7c
2021-12-05 19:13:45 +00:00
Sevenfm 7fcf2b196e UB patch (by rftr).
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9217 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2021-12-01 19:31:33 +00:00
Sevenfm 6f21522f92 Widescreen UI patch (by Asdow).
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@2630 4f8fa57e-7814-0410-bad4-adc449f26b7c
2021-11-21 12:57:54 +00:00
Sevenfm 0cc70519d3 Widescreen UI patch (by Asdow).
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9216 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2021-11-21 12:56:27 +00:00
Sevenfm abb1aeeea2 Enable any wrapper that supports upscaling to use any resolution and if using no wrapper (or using a wrapper that doesn't support upscaling) it will still show the error message if the resolution is not supported (by Asdow).
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9215 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2021-11-21 12:53:38 +00:00
Sevenfm be0d347a5c Reverted unwanted changes from r9212.
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9214 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2021-11-21 11:10:22 +00:00
Sevenfm bd350a8b9f Fixed recon gear kit for Blood (by Asdow).
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@2629 4f8fa57e-7814-0410-bad4-adc449f26b7c
2021-11-18 16:26:27 +00:00
Sevenfm cdfffa4e64 Added missing explosion size defines (by Asdow).
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@2628 4f8fa57e-7814-0410-bad4-adc449f26b7c
2021-11-18 16:14:19 +00:00
Sevenfm 45da1c2e6a Uploaded missing FeaturesScreen.cpp
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9213 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2021-11-17 08:03:04 +00:00
Sevenfm ccd9fd519b New ingame options screen (by rftr).
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@2627 4f8fa57e-7814-0410-bad4-adc449f26b7c
2021-11-17 07:51:02 +00:00
Sevenfm 1ee875be61 New ingame options screen (by rftr).
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9212 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2021-11-17 07:50:20 +00:00
Sevenfm f6fd480c45 This fixes player mercs' shading not updating based on the tile's lightlevel. Especially noticeable when running around at night in a map with lights (by Asdow).
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9211 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2021-11-05 04:42:01 +00:00
Sevenfm f9cfb5e831 Auto Resolve code: added type change missing from previous commit, fixed some compiler warnings.
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9210 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2021-11-01 16:19:17 +00:00
Sevenfm 01a566494e Fix possible signed/unsigned type inconsistency problems in auto resolve code, fix max limit for tries in auto bandage code.
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9209 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2021-11-01 16:09:59 +00:00
Wanne 6e6c0d9f06 Updated Chinese GameDir files (by kmoi)
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameData@9208 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2021-11-01 11:18:41 +00:00
Shadooow fbade9d355 fixed rain disappearing with NCTH
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9207 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2021-10-31 00:20:10 +00:00