Skip to content

Commit a07aa97

Browse files
Merge remote-tracking branch 'dhewm3/master'
2 parents 1afe8ef + 2aebfa7 commit a07aa97

File tree

4 files changed

+18
-3
lines changed

4 files changed

+18
-3
lines changed

.github/CHANGELOG.md

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ Note: Numbers starting with a "#" like #330 refer to the bugreport with that num
4444
* Fix a crash (assertion) on start with ImGui if `SDL_GetWindowDisplayIndex()`
4545
or `SDL_GetDisplayDPI()` failed and the `imgui_scale` CVar was set to the default value of `-1`
4646
(setting it to `1` worked around the bug; #632)
47-
* Updated Dear ImGui to 1.91.4
47+
* Updated Dear ImGui to 1.91.7
4848
* Fix scaling of Grabber cursor in Resurrection of Evil in non-4:3 resolutions (#637)
4949
* Add `com_disableAutoSaves` CVar: If set to `1`, Autosaves (when starting a level) are disabled (#620)
5050
* Add support for "nospecular" parm of lights, enabled by setting `"allow_nospecular" "1"` in a maps
@@ -61,6 +61,13 @@ Note: Numbers starting with a "#" like #330 refer to the bugreport with that num
6161
* Fix the "shrivel" effect of MD5 models (`SHADERPARM_MD5_SKINSCALE`)
6262
* Optionally integrate the [Tracy](https://github.com/wolfpld/tracy) profiler.
6363
Disabled unless you enable it in CMake.
64+
* Fixed a crash in AI pathfinding code that could happen in the lotsaimps testmap (#721)
65+
* Disabled assertion in `TestHugeTranslation()` that led to "crashes" in several user-maps (#720)
66+
* Fixed concatenation of timed GUI commands that sometimes lead to glitches in UIs
67+
* Added `fs_gameDllPath` CVar: If set, game DLLs will be searched in that directory before the other
68+
standard places (like next to the executable). Especially useful for developing/debugging mod DLLs
69+
(you can just set `fs_gameDllPath` to the build dir, no need to copy the DLL/.so/.dylib)
70+
* Several smaller fixes for all kinds of things incl. build issues
6471

6572
1.5.4 (2024-08-03)
6673
------------------------------------------------------------------------

.github/CONFIGURATION.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -256,6 +256,10 @@ This can be configured with the following CVars:
256256
compressing on load can help)*.
257257
- `0` Don't compress uncompressed textures when loading them - best quality, but uses more VRAM.
258258

259+
- `fs_gameDllPath` If set, game DLLs will be searched in that directory before the other
260+
standard places (like next to the executable). Especially useful for developing/debugging mod DLLs
261+
(you can just set `fs_gameDllPath` to the build dir, no need to copy the DLL/.so/.dylib)
262+
259263
- `s_alReverbGain` reduce strength of OpenAL (EAX-like) EFX reverb effects, `0.0` - `1.0` (default `0.5`)
260264
- `s_alHRTF` Enable [HRTF](https://en.wikipedia.org/w/index.php?title=Head-related_transfer_function)
261265
for better surround sound with stereo **headphones**. `0`: Disable, `1`: Enable, `-1`: Let OpenAL decide (default).

neo/framework/Common.cpp

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2874,6 +2874,10 @@ static bool checkForHelp(int argc, char **argv)
28742874
WriteString("+set fs_game_base <base-modname>\n");
28752875
WriteString(" some mods are based on other mods, usually d3xp.\n");
28762876
WriteString(" This specifies the base mod e.g. +set fs_game d3le +set fs_game_base d3xp\n");
2877+
WriteString("+set fs_gameDllPath <additional game lib path>");
2878+
WriteString(" sets a path to look for game/mod libs (.dll/.so/.dylib) in.");
2879+
WriteString(" It's searched before all the other default paths (like next to the executable");
2880+
WriteString(" Especially useful when developing/testing/debugging a mod DLL");
28772881
#ifndef ID_DEDICATED
28782882
WriteString("+set r_fullscreen <0 or 1>\n");
28792883
WriteString(" start game in windowed (0) or fullscreen (1) mode\n");

neo/framework/Licensee.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,12 +35,12 @@ If you have questions concerning this license or the applicable additional terms
3535
*/
3636

3737
#define GAME_NAME "dhewm 3" // appears in errors
38-
#define ENGINE_VERSION "dhewm3 1.5.5pre" // printed in console, used for window title
38+
#define ENGINE_VERSION "dhewm3 1.5.5rc1" // printed in console, used for window title
3939

4040
#ifdef ID_REPRODUCIBLE_BUILD
4141
// for reproducible builds we hardcode values that would otherwise come from __DATE__ and __TIME__
4242
// NOTE: remember to update esp. the date for (pre-) releases and RCs and the like
43-
#define ID__DATE__ "Aug 15 2024"
43+
#define ID__DATE__ "Jan 11 2026"
4444
#define ID__TIME__ "13:37:42"
4545

4646
#else // not reproducible build, use __DATE__ and __TIME__ macros

0 commit comments

Comments
 (0)