Merge branch 'master' into new_over_under

CHANGELOG.md

@@ -2,12 +2,25 @@
 
 - **Support for intermediate resolutions** (e.g. 3X, 5X) **and 9X (1800p)**
 - **_Background for all menus_** setting
+- **_Vanilla Fake Contrast_** setting
+- Toggle for **Diminished Lighting**
 - **Minimap mode for Automap**
 - **NUGHUD:**
   - Ammo and Health icons;
-  - Toggle to apply patch offsets.
+  - Toggle to apply patch offsets;
+  - Vertical view offset setting.
 - **Further Extended HUD color customization**
 - **_Show Kills Percentage [in Stats display]_** setting
+- **Made the following cheats bindable to keys:**
+  - Infinite Ammo;
+  - Fast Weapons;
+  - Resurrect;
+  - Flight Mode;
+  - Repeat Last Summon;
+  - Linetarget Query;
+  - MDK Attack;
+  - MDK Fist;
+  - Explosive Hitscan.
 - **Show Save Messages** setting
 - **_Direct Vertical Aiming_ for melee attacks**
 - **_Disable Melee Snapping_** setting
@@ -17,9 +30,13 @@
 - **NUGHUD:**
   - Let Ammo, Health and Armor icons fall back to vanilla sprites;
   - Made Patches and icons alignable horizontally and vertically;
-  - Disabled Armor icon by default.
+  - Disabled Armor icon by default;
+  - Changed `weapheight` range from [0, 200] to [-32, 32].
+  - Changed `secret_y` default to 84, to match Woof!.
 - **Speed of non-Melt wipes is now independent of resolution**
 - **Implemented Teleporter Zoom for multiplayer respawning**
+- **_Blink [Automap] Marks_ message now includes number of marks**
+- **Applied interpolation for Chasecam speed effect**
 - **MDK Fist attacks now prioritize enemies over friends**
 - **Current resolution is now reported by some video-related menu items**
 - **Disabled `input_spy` and `input_menu_reloadlevel` when typing in Chat**
@@ -29,6 +46,12 @@
 - **Further corrected view pitch as FOV changes**
 - **Disabled teleport-to-Automap-pointer during non-Casual Play**
 - **Excess speed when airborne with noclip enabled** [thanks @kitchen-ace]
+- **Blazing door sound fix not applying to Boom doors**
 - **Teleporter Zoom and BFG "explosion" shake affecting all players in multiplayer**
+- **Explosion shake being stopped by the menu during demo playback and netgames**
+- **Choppy Chasecam speed effect when looking up or down**
+- **View snapping when teleporting to Automap pointer while crouching**
+- **View clipping through floor when landing while crouching**
 - **Fixed a demo desync** caused by a failed weapon autoswitch when picking up ammo
+- **_View Height_ increments not being applied immediately**
 - **Tweaked dark menu background and Automap overlay algorithm** (fixes very low values)

README.md

@@ -27,9 +27,9 @@ For these settings, their CVAR names are provided alongside the _CFG-Only_ label
 
 - **Support for higher resolutions:** 3X (600p), 4X (800p)... up to 9X (1800p) [by _ceski_]
 - **Selection of widescreen ratios** in the setup menu itself [i.b. Crispy Doom]
-- Toggle to **stretch viewport to fit window** (CFG-Only: `stretch_to_fit`) [i.b. and partially p.f. Crispy Doom; i.b. ZDoom]
+- **Stretch viewport to fit window** setting (CFG-Only: `stretch_to_fit`) [i.b. and partially p.f. Crispy Doom; i.b. ZDoom]
 - **Gamma Correction slider ranging from 0.50 to 2.0 in steps of 0.05**
-- Toggle for **Gamma Correction key cycling**, through either original or extended gamma levels (CFG-Only: `gammacycle`)
+- **Gamma Correction key cycling** setting, to cycle through either original or extended gamma levels (CFG-Only: `gammacycle`)
 - **Menu items for _Air Absorption_ and _Doppler Effect_**, both of which are **now set to 5 by default**
 - **Tweaked _Stretch Short Skies_ algorithm**
 - _**Screen Wipe Style**_ selection:
@@ -57,15 +57,16 @@ For these settings, their CVAR names are provided alongside the _CFG-Only_ label
 - _**Disable Radiation Suit Tint**_ setting
 - _**Damage Tint Cap**_ and _**Bonus Tint Cap**_, to attenuate or disable the red and yellow screen tints
 - _**Fake Contrast**_ setting
+- Toggle for **Diminished Lighting** (CFG-Only: `diminished_lighting`)
 - _**Screen Wipe speed percentage**_ setting
 - _**Sound Clipping Distance**_ selection, to optionally double the distance at which SFX become audible
 - **_Organize Saves by IWAD_** setting
 - _**One-Key Quick Save/Load**_ setting, to skip the confirmation prompt
 - _**Play Internal Demos**_ setting
 - _**Quick "Quit Game"**_ setting, to skip the confirmation prompt [p.f. Crispy Doom]
