Merge branch 'master' into new_over_under

CHANGELOG.md

@@ -1,19 +1,34 @@
 ## New Features
 
+- **Support for intermediate resolutions** (e.g. 3X, 5X) **and 9X (1800p)**
+- **_Background for all menus_** setting
+- **Minimap mode for Automap**
 - **NUGHUD:**
-  - Ammo icon;
+  - Ammo and Health icons;
   - Toggle to apply patch offsets.
+- **Further Extended HUD color customization**
+- **_Show Kills Percentage [in Stats display]_** setting
+- **Show Save Messages** setting
 - **_Direct Vertical Aiming_ for melee attacks**
-- **_Disable Melee Snapping_ setting**
+- **_Disable Melee Snapping_** setting
 
 ## Changes
 
 - **NUGHUD:**
-  - Let Ammo and Armor icons fall back to vanilla sprites;
-  - Made Patches and Ammo and Armor icons alignable horizontally and vertically;
+  - Let Ammo, Health and Armor icons fall back to vanilla sprites;
+  - Made Patches and icons alignable horizontally and vertically;
   - Disabled Armor icon by default.
+- **Speed of non-Melt wipes is now independent of resolution**
+- **Implemented Teleporter Zoom for multiplayer respawning**
 - **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**
 
 ## Bug Fixes
 
-None.
+- **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]
+- **Teleporter Zoom and BFG "explosion" shake affecting all players in multiplayer**
+- **Fixed a demo desync** caused by a failed weapon autoswitch when picking up ammo
+- **Tweaked dark menu background and Automap overlay algorithm** (fixes very low values)

README.md

@@ -25,7 +25,7 @@ For these settings, their CVAR names are provided alongside the _CFG-Only_ label
 
 ### General
 
-- **Support for higher resolutions:** 4X (800p) and 8X (1600p) [by _ceski_]
+- **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]
 - **Gamma Correction slider ranging from 0.50 to 2.0 in steps of 0.05**
@@ -51,6 +51,7 @@ For these settings, their CVAR names are provided alongside the _CFG-Only_ label
 - _**Teleporter Zoom**_ setting [i.b. ZDoom]
 - _**Death Camera**_ setting [i.b. ZDoom]
 - _**Chasecam**_ [i.b. ZDoom]
+- _**Background for all menus**_ setting
 - _**Disable palette tint in menus**_ setting [i.b. Crispy Doom]
 - _**Disable Berserk Tint**_ setting
 - _**Disable Radiation Suit Tint**_ setting
@@ -85,26 +86,28 @@ For these settings, their CVAR names are provided alongside the _CFG-Only_ label
 ### Status Bar/HUD
 
 - **`NUGHUD` lump support**, making the Crispy HUD (now called Nugget HUD) customizable (see `docs/nughud.md`)
+- **Crosshair:**
+  - Vertical-only target lock-on;
+  - Horizontal autoaim indicators;
+  - Option to account for fuzzy targets [i.b. From Doom With Love];
+  - Dedicated toggle key.
+- _**Show Powerup Timers**_ setting
 - **Show SSG availability in the Shotgun slot of the Arms widget** setting (CFG-Only: `show_ssg`) [p.f. Crispy Doom]
+- _**Alternative Arms Display**_ setting, to show the Chainsaw or SSG's availability on the Arms widget in place of the trivial Pistol
 - **Blink Missing Keys** setting (CFG-Only: `blink_keys`) [partially p.f. Crispy Doom]
-- **Show Powerup Timers** setting
-- _**Alternative Arms Display**_ setting, to show the Chainsaw or SSG's availability on the Arms widget in place of the trivial Pistol (CFG-Only: `alt_arms`)
 - _**Smart Totals**_ setting [p.f. So Doom]
-- _**(In)Complete Milestone Color**_ choices, to customize the Stats text's colors
-- **Armor count is colored gray when in God Mode**
-- **Support for Berserk (`STBERSRK`) and Infinite Ammo (`STINFNTY`) icons**
+- _**Show Kills Percentage [in Stats display]**_ setting
 - **Event Timers:**
   - _"Use" Button Timer_ [p.f. Crispy Doom]; 
   - _Teleport Timer_ [i.b. the above];
   - _Key Pickup Timer_ [same as above].
