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,643 Commits 9 Branches 6 Tags
f986129ab79d253f538c5bc9384df014b74ff617
Commit Graph
3643 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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 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 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 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 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 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
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
Shadooow 828e015027 qol change: if the last movement mode prior to climbing down the roof was running, it won't be reset to walking 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9206 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2021-10-30 19:34:47 +00:00
Shadooow bd5fc83ef8 fixed gap between the involved table and uninvolved table 
fixed uninvolved header not appearing at all when all mercs were involved

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9205 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2021-10-30 19:23:03 +00:00
Shadooow 61f56fe0e6 fixed regression that caused mercs to keep their direction&animation when moving into another sector 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9204 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2021-10-28 18:29:35 +00:00
Shadooow 14e963e338 re-enabled the scrolling functionality via mouse wheel on the message scroll bar which got lost due to previous change to message region boundaries 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9203 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2021-10-28 14:34:44 +00:00
Shadooow c9b9652940 reworked the camouflage and weight map regions to be created only on demand 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9202 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2021-10-28 13:26:02 +00:00
Shadooow 30b3528956 improved the boundaries of the message area in map screen 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9201 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2021-10-28 12:56:56 +00:00
Shadooow f0f558f872 fixed collapsed soldiers sometimes not being able to get up when they should have until next player round 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9200 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2021-10-28 09:36:58 +00:00
Shadooow d238927dd0 detaching attachment will no longer check for 12AP more than it should, this was kind of safety check, but it is confusing and not needed anymore 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9199 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2021-10-28 08:48:54 +00:00
Shadooow 6d8e11931a fixed negative value passed into PreRandom that could cause game to crash 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9198 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2021-10-27 00:21:47 +00:00
Shadooow c7139a2569 using an item will now close EDB if opened, this fixed bug where attaching a 40mm grenade into laucher via EDB box and firing from it without closing it didn't substract AP for attaching the grenade 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9197 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2021-10-26 22:44:19 +00:00
Sevenfm d02547c7c8 When attaching launchable to attached launcher, use launcher's reload AP cost. 
Don't apply ambidextrous attach speed bonus when attaching launchable to launcher.
When playing reload sounds, set volume and pan based on soldier's location.

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9196 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2021-10-26 13:49:55 +00:00
Sevenfm 8413c5ee8f GetReliability: attached weapons should not add reliability. 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9195 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2021-10-26 07:06:43 +00:00
Sevenfm 4b646aad96 GetSightAdjustmentCamouflageOnTerrain: fix signed/unsigned calculation, limit effectiveness to +-100. 
GetDetailedSightAdjustmentCamouflageOnTerrain: fix signed/unsigned calculation.

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9194 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2021-10-24 15:02:27 +00:00
Sevenfm 36d67602fd Added camouflage bonus to the survival trait (by rftr). 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9193 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2021-10-24 09:02:48 +00:00
Sevenfm a8bace71fc Rebel command balancing (by rftr): 
- most admin actions' effectiveness now scale with town loyalty
- added the ability to spend supplies to raise town loyalty
- fixed arc website dropdown issues
- minor code cleaning in Rebel Command.cpp

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9192 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2021-10-22 09:31:38 +00:00
Sevenfm c577894d3f Allow scuba bottle to work from backpack slot for mod compatibility. 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9191 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2021-10-19 08:25:27 +00:00
Sevenfm 8d8f912e1a Fix: ASD deploys tanks if there are any in reserve, instead of prioritizing jeeps (by rftr). 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9190 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2021-10-19 07:22:32 +00:00
Shadooow 68664bed77 fixed bleeding value not being substracted when losing max hp which resulted into the graphic HP bar having wrong color 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9189 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2021-10-18 08:26:32 +00:00
Sevenfm ff172cc92f fix: follow-up minievents properly wait for the specified time (by rftr) 
fix: money income from rebel command displays properly in finances (by rftr)

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9188 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2021-10-18 06:15:40 +00:00
Shadooow a3bcfef40a maximum heath of merc on mapscreen will now show in red color if the merc suffered a health loss from critical hit 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9187 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2021-10-17 23:16:52 +00:00
Shadooow 7f57376f93 pressing ESC while map movement popup box opened will now cancel the box instead of leaving map into tactical mode 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9186 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2021-10-17 22:37:20 +00:00
Shadooow 9f18ebb382 fix: mercs in a helicopter can initiate movement by clicking in their destination column, like regular on-foot/in-car movement (by rfrt) 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9185 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2021-10-17 21:58:13 +00:00
Sevenfm b11957691c Fix for critical bug introduced in r9182: replace CoweringShockLevel check which calculates suppression tolerance every time, with IsCowering, which uses cowering animation check. 
DrawBarsInUIBox: fix possible divide by zero.

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9184 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2021-10-16 16:07:31 +00:00
Sevenfm 9fd9e82397 NEW_SUPPRESSION_CODE: 
- increased min base value for suppression tolerance, so merc with low morale/level have higher base tolerance which can be reduced by other factors
- NEARBY_FRIENDLIES_AFFECT_TOLERANCE: penalty -0.5 if friend is cowering or unconscious, increased limits to +-5

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9183 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2021-10-15 09:05:32 +00:00