Fixes

.github/workflows/windows_ci.yml

@@ -37,7 +37,6 @@ jobs:
         & $msbuild Windows\VisualStudio\ironwail.sln $options
         if (-not $?) { throw "Build failed" }
     - name: Prepare archive
-      if: github.ref == 'refs/heads/master' && github.event_name != 'pull_request'
       run: |
             $compiledir = "Windows\VisualStudio\${env:BUILD_DIR}"
             $zipdir = "artifact\${env:BUILD_ARTIFACT}"
@@ -50,8 +49,7 @@ jobs:
             copy Quakespasm-Music.txt $zipdir
             copy LICENSE.txt $zipdir
     - name: Upload archive
-      if: github.ref == 'refs/heads/master' && github.event_name != 'pull_request'
       uses: actions/upload-artifact@v4
       with:
-        name: ${{ env.BUILD_ARTIFACT }}
+        name: ${{ (github.event_name == 'pull_request' || github.ref_name != 'master') && 'CAUTION-WIP-' || '' }}${{ env.BUILD_ARTIFACT }}
         path: artifact/*

Quake/cl_input.c

@@ -271,7 +271,10 @@ void CL_AdjustAngles (void)
 	float	up, down;
 
 	if (CL_InCutscene ())
+	{
+		V_StopPitchDrift ();
 		return;
+	}
 
 	if ((in_speed.state & 1) ^ (cl_alwaysrun.value != 0.0))
 		speed = host_frametime * cl_anglespeedkey.value;

Quake/cmd.c

@@ -529,6 +529,16 @@ qboolean Cmd_IsReservedName (const char *name)
 	return name[0] == '_' && name[1] == '_';
 }
 
+/*
+============
+Cmd_IsGamepadAltModifier
+============
+*/
+qboolean Cmd_IsGamepadAltModifier (const char *name)
+{
+	return name && !strcmp (name, "+altmodifier");
+}
+
 /*
 ============
 Cmd_List_f -- johnfitz

Quake/cmd.h

@@ -145,6 +145,7 @@ void	Cmd_ForwardToServer (void);
 // so when they are typed in at the console, they will need to be forwarded.
 
 qboolean Cmd_IsReservedName (const char *name);
+qboolean Cmd_IsGamepadAltModifier (const char *name);
 
 #endif	/* _QUAKE_CMD_H */
 

Quake/common.c

@@ -1959,6 +1959,24 @@ static int COM_FindFile (const char *filename, int *handle, FILE **file,
 
 		if (strcmp(ext, "pcx") != 0 &&
 			strcmp(ext, "tga") != 0 &&
+			strcmp(ext, "png") != 0 &&
+			strcmp(ext, "jpg") != 0 &&
+			strcmp(ext, "lmp") != 0 &&
+			// music formats
+			strcmp (ext, "ogg") != 0 &&
+			strcmp (ext, "opus") != 0 &&
+			strcmp (ext, "flac") != 0 &&
+			strcmp (ext, "wav") != 0 &&
+			strcmp (ext, "it") != 0 &&
+			strcmp (ext, "s3m") != 0 &&
+			strcmp (ext, "xm") != 0 &&
+			strcmp (ext, "mod") != 0 &&
+			strcmp (ext, "umx") != 0 &&
+			// alternate model formats
+			strcmp(ext, "md5mesh") != 0 &&
+			strcmp (ext, "md3") != 0 &&
+			strcmp (ext, "skin") != 0 &&
+			// optional map files
 			strcmp(ext, "lit") != 0 &&
 			strcmp(ext, "vis") != 0 &&
 			strcmp(ext, "ent") != 0)

Quake/console.c

@@ -503,6 +503,18 @@ static void Con_ApplyMouseSelection (void)
 		con_selection.end = tmp;
 	}
 
+	// If the starting point is beyond the newline, move to the beginning of the next line
+	line = Con_GetLine (con_selection.begin.line);
+	len = (int) Con_StrLen (con_selection.begin.line);
+	if (con_selection.begin.col > len)
+	{
+		con_selection.begin.line++;
+		con_selection.begin.col = 0;
+		// Fix up the end point if necessary
+		if (Con_OfsCompare (&con_selection.begin, &con_selection.end) > 0)
+			con_selection.end = con_selection.begin;
+	}
+
 	// Selecting character by character? Nothing left to do
 	if (con_mouseclicks <= 1)
 		return;

Quake/gl_draw.c