-- **Crosshair:**
-  - Vertical-only target lock-on;
-  - Horizontal autoaim indicators;
-  - Option to account for fuzzy targets [i.b. From Doom With Love];
-  - Dedicated toggle key.
+- **Extended HUD color customization**
+- **Armor count is colored gray when in God Mode**
+- **Support for Berserk (`STBERSRK`) and Infinite Ammo (`STINFNTY`) icons**
 
 ### Automap
 
+- **Minimap mode** [i.b. DSDA-Doom]
 - **Automap color for unrevealed secret sectors**
 - Key to _**Blink [Automap] Marks**_ (default: <kbd>B</kbd>)
 - _**Tag Finder**_: Position the Automap pointer over a sector and press the _Tag Finder_ key to highlight its activator line(s), and vice versa [p.f. PrBoomX]
@@ -121,6 +124,7 @@ For these settings, their CVAR names are provided alongside the _CFG-Only_ label
 ### Messages
 
 - **Secret count in "secret revealed" message** [p.f. Crispy Doom]
+- **Show Save Messages** setting (CFG-Only: `show_save_messages`)
 - _**Announce Milestone Completion**_ setting, to report completion of milestones (e.g. all items acquired)
 - Restored _**Message Listing Scrolls Upwards**_ setting, and enabled it by default
 
@@ -180,6 +184,7 @@ For these settings, their CVAR names are provided alongside the _CFG-Only_ label
   - `DSMNUOPN`, `DSMNUCLS`, `DSMNUACT`, `DSMNUBAK`, `DSMNUMOV`, `DSMNUSLI`, `DSMNUERR`;
   - `DSINTTIC`, `DSINTTOT`, `DSINTNEX`, `DSINTNET`, `DSINTDMS`.
 - **Customizable darkening level for dark menu background and Automap overlay** (CFG-Only: `menu_background_darkening` and `automap_overlay_darkening`) [i.b. Cherry Doom]
+- **Tweaked dark menu background and Automap overlay algorithm**
 - The **Chaingun can be given a custom sound effect** by providing a `DSCHGUN` sound effect lump
 - Toggle to **allow chat in singleplayer** (CFG-Only: `sp_chat`)
 - Restored `-cdrom` command-line parameter
@@ -275,10 +280,14 @@ Copyright:
  © 2005-2018 Simon Howard;  
  © 2006 Ben Ryves;  
  © 2017 Christoph Oelckers;  
+ © 2017-2022 Brad Harding;  
  © 2019 Fernando Carmona Varo;  
  © 2019 Jonathan Dowland;  
  © 2020 Alex Mayfield;  
+ © 2020 JadingTsunami;  
  © 2021 Ryan Krafnick;  
+ © 2022 Julia Nechaevskaya;  
+ © 2022 Vladislav Melnichuk;  
  © 2022-2023 ceski;  
  © 2023 liPillON;  
  © 2020-2023 Fabian Greffrath;  

docs/cheats.md

@@ -111,46 +111,46 @@ Toggle infinite ammo.
 
 `VALIANT`  
 Toggle fast weapons.
-    
+
 `BOBBERS`  
 Shortcut to toggle the two cheats mentioned above, and IDFA.
-        
+
 `GIBBERS`  
 Force gibbing on dying enemies, independently of damage dealt.
-    
+
 `IDFLY`  
 Toggle Fly Mode (uses jumping/crouching keys).
-    
+
 `SUMMON`  
 Spawn a hostile or friendly actor based on its mobjtype index.
-    
+
 `RESURRECT` / `IDRES`  
 Resurrect the player without toggling IDDQD.
-    
+
 `LINETARGET`  
 Toggle Linetarget Query Mode, which gives some info on the player's linetarget.
-    
+
 `MDK`  
 Perform a hitscan attack with 1 million damage.
