Merge branch 'master' of https://github.com/sezero/quakespasm

# Conflicts:
#	MacOSX/English.lproj/InfoPlist.strings
#	MacOSX/Info.plist
#	MacOSX/QuakeSpasm.xcodeproj/project.pbxproj
#	MacOSX/SDL2.framework/Versions/A/Headers/SDL_revision.h
#	MacOSX/SDL2.framework/Versions/A/Headers/SDL_stdinc.h
#	MacOSX/SDL2.framework/Versions/A/SDL2
#	MacOSX/codecs/include/xmp.h
#	MacOSX/codecs/lib/libmpg123.dylib
#	MacOSX/codecs/lib/libopusfile.dylib
#	MacOSX/codecs/lib/libxmp.dylib
#	Misc/pak/default.cfg.diff
#	Misc/pak/default.cfg.orig
#	Misc/pak/maps/e1m1.diff
#	Misc/pak/maps/e1m1.ent.orig
#	Misc/pak/maps/e1m2.diff
#	Misc/pak/maps/e1m2.ent.orig
#	Misc/pak/maps/e1m4.diff
#	Misc/pak/maps/e1m4.ent.orig
#	Misc/pak/maps/e2m2.diff
#	Misc/pak/maps/e2m2.ent.orig
#	Misc/pak/maps/e2m3.diff
#	Misc/pak/maps/e2m3.ent.orig
#	Misc/pak/maps/e2m7.diff
#	Misc/pak/maps/e2m7.ent.orig
#	Quake/Makefile
#	Quake/Makefile.darwin
#	Quake/Makefile.w32
#	Quake/Makefile.w64
#	Quake/Makefile.wat
#	Quake/cl_demo.c
#	Quake/cl_main.c
#	Quake/cmd.c
#	Quake/common.c
#	Quake/common.h
#	Quake/gl_mesh.c
#	Quake/gl_model.c
#	Quake/gl_refrag.c
#	Quake/gl_rlight.c
#	Quake/gl_rmain.c
#	Quake/gl_rmisc.c
#	Quake/gl_texmgr.c
#	Quake/gl_texmgr.h
#	Quake/gl_vidsdl.c
#	Quake/gl_warp.c
#	Quake/glquake.h
#	Quake/host.c
#	Quake/host_cmd.c
#	Quake/image.c
#	Quake/in_sdl.c
#	Quake/menu.c
#	Quake/pr_cmds.c
#	Quake/progs.h
#	Quake/r_alias.c
#	Quake/r_brush.c
#	Quake/r_part.c
#	Quake/r_world.c
#	Quake/render.h
#	Quake/sbar.c
#	Quake/server.h
#	Quake/snd_wave.c
#	Quake/sv_main.c
#	Quake/sv_phys.c
#	Quake/sys_sdl_unix.c
#	Windows/VS2005/quakespasm-sdl2.vcproj
#	Windows/VS2005/quakespasm.vcproj
#	Windows/VisualStudio/ironwail.sln

Linux/sgml/Quakespasm.sgml

@@ -3,7 +3,7 @@
 <title>QuakeSpasm
 <toc>
 
-<em>Page last edited: October 2022.</em>
+<em>Page last edited: September 2023.</em>
 
 <sect>About<p>
 
@@ -24,7 +24,6 @@ but no CD-ROM support.
 <item><url url="https://github.com/sezero/quakespasm" name="Github mirror.">
 </itemize>
 
-
 <sect>Hints<p>
 <em>Visit the <url url="https://celephais.net/fitzquake/" name="FitzQuake homepage"> for a full run-down of the engine's commands and variables.</em>
 <itemize>
@@ -64,13 +63,17 @@ If your controller doesn't work you can try placing <url url="https://raw.github
 
 <sect2>Cvars<p>
 <itemize>
-<item>joy_deadzone - Fraction of the stick travel to be deadzone, between 0 and 1. Default 0.175.
+<item>joy_deadzone_look - Fraction of look stick travel to be deadzone, between 0 and 1. Default is 0.175.
+<item>joy_deadzone_move - Same as above, but for the move stick. Default is 0.175.
 <item>joy_deadzone_trigger - Fraction of trigger range required to register a button press on the analog triggers, between 0 and 1. Default 0.2.