@@ -224,7 +224,7 @@ Scrap_Upload -- johnfitz -- now uses TexMgr
 void Scrap_Upload (void)
 {
 	scrap_texture = TexMgr_LoadImage (NULL, "scrap", SCRAP_ATLAS_WIDTH, SCRAP_ATLAS_HEIGHT, SRC_INDEXED, scrap_texels,
-		"", (src_offset_t)scrap_texels, TEXPREF_ALPHA | TEXPREF_OVERWRITE | TEXPREF_NOPICMIP);
+		"", (src_offset_t)scrap_texels, TEXPREF_ALPHA | TEXPREF_OVERWRITE | TEXPREF_NOPICMIP | TEXPREF_UNCOMPRESSED);
 	scrap_dirty = false;
 }
 
@@ -343,7 +343,7 @@ qpic_t *Draw_PicFromWad2 (const char *name, unsigned int texflags)
 
 qpic_t *Draw_PicFromWad (const char *name)
 {
-	return Draw_PicFromWad2 (name, TEXPREF_ALPHA | TEXPREF_PAD | TEXPREF_NOPICMIP);
+	return Draw_PicFromWad2 (name, TEXPREF_ALPHA | TEXPREF_PAD | TEXPREF_NOPICMIP | TEXPREF_UNCOMPRESSED);
 }
 
 /*
@@ -412,7 +412,7 @@ qpic_t	*Draw_TryCachePic (const char *path, unsigned int texflags)
 
 qpic_t	*Draw_CachePic (const char *path)
 {
-	qpic_t *pic = Draw_TryCachePic(path, TEXPREF_ALPHA | TEXPREF_PAD | TEXPREF_NOPICMIP | TEXPREF_CLAMP);
+	qpic_t *pic = Draw_TryCachePic(path, TEXPREF_ALPHA | TEXPREF_PAD | TEXPREF_NOPICMIP | TEXPREF_CLAMP | TEXPREF_UNCOMPRESSED);
 	if (!pic)
 		Sys_Error ("Draw_CachePic: failed to load %s", path);
 	return pic;
@@ -425,7 +425,7 @@ Draw_MakePic -- johnfitz -- generate pics from internal data
 */
 qpic_t *Draw_MakePic (const char *name, int width, int height, byte *data)
 {
-	int flags = TEXPREF_NEAREST | TEXPREF_ALPHA | TEXPREF_PERSIST | TEXPREF_NOPICMIP | TEXPREF_PAD;
+	int flags = TEXPREF_NEAREST | TEXPREF_ALPHA | TEXPREF_PERSIST | TEXPREF_NOPICMIP | TEXPREF_PAD | TEXPREF_UNCOMPRESSED;
 	qpic_t		*pic;
 	glpic_t		gl;
 
@@ -476,10 +476,10 @@ void Draw_LoadPics (void)
 			char_texture_data + row*(16*10*10) + col*10, 16*10);
 	}
 	char_texture = TexMgr_LoadImage (NULL, WADFILENAME":conchars", 16*10, 16*10, SRC_INDEXED, char_texture_data,
-		"", (src_offset_t) char_texture_data, TEXPREF_ALPHA | TEXPREF_NEAREST | TEXPREF_NOPICMIP | TEXPREF_CONCHARS);
+		"", (src_offset_t) char_texture_data, TEXPREF_ALPHA | TEXPREF_NEAREST | TEXPREF_NOPICMIP | TEXPREF_CONCHARS | TEXPREF_UNCOMPRESSED);
 
 	draw_disc = Draw_PicFromWad ("disc");
-	draw_backtile = Draw_PicFromWad2 ("backtile", TEXPREF_ALPHA | TEXPREF_NOPICMIP); // no pad flag to force separate allocation
+	draw_backtile = Draw_PicFromWad2 ("backtile", TEXPREF_ALPHA | TEXPREF_NOPICMIP | TEXPREF_UNCOMPRESSED); // no pad flag to force separate allocation
 }
 
 /*
@@ -526,7 +526,7 @@ static void Draw_CreateWinQuakeMenuBgTex (void)
 
 	winquakemenubg = TexMgr_LoadImage (NULL, "winquakemenubg", 4, 2, SRC_RGBA,
 		(byte*)winquakemenubg_pixels, "", (src_offset_t)winquakemenubg_pixels,
-		TEXPREF_ALPHA | TEXPREF_NEAREST | TEXPREF_PERSIST | TEXPREF_NOPICMIP
+		TEXPREF_ALPHA | TEXPREF_NEAREST | TEXPREF_PERSIST | TEXPREF_NOPICMIP | TEXPREF_UNCOMPRESSED
 	);
 }