-    
+
 `SAITAMA`  
 Toggle MDK Fist (replaces A_Punch's melee attack with the MDK attack, featuring an alternate multishot attack when holding down Strafe On).
-    
-`BOOMCAN`
+
+`BOOMCAN`  
 Toggle explosive hitscan attacks for the player's ranged hitscan weapons
-    
+
 `NEXTMAP`  
 Exit the level.
-    
+
 `NEXTSECRET`  
 Exit the level as if using a secret exit.
-    
+
 `TURBO`  
 Change the player speed in-game.
 
 `NOMOMENTUM`  
 Toggle No Momentum mode; reenabled debugging cheat.
-    
+
 ## Beta cheats
 
 These cheats only work in MBF `-beta` emulation mode.

docs/nughud.lmp

@@ -20,6 +20,13 @@ nughud_health_y     171
 nughud_health_wide  -1
 nughud_health_align 1
 
+; Health icon
+nughud_healthicon_x     -1
+nughud_healthicon_y     0
+nughud_healthicon_wide  0
+nughud_healthicon_align -1
+nughud_healthicon_vlign 1
+
 ; Arms numbers
 
 nughud_arms1_x    -1

docs/nughud.md

@@ -42,34 +42,37 @@ The following types of widgets support special behavior:
 
 The following widgets are available:
 
-| Widget(s)          | Disableable | Alignable | Description |
-| :----------------: | :---------: | :-------: | :---------- |
-| `nughud_ammo`      | Yes         | Yes       | Ammo count for the currently-equipped weapon |
-| `nughud_ammoicon`  | Yes         | Yes       | Ammo icon, which changes depending on ammo type of current weapon |
-| `nughud_health`    | Yes         | Yes       | Health count |
-| `nughud_arms#`     | Yes         | No        | Arms (weapon) number, where # is a number between `1` and `9` (inclusive) |
-| `nughud_frags`     | Yes         | Yes       | Frags count, only shown during Deathmatch games |
-| `nughud_face`      | Yes         | No        | Face (Mugshot) |
-| `nughud_armor`     | Yes         | Yes       | Armor count |
-| `nughud_armoricon` | Yes         | Yes       | Armor icon, which changes depending on current armor type |
-| `nughud_key#`      | Yes         | No        | Key display, where # is a number between `0` and `2` (in order: Blue Key; Yellow Key; Red Key) |
-| `nughud_ammo#`     | Yes         | Yes       | Ammo count for each type, where # is a number between `0` and `3` (in order: Bullets; Shells; Cells; Rockets) |
-| `nughud_maxammo#`  | Yes         | Yes       | Same as the above, but for Max Ammo |
-| `nughud_time`      | No          | Yes       | Time display, only shown if enabled by the user |
-| `nughud_sts`       | No          | Yes       | Stats (Kills/Items/Secrets) display, only shown if enabled by the user |
-| `nughud_title`     | No          | Yes       | Level Name display, only shown on the Automap |
-| `nughud_powers`    | No          | Yes       | Powerup Timers, only shown if enabled by the user |
-| `nughud_coord`     | No          | Yes       | Coordinates display, only shown if enabled by the user |
-| `nughud_fps`       | No          | Yes       | FPS display, only shown when the FPS cheat is activated |
-| `nughud_message`   | No          | Yes       | Message display |
-| `nughud_secret`    | No          | Yes       | Secret Message display |
-
-**The _Ammo_ and _Armor icons_ can also be aligned vertically** by means of the `_vlign` property, with the following possible values:
+| Widget(s)           | Disableable | Alignable | Description |
+| :-----------------: | :---------: | :-------: | :---------- |
+| `nughud_ammo`       | Yes         | Yes       | Ammo count for the currently-equipped weapon |
+| `nughud_ammoicon`   | Yes         | Yes       | Ammo icon, which changes depending on ammo type of current weapon |
+| `nughud_health`     | Yes         | Yes       | Health count |
+| `nughud_healthicon` | Yes         | Yes       | Health icon, which changes depending on whether the player has Berserk |
+| `nughud_arms#`      | Yes         | No        | Arms (weapon) number, where # is a number between `1` and `9` (inclusive) |
+| `nughud_frags`      | Yes         | Yes       | Frags count, only shown during Deathmatch games |
+| `nughud_face`       | Yes         | No        | Face (Mugshot) |
+| `nughud_armor`      | Yes         | Yes       | Armor count |
+| `nughud_armoricon`  | Yes         | Yes       | Armor icon, which changes depending on current armor type |
+| `nughud_key#`       | Yes         | No        | Key display, where # is a number between `0` and `2` (in order: Blue Key; Yellow Key; Red Key) |
+| `nughud_ammo#`      | Yes         | Yes       | Ammo count for each type, where # is a number between `0` and `3` (in order: Bullets; Shells; Cells; Rockets) |
+| `nughud_maxammo#`   | Yes         | Yes       | Same as the above, but for Max Ammo |
+| `nughud_time`       | No          | Yes       | Time display, only shown if enabled by the user |
+| `nughud_sts`        | No          | Yes       | Stats (Kills/Items/Secrets) display, only shown if enabled by the user |
+| `nughud_title`      | No          | Yes       | Level Name display, only shown on the Automap |
+| `nughud_powers`     | No          | Yes       | Powerup Timers, only shown if enabled by the user |
+| `nughud_coord`      | No          | Yes       | Coordinates display, only shown if enabled by the user |
+| `nughud_fps`        | No          | Yes       | FPS display, only shown when the FPS cheat is activated |
+| `nughud_message`    | No          | Yes       | Message display |
+| `nughud_secret`     | No          | Yes       | Secret Message display |
+
+**The _Ammo_, _Health_ and _Armor icons_ can also be aligned vertically** by means of the `_vlign` property, with the following possible values:
   - ` 1` for top alignment;
   - ` 0` for center alignment;
   - `-1` for bottom alignment.
 Additionally, **the offsets of the graphics used by these icons will be ignored, unless a custom font is being used** (see details below).
 
+**Arms number 1 is lit up when the player has Berserk.**
+
 There are some additional toggles (value of `0` or `1`) for some specific widgets:
 
 - `nughud_percents`: Toggle drawing of percentage signs for the _Health_ and _Armor_ counts.
@@ -118,36 +121,49 @@ Tall Numbers, used for the Health, Armor, current-weapon Ammo and Frags counts:
 - NHTMINUS - Minus sign
 - NHTPRCNT - Percent sign
 
+
 Current-weapon Ammo Numbers, which take precedence over Tall Numbers for the Current-weapon Ammo count:
 
 - NHRNUM# -- Number, where # is a number between 0 and 9 (inclusive)
 - NHRMINUS - Minus sign
 
+
 Ammo Numbers, used for the Ammo and Max Ammo counts:
 
 - NHAMNUM# - Number, where # is a number between 0 and 9 (inclusive)
 
+
 Arms Numbers, used for the weapon numbers:
 
 - NHW0NUM# - Weapon unavailable, where # is a number between 1 and 9 (inclusive)
 - NHW1NUM# - Weapon available, where # is a number between 1 and 9 (inclusive)
 
+
 Keys:
 
 - NHKEYS# -- Key, where # is a number between 0 and 8 (inclusive)
 
+
 Berserk, drawn in place of the Ammo count when using the Berserk Fist:
 
 - NHBERSRK - Berserk graphic
 
+
 Ammo graphics, used for the Ammo icon widget:
 
 - NHAMMO# - Graphic, where # is a number between 0 and 3 (in order: Bullets; Shells; Cells; Rockets)
 
+
+Health graphics, used for the Health icon widget:
+
+- NHEALTH# - Graphic, where # is a number between 0 and 1 (respectively, no Berserk and Berserk)
+
+
 Armor graphics, used for the Armor icon widget:
 
 - NHARMOR# - Graphic, where # is a number between 0 and 2 (in order: no Armor; Green Armor; Blue Armor)
 
+
 Infinity, drawn in place of the Ammo count when using weapons with no ammo type (e.g. Fist/Chainsaw):
 
 - NHINFNTY - Infinity graphic