-<item>joy_sensitivity_yaw/pitch - Max angular speed in degrees/second when looking. Defaults are 300 for yaw (turning left/right) and 150 for pitch (up/down).
-<item>joy_exponent - For the look stick, the stick displacement (between 0 and 1) is raised to this power. Default is 3. A value of 1 would give a linear relationship between stick displacement and fraction of the maximum angular speed.
+<item>joy_outer_threshold_look - Outer deadzone for the look stick, between 0 and 1. Default 0.02.
+<item>joy_outer_threshold_move - Outer deadzone for the move stick, between 0 and 1. Default 0.02.
+<item>joy_sensitivity_yaw/pitch - Max angular speed in degrees/second when looking. Defaults are 240 for yaw (turning left/right) and 130 for pitch (up/down).
+<item>joy_exponent - For the look stick, the stick displacement (between 0 and 1) is raised to this power. Default is 2. A value of 1 would give a linear relationship between stick displacement and fraction of the maximum angular speed.
+<item>joy_exponent_move - Same as joy_exponent but for the move stick. Default is 2.
 <item>joy_invert - Set to 1 to invert the vertical axis of the look stick.
-<item>joy_swapmovelook - Set to 1 to swap the left and right analog stick functions. Default 0, move on the left stick, look on the right stick.
-<item>joy_enable - Set to 0 to disable controller support. Default 1.
+<item>joy_swapmovelook - Set to 1 to swap the left and right analog stick functions. Default is 0, move on the left stick, look on the right stick.
+<item>joy_enable - Set to 0 to disable controller support. Default is 1.
 </itemize>
 
 <sect2>Buttons<p>
@@ -136,6 +139,49 @@ QuakeSpasm 0.94 has support for playing the 2021 re-release content: Copy the qu
 
 <sect>Changes<p>
 
+<sect1>Changes in 0.96.1<p>
+<itemize>
+<item> Fix demo recording as client-only after connection to server (was broken by signon changes in 0.96.0. Thanks to Jozsef Szalontai for issue report.)
+<item> Fix potential buffer overflow in COM_Parse(), e.g. with maps with oversized 'wad' fields. (Thanks to Andrei Drexler.)
+<item> Minor code cleanups.
+</itemize>
+</p>
+
+<sect1>Changes in 0.96.0<p>
+<itemize>
+<item> <url url="https://github.com/sezero/quakespasm/pull/51" name="Adjustments"> to joystick defaults and behaviour. See the "Controller support / Cvars" section above.
+<item> Fix for a mouse grabbing issue on macOS.
+<item> Add missing support for <em>-ip</em> command line option on unix / macOS.
+<item> Backport angled sprites code from FTEQW (spriteframetype: 2, must have 8 frames per group.)
+<item> Bump the progs execution runaway loop limit to 16M.
+<item> Add signon buffer fragmentation to fix SZ_GetSpace errors on certain maps when using protocol 999.
+<item> Increased MAX_DATAGRAM to 64000 to overcome packet overflows.
+<item> Bump the MAXALIASFRAMES limit to 1024.
+<item> Fix arrays to have proper sizes in gl mesh code, reflecting MAXALIASTRIS and MAXALIASVERTS correctly. (fixes SIGSEGV in mj4m4/mj4m5.)
+<item> Increased default value of gl_farclip to 65536.
+<item> Increase chase cam target trace distance to allow for chasecam to function in large open maps (useful e.g. for the func_vehicle mod.)
+<item> Raised default maximum number of particles to 16384 (can be set up to 32768 with -particles on the command line.)
+<item> Fix on-screen keyboard showing up suddenly on Steam Deck when starting a map.
+<item> Fix viewmodel interpolation with >10Hz animations.
+<item> Fix a memory leak when exiting game in SDL2 builds.
+<item> Fix a possible crash when handling clipboard data on macOS.
+<item> Fix a potential crash after loading of saved game.
+<item> Fix possible out-of-bound reads when handling progs type sizes.
+<item> Fix Dutch angle VP_PARALLEL_UPRIGHT sprites.
+<item> Fix an issue with lights blending by using 10 bit color depth for lightmaps. (For GLSL mode only.) Disable with "-nopackedpixels", if necessary.
+<item> No relative motions when the window is not focused.
+<item> Status bar and intermission screen tweaks.
+<item> Properly display monster counts > 3 digits.
+<item> Fix console animation with scr_conspeed <= 0.
+<item> Fix mouselook not working upon game quickload during a demo play.
+<item> Haiku operating system support.
+<item> Fix console when server is run noninteractively with stdin redirected from /dev/null.
+<item> Updated Visual Studio project files.
+<item> Minor code cleanups. Updated third party code, e.g. SDL, music codecs, etc.
+<item> Thanks to Andrei Drexler, Alexey Lysiuk, Andrey Budko, Boris I. Bendovsky, Chris Cowan, Maciej Olędzki, Simon McVittie, OscarL, Eric Wasylishen, Jaycie Ewald and Spike for patches.
+</itemize>
+</p>
+
 <sect1>Changes in 0.95.1<p>
 <itemize>
 <item> Allow mixing lit and unlit textures in the same map.