-- Toggling of _**Weapon Flash Lighting**_ [p.f. Crispy Doom]
-- Toggling of _**Weapon Flash Sprite**_ [p.f. Crispy Doom]
-- Toggling of _**Invulnerability Colormap**_ [p.f. Crispy Doom]
+- Toggle for _**Weapon Flash Lighting**_ [p.f. Crispy Doom]
+- Toggle for _**Weapon Flash Sprite**_ [p.f. Crispy Doom]
+- Toggle for _**Invulnerability Colormap**_ [p.f. Crispy Doom]
 
 ### Weapons
 

docs/nughud.lmp

@@ -200,7 +200,7 @@ nughud_message_align -1
 
 ; Secret Message/Milestone Completion display
 nughud_secret_x     160
-nughud_secret_y     86
+nughud_secret_y     84
 nughud_secret_wide  0
 nughud_secret_align 0
 
@@ -219,5 +219,8 @@ nughud_percents 1
 ; Apply graphic offsets when drawing Patches
 nughud_patch_offsets 1
 
-; Upwards offset to apply to weapon sprites
+; Vertical offset for weapon sprites
 nughud_weapheight 0
+
+; Vertical offset for view window
+nughud_viewoffset 0

docs/nughud.md

@@ -202,10 +202,10 @@ nughud_patch2_wide 0
 nughud_patch2_name "STARMS"
 ```
 
-### Miscellaneous
+### Additional integer properties
 
-**There is an additional fixed-point property, `nughud_weapheight`, to increase the height at which weapon sprites are drawn**.
-It can be any value between `0` and `200` (inclusive).
+- `nughud_weapheight`: **vertical offset for weapon sprites**, in the [-32, 32] range; greater values shift the sprites upwards.
+- `nughud_viewoffset`: **vertical offset for the view window**, in the [-16, 16] range; greater values shift the view downwards.
 
 ---
 

src/am_map.c

@@ -978,7 +978,7 @@ boolean AM_Responder
     else if (M_InputActivated(input_map_blink) && markpointnum)
     {
       markblinktimer = 4*TICRATE;
-      plr->message = "Blinking marks...";
+      displaymsg("Blinking %i mark%s...", markpointnum, (1 < markpointnum) ? "s" : "");
     }
     // Minimap
     else if (M_InputActivated(input_map_mini))
@@ -999,7 +999,7 @@ boolean AM_Responder
 
       P_TeleportMove(mo, (m_x+m_w/2)<<FRACTOMAPBITS, (m_y+m_h/2)<<FRACTOMAPBITS, false);
       mo->z = mo->floorz;
-      plr->viewz = mo->z + plr->viewheight;
+      plr->viewz = mo->z + plr->viewheight - plr->crouchoffset;
 
       if (fancy_teleport) {
         R_SetFOVFX(FOVFX_TELEPORT); // Teleporter zoom

src/d_player.h

@@ -73,15 +73,15 @@ typedef enum
   CF_RENDERSTATS      = 64,
   CF_SHOWFPS          = 128,
 
-  // [Nugget] All of the following:
+  // [Nugget] ----------------------------------------------------------------
 
   CF_INFAMMO          = 0x00010000, // Infinite ammo
   CF_FASTWEAPS        = 0x00020000, // Fast Weapons
   CF_FLY              = 0x00040000,
   CF_LINETARGET       = 0x00080000, // Give info on the current linetarget
   CF_SAITAMA          = 0x00100000, // MDK Fist
   CF_BOOMCAN          = 0x00200000, // Explosive Hitscan
-  
+
 } cheat_t;
 
 
@@ -215,15 +215,15 @@ typedef struct player_s
 
   weapswitch_t switching;
 
-  // [Nugget] All of the following:
-  
+  // [Nugget] ----------------------------------------------------------------
+
   weapontype_t        lastweapon;
 
   int                 jumptics; // Jumping delay
   fixed_t             crouchoffset; // How many units the player is crouched
 
   fixed_t             impactpitch, oldimpactpitch; // Pitch view on impact
-  
+
   // [crispy] blinking key or skull in the status bar
   int                 keyblinkkeys[3], keyblinktics;
 

src/doomstat.c

@@ -164,6 +164,7 @@ int no_radsuit_tint;
 int damagecount_cap;
 int bonuscount_cap;
 int fake_contrast;
+int diminished_lighting; // CFG-Only
 int wipe_speed_percentage;
 int s_clipping_dist_x2;
 int one_key_saveload;

src/doomstat.h

@@ -492,6 +492,7 @@ extern int no_radsuit_tint;
 extern int damagecount_cap;
 extern int bonuscount_cap;
 extern int fake_contrast;
+extern int diminished_lighting; // CFG-Only
 extern int wipe_speed_percentage;
 extern int s_clipping_dist_x2;
 extern int one_key_saveload;