Merge remote-tracking branch 'dhewm3/master'

Author: FriskTheFallenHuman

.github/CHANGELOG.md

@@ -70,6 +70,7 @@ Note: Numbers starting with a "#" like #330 refer to the bugreport with that num
 * Fixed a crash when using an incomplete cubemap texture (missing one side).  
   Will now print a warning about the missing side.
 * Fix wrong (flipped) labels of Prev./Next Weapon in dhewm3 settings menu (#731)
+* Gamepad trigger axes can now also be used for ducking and jumping (#733)
 * Several smaller fixes for all kinds of things incl. build issues
 
 

docs/GUIs.md

@@ -644,12 +644,12 @@ windowDef Desktop {
 }
 ```
 
-This sets an unstretched(!) background texture over the whole screen, repeating as aften as
+This sets an unstretched(!) background texture over the whole screen, repeating as often as
 necessary to fit the screen. Wouldn't have been possible without the new variables and CstDoom3's
 anchor system!
 
 Another usecase is to display things only in the "letter-box" bars, if you anchor the main part
-of your menu to the center (especially useful when modifying existing comples GUIs, like the Doom3
+of your menu to the center (especially useful when modifying existing complex GUIs, like the Doom3
 mainmenu, to be widescreen-friendly). For example, if your existing menu has a half-translucent
 grey bar on the bottom of the centered area (kinda like the doom3 main menu...), and you want to
 continue that to the borders of the screen, you could add something like:

neo/framework/Common.cpp

@@ -3001,6 +3001,15 @@ void idCommonLocal::Init( int argc, char **argv ) {
 	 *  * https://github.com/libsdl-org/SDL/issues/4039
 	 *  * https://github.com/libsdl-org/SDL/issues/3656 */
 	SDL_SetHint( SDL_HINT_VIDEO_MINIMIZE_ON_FOCUS_LOSS, "1" );
+  #ifdef SDL_HINT_ENABLE_SCREEN_KEYBOARD
+	SDL_SetHint( SDL_HINT_ENABLE_SCREEN_KEYBOARD, "0" );
+  #else
+	// fallback for older SDL2 versions, maybe at least the runtime version is new enough
+	// for this hint if the compile time SDL2 version wasn't (and if not this won't hurt)
+	if (SDL_getenv("SDL_ENABLE_SCREEN_KEYBOARD") == NULL) {
+		SDL_setenv("SDL_ENABLE_SCREEN_KEYBOARD", "0", 0);
+	}
+  #endif
 #endif
 
 	try {

neo/framework/Dhewm3SettingsMenu.cpp

@@ -2360,7 +2360,15 @@ static CVarOption gameOptions[] = {
 	CVarOption( "ui_autoSwitch", "Auto Weapon Switch", OT_BOOL ),
 	CVarOption( "Visual" ),
 	CVarOption( "g_showHud", "Show HUD", OT_BOOL ),
-	CVarOption( "com_showFPS", "Show Framerate (FPS)", OT_BOOL ),
+	CVarOption( "com_showFPS", []( idCVar& cvar ) {
+		int curFormat = idMath::ClampInt( 0, 2, cvar.GetInteger() );
+		const char* choices = "Don't show framerate\0Show only framerate\0Show framerate and frame times (avg/min/max)\0";
+		if ( ImGui::Combo( "Show Framerate (FPS)", &curFormat, choices ) ) {
+			cvar.SetInteger( curFormat );
+		}
+		AddTooltip( "com_showFPS" );
+		AddDescrTooltip( cvar.GetDescription() );
+	} ),
 	CVarOption( "ui_showGun", "Show Gun Model", OT_BOOL ),
 	CVarOption( "g_decals", "Show Decals", OT_BOOL ),
 	CVarOption( "g_bloodEffects", "Show Blood and Gibs", OT_BOOL ),

neo/renderer/tr_local.h

@@ -1114,7 +1114,7 @@ void		GLimp_DeactivateContext( void );
 const int GRAB_GRABMOUSE	= (1 << 0);
 const int GRAB_HIDECURSOR	= (1 << 1);
 const int GRAB_RELATIVEMOUSE = (1 << 2);
-const int GRAB_ENABLETEXTINPUT = (1 << 3); // only used with SDL3, where textinput must be explicitly activated
+const int GRAB_ENABLETEXTINPUT = (1 << 3); // to explicitly enable/disable textinput in SDL2/3
 
 void GLimp_GrabInput(int flags);