Misc/quake_retexturing_project.patch → Misc/fix_externaltex.patch

@@ -1,5 +1,7 @@
+-- from quake retexturing project
+
 diff --git a/Quake/gl_model.c b/Quake/gl_model.c
-index d193051..783dc4d 100644
+index 239d361..80948f1 100644
 --- a/Quake/gl_model.c
 +++ b/Quake/gl_model.c
 @@ -39,6 +39,8 @@ static void Mod_Print (void);
@@ -11,7 +13,7 @@ index d193051..783dc4d 100644
  static byte	*mod_novis;
  static int	mod_novis_capacity;
 
-@@ -542,6 +544,13 @@ static void Mod_LoadTextures (lump_t *l)
+@@ -549,6 +551,13 @@ static void Mod_LoadTextures (lump_t *l)
  		{
  			if (!q_strncasecmp(tx->name,"sky",3)) //sky texture //also note -- was Q_strncmp, changed to match qbsp
  			{
@@ -25,7 +27,7 @@ index d193051..783dc4d 100644
  				if (loadmodel->bspversion == BSPVERSION_QUAKE64)
  					Sky_LoadTextureQ64 (loadmodel, tx);
  				else
-@@ -596,6 +605,50 @@ static void Mod_LoadTextures (lump_t *l)
+@@ -606,6 +615,50 @@ static void Mod_LoadTextures (lump_t *l)
  				//external textures -- first look in "textures/mapname/" then look in "textures/"
  				mark = Hunk_LowMark ();
  				COM_StripExtension (loadmodel->name + 5, mapname, sizeof(mapname));
@@ -77,10 +79,10 @@ index d193051..783dc4d 100644
  				data = Image_LoadImage (filename, &fwidth, &fheight);
  				if (!data)
 diff --git a/Quake/gl_rmain.c b/Quake/gl_rmain.c
-index 332ab1e..783a9d6 100644
+index 6883161..4a8a745 100644
 --- a/Quake/gl_rmain.c
 +++ b/Quake/gl_rmain.c
-@@ -99,6 +99,8 @@ cvar_t	r_noshadow_list = {"r_noshadow_list", "progs/flame2.mdl,progs/flame.mdl,p
+@@ -100,6 +100,8 @@ cvar_t	r_noshadow_list = {"r_noshadow_list", "progs/flame2.mdl,progs/flame.mdl,p
  extern cvar_t	r_vfog;
  //johnfitz
 
@@ -90,7 +92,7 @@ index 332ab1e..783a9d6 100644
 
  cvar_t	r_lavaalpha = {"r_lavaalpha","0",CVAR_NONE};
 diff --git a/Quake/gl_rmisc.c b/Quake/gl_rmisc.c
-index dc3dff0..dbfe922 100644
+index 93791f6..4006c5d 100644
 --- a/Quake/gl_rmisc.c
 +++ b/Quake/gl_rmisc.c
 @@ -47,6 +47,7 @@ extern cvar_t r_nolerp_list;
@@ -101,11 +103,11 @@ index dc3dff0..dbfe922 100644
 
  extern gltexture_t *playertextures[MAX_SCOREBOARD]; //johnfitz
 
-@@ -218,6 +219,7 @@ void R_Init (void)
- 	Cvar_RegisterVariable (&r_noshadow_list);
- 	Cvar_SetCallback (&r_noshadow_list, R_Model_ExtraFlags_List_f);
- 	//johnfitz
-+	Cvar_RegisterVariable (&r_externaltexture_fix); //mk
+@@ -231,6 +232,7 @@ void R_Init (void)
+ 	Cvar_SetCallback (&r_lavaalpha, R_SetLavaalpha_f);
+ 	Cvar_SetCallback (&r_telealpha, R_SetTelealpha_f);
+ 	Cvar_SetCallback (&r_slimealpha, R_SetSlimealpha_f);
++	Cvar_RegisterVariable (&r_externaltexture_fix);//mk
 
- 	Cvar_RegisterVariable (&gl_zfix); // QuakeSpasm z-fighting fix
- 	Cvar_RegisterVariable (&r_lavaalpha);
+ 	R_InitParticles ();
+ 	R_SetClearColor_f (&r_clearcolor); //johnfitz

Misc/fs_search_order.patch

@@ -1,10 +1,10 @@
-allow plain files to override files inside a PAK file -- Sander van Dijk.
+allow plain files to override files inside a PAK -- Sander van Dijk.
 
 diff --git a/Quake/common.c b/Quake/common.c
-index eff4c30..1478d77 100644
+index c80450f..6074711 100644
 --- a/Quake/common.c
 +++ b/Quake/common.c
-@@ -2030,13 +2030,6 @@ static void COM_AddGameDirectory (const char *base, const char *dir)
+@@ -2107,13 +2107,6 @@ static void COM_AddGameDirectory (const char *base, const char *dir)
  	else	path_id = 1U;
 
  _add_path:
@@ -18,7 +18,7 @@ index eff4c30..1478d77 100644
  	// add any pak files in the format pak0.pak pak1.pak, ...
  	for (i = 0; ; i++)
  	{
-@@ -2068,6 +2061,13 @@ _add_path:
+@@ -2145,6 +2138,13 @@ _add_path:
  		if (!pak) break;
  	}
 
@@ -32,4 +32,3 @@ index eff4c30..1478d77 100644
  	if (!been_here && host_parms->userdir != host_parms->basedir)
  	{
  		been_here = true;
-

Misc/pak/default.cfg.diff

@@ -0,0 +1,76 @@
+--- default.cfg~
++++ default.cfg
+@@ -12,24 +12,26 @@
+ bind	ALT				+strafe
+
+ bind	,				+moveleft
++bind	a				+moveleft
+ bind	.				+moveright
++bind	d				+moveright
+ bind	DEL				+lookdown
+ bind	PGDN			+lookup
+ bind	END				centerview
+-bind	z				+lookdown
+-bind	a				+lookup
+
+-bind	d				+moveup
++bind	e				+moveup
+ bind	c				+movedown
+ bind	SHIFT			+speed
+ bind	CTRL			+attack
+ bind	UPARROW			+forward
++bind	w			+forward
+ bind	DOWNARROW		+back
++bind	s			+back
+ bind	LEFTARROW		+left
+ bind	RIGHTARROW		+right
+
+ bind	SPACE			+jump 
+-bind	ENTER			+jump
++//bind	ENTER			+jump
+
+ bind	TAB				+showscores
+
+@@ -45,6 +47,8 @@
+ bind	0				"impulse 0"
+
+ bind	/				"impulse 10"		// change weapon
++bind	MWHEELDOWN			"impulse 10"
++bind	MWHEELUP			"impulse 12"
+
+ // zoom
+ alias zoom_in "sensitivity 2;fov 90;wait;fov 70;wait;fov 50;wait;fov 30;wait;fov 10;wait;fov 5;bind F11 zoom_out"
+@@ -85,14 +89,30 @@
+ // mouse buttons
+ //
+ bind	MOUSE1		+attack
+-bind	MOUSE2		+forward
+-bind	MOUSE3		+mlook
++//bind	MOUSE2		+forward
++bind	MOUSE2		+jump
++//bind	MOUSE3		+mlook
++
++//
++// game controller
++//
++bind	LSHOULDER	"impulse 12"
++bind	RSHOULDER	"impulse 10"
++bind	LTRIGGER	+jump
++bind	RTRIGGER	+attack
+
+ //
+ // default cvars
+ //
+-viewsize 		100
+ gamma 			1.0
+ volume 			0.7
+ sensitivity 	3
+
++//viewsize 		100
++viewsize		110
++scr_conscale	1.6
++scr_menuscale	1.6
++scr_sbarscale	1.6
++
++// default to mouse-look enabled
+++mlook

Misc/pak/maps/e1m1.diff

@@ -0,0 +1,18 @@
+--- e1m1.ent
++++ [email protected]
+@@ -715,14 +715,15 @@
+ {
+ "classname" "func_door"
+ "targetname" "t4"
+ "angle" "-2"
+ "spawnflags" "1"
+ "sounds" "2"
+ "model" "*15"
++"lip" "7" // svdijk -- added to prevent z-fighting
+ }
+ {
+ "classname" "trigger_multiple"
+ "target" "t4"
+ "health" "1"
+ "model" "*16"
+ }