diff --git a/Linux/sgml/Quakespasm.sgml b/Linux/sgml/Quakespasm.sgml index 6a1a99ed..851da1db 100644 --- a/Linux/sgml/Quakespasm.sgml +++ b/Linux/sgml/Quakespasm.sgml @@ -50,7 +50,7 @@ Quakespasm can play various external music formats, including MP3, OGG and FLAC. Tracks should be named like "track02.ogg", "track03.ogg" ... (there is no track01) and placed into "Quake/id1/music". Unix users may need some extra libraries installed: "libmad" or "libmpg123" for MP3, and "libogg" and "libvorbis" for OGG. -As of 0.85.10, music is played back at 44100Hz by default with no need to adjust "-sndspeed". +As of 0.90.0, music is played back at 44100Hz by default with no need to adjust "-sndspeed". Use the "-noextmusic" option to disable this feature. See for more details. @@ -105,7 +105,7 @@ OS X has a well known gamma issue where the screen turns dark, but we currently Changes

- Changes in 0.85.10

+ Changes in 0.90.0

Unix/Mac user directories support. Disabled by default, 'make DO_USERDIRS=1' to enable it. Revised/improved the 'game' command, i.e. on-the-fly mod changing. It now accepts an optional second argument for mission packs or quoth support i.e. -hipnotic, -rogue, or -quoth. For example, for WarpSpasm: "game warp -quoth" @@ -140,6 +140,7 @@ OS X has a well known gamma issue where the screen turns dark, but we currently Add 'prev' and 'next' keywords to the 'cd' command. Work around a linux cdrom issue (playback might not start for a while after a stop). Quakespasm content customization moved from engine-embedded into a new optional quakespasm.pak file. + Version bumped to 0.90.0 (because Quakespasm has a decent life of it's own) Other fixes and clean-ups.

diff --git a/MacOSX/English.lproj/InfoPlist.strings b/MacOSX/English.lproj/InfoPlist.strings index 8956cd02..1cb0b16b 100644 Binary files a/MacOSX/English.lproj/InfoPlist.strings and b/MacOSX/English.lproj/InfoPlist.strings differ diff --git a/MacOSX/Info.plist b/MacOSX/Info.plist index 1d039ae5..ad185351 100644 --- a/MacOSX/Info.plist +++ b/MacOSX/Info.plist @@ -17,7 +17,7 @@ CFBundlePackageType APPL CFBundleShortVersionString - 0.85.10 + 0.90.0 CFBundleSignature ???? LSApplicationCategoryType diff --git a/Quake/console.c b/Quake/console.c index c730633f..9f46adf7 100644 --- a/Quake/console.c +++ b/Quake/console.c @@ -1207,7 +1207,7 @@ void Con_DrawConsole (int lines, qboolean drawinput) //draw version number in bottom right y += 8; - sprintf (ver, "QuakeSpasm %1.2f.%d", (float)FITZQUAKE_VERSION, QUAKESPASM_VER_PATCH); + sprintf (ver, "QuakeSpasm %1.2f.%d", (float)QUAKESPASM_VERSION, QUAKESPASM_VER_PATCH); for (x = 0; x < (int)strlen(ver); x++) Draw_Character ((con_linewidth - strlen(ver) + x + 2)<<3, y, ver[x] /*+ 128*/); } diff --git a/Quake/gl_vidsdl.c b/Quake/gl_vidsdl.c index 544a025f..dd9ddf58 100644 --- a/Quake/gl_vidsdl.c +++ b/Quake/gl_vidsdl.c @@ -476,7 +476,7 @@ static int VID_SetMode (int width, int height, int bpp, qboolean fullscreen) SDL_GL_SetAttribute(SDL_GL_MULTISAMPLEBUFFERS, fsaa > 0 ? 1 : 0); SDL_GL_SetAttribute(SDL_GL_MULTISAMPLESAMPLES, fsaa); - q_snprintf(caption, sizeof(caption), "QuakeSpasm %1.2f.%d", (float)FITZQUAKE_VERSION, QUAKESPASM_VER_PATCH); + q_snprintf(caption, sizeof(caption), "QuakeSpasm %1.2f.%d", (float)QUAKESPASM_VERSION, QUAKESPASM_VER_PATCH); #if defined(USE_SDL2) /* Create the window if needed, hidden */ diff --git a/Quake/host.c b/Quake/host.c index 22f18028..dba2a719 100644 --- a/Quake/host.c +++ b/Quake/host.c @@ -219,7 +219,7 @@ void Host_FindMaxClients (void) void Host_Version_f (void) { Con_Printf ("Quake Version %1.2f\n", VERSION); - Con_Printf ("QuakeSpasm Version %1.2f.%d\n", FITZQUAKE_VERSION, QUAKESPASM_VER_PATCH); + Con_Printf ("QuakeSpasm Version %1.2f.%d\n", QUAKESPASM_VERSION, QUAKESPASM_VER_PATCH); Con_Printf ("Exe: "__TIME__" "__DATE__"\n"); } diff --git a/Quake/main_sdl.c b/Quake/main_sdl.c index 23835802..df221de8 100644 --- a/Quake/main_sdl.c +++ b/Quake/main_sdl.c @@ -129,7 +129,7 @@ int main(int argc, char *argv[]) Sys_Printf("FitzQuake %1.2f (c) John Fitzgibbons\n", FITZQUAKE_VERSION); Sys_Printf("FitzQuake SDL port (c) SleepwalkR, Baker\n"); Sys_Printf("QuakeSpasm %1.2f.%d (c) Ozkan Sezer, Stevenaaus\n", - FITZQUAKE_VERSION, QUAKESPASM_VER_PATCH); + QUAKESPASM_VERSION, QUAKESPASM_VER_PATCH); Sys_Printf("Host_Init\n"); Host_Init(); diff --git a/Quake/menu.c b/Quake/menu.c index 8205db70..8dad77c8 100644 --- a/Quake/menu.c +++ b/Quake/menu.c @@ -1607,7 +1607,7 @@ void M_Quit_Draw (void) //johnfitz -- modified for new quit message m_state = m_quit; } - sprintf(msg1, "QuakeSpasm %1.2f.%d", (float)FITZQUAKE_VERSION, QUAKESPASM_VER_PATCH); + sprintf(msg1, "QuakeSpasm %1.2f.%d", (float)QUAKESPASM_VERSION, QUAKESPASM_VER_PATCH); //okay, this is kind of fucked up. M_DrawTextBox will always act as if //width is even. Also, the width and lines values are for the interior of the box, diff --git a/Quake/quakedef.h b/Quake/quakedef.h index 537ccb87..2c21c03a 100644 --- a/Quake/quakedef.h +++ b/Quake/quakedef.h @@ -35,8 +35,8 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #define X11_VERSION 1.10 #define FITZQUAKE_VERSION 0.85 //johnfitz -#define QUAKESPASM_VERSION 0.10 -#define QUAKESPASM_VER_PATCH 10 // helper to print a string like 0.85.10 +#define QUAKESPASM_VERSION 0.90 +#define QUAKESPASM_VER_PATCH 0 // helper to print a string like 0.90.0 //define PARANOID // speed sapping error checking diff --git a/Quakespasm.html b/Quakespasm.html index 314e291f..8417b792 100644 --- a/Quakespasm.html +++ b/Quakespasm.html @@ -40,7 +40,7 @@

6. Changes