fte/quakespasm
2
0
Fork 0
mirror of https://github.com/Shpoike/Quakespasm.git synced 2024-11-10 07:21:58 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge remote-tracking branch 'sf/master' into qss

Browse source
This commit is contained in:
Shpoike 2021-09-11 04:49:40 +01:00
commit bad54d50cf
21 changed files with 213 additions and 152 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
Linux/sgml/Quakespasm.sgml
View file

@ -3,7 +3,7 @@
<title>QuakeSpasm
<toc>
<em>Page last edited: August 2021</em>
<em>Page last edited: Sep. 2021</em>
<sect> About <p>
@ -140,6 +140,12 @@ QuakeSpasm 0.94.0 has initial support for playing the 2021 re-release content: C
<sect> Changes<p>
<sect1> Changes in 0.94.1<p>
<itemize>
<item> Fix lightmap issues after vkQuake surface mark/cull optimizations merge (sf.net bug/50)
</itemize>
</p>
<sect1> Changes in 0.94.0<p>
<itemize>
<item> Initial support for playing the 'Quake 2021 re-release' content (thanks to Andrei Drexler for bulk of the work, Guillaume Plourde for Q64 bsp format support.)

BIN
MacOSX/English.lproj/InfoPlist.strings
View file

Binary file not shown.

2
MacOSX/Info.plist
View file

@ -17,7 +17,7 @@
<key>CFBundlePackageType</key>
<string>APPL</string>
<key>CFBundleShortVersionString</key>
<string>0.94.0</string>
<string>0.94.1</string>
<key>CFBundleSignature</key>
<string>????</string>
<key>LSApplicationCategoryType</key>

36
MacOSX/QuakeSpasm.xcodeproj/project.pbxproj
View file

@ -105,6 +105,8 @@
48E2EC8815FB516600B8D476 /* libvorbis.dylib in Copy Libraries */ = {isa = PBXBuildFile; fileRef = 48E2EC7B15FB507A00B8D476 /* libvorbis.dylib */; };
48E2EC8915FB516600B8D476 /* libvorbisfile.dylib in Copy Libraries */ = {isa = PBXBuildFile; fileRef = 48E2EC7C15FB507A00B8D476 /* libvorbisfile.dylib */; };
48FE585B0D3A82C8006BB491 /* QuakeArguments.m in Sources */ = {isa = PBXBuildFile; fileRef = 48FE585A0D3A82C8006BB491 /* QuakeArguments.m */; };
6348AF9126EA46F500E036E2 /* snd_xmp.c in Sources */ = {isa = PBXBuildFile; fileRef = 6348AF8F26EA46F500E036E2 /* snd_xmp.c */; };
6348AF9226EA46F500E036E2 /* snd_xmp.c in Sources */ = {isa = PBXBuildFile; fileRef = 6348AF8F26EA46F500E036E2 /* snd_xmp.c */; };
63D6EB3523A255900047028C /* snd_mp3tag.c in Sources */ = {isa = PBXBuildFile; fileRef = 63D6EB3423A255900047028C /* snd_mp3tag.c */; };
63D6EB3623A255900047028C /* snd_mp3tag.c in Sources */ = {isa = PBXBuildFile; fileRef = 63D6EB3423A255900047028C /* snd_mp3tag.c */; };
664D988A19CF6B78000D395C /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = 089C165CFE840E0CC02AAC07 /* InfoPlist.strings */; };
@ -372,7 +374,6 @@
483A77FF0D2EE9F300CB2E4C /* anorm_dots.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = anorm_dots.h; path = ../Quake/anorm_dots.h; sourceTree = SOURCE_ROOT; };
483A78000D2EE9F300CB2E4C /* anorms.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = anorms.h; path = ../Quake/anorms.h; sourceTree = SOURCE_ROOT; };
483A78010D2EE9F300CB2E4C /* bspfile.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = bspfile.h; path = ../Quake/bspfile.h; sourceTree = SOURCE_ROOT; };
483A78020D2EE9F300CB2E4C /* d_ifacea.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = d_ifacea.h; path = ../Quake/d_ifacea.h; sourceTree = SOURCE_ROOT; };
483A78030D2EE9F300CB2E4C /* draw.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = draw.h; path = ../Quake/draw.h; sourceTree = SOURCE_ROOT; };
483A78040D2EE9F300CB2E4C /* gl_model.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = gl_model.h; path = ../Quake/gl_model.h; sourceTree = SOURCE_ROOT; };
483A78050D2EE9F300CB2E4C /* gl_texmgr.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = gl_texmgr.h; path = ../Quake/gl_texmgr.h; sourceTree = SOURCE_ROOT; };
@ -472,6 +473,21 @@
48E2EC7C15FB507A00B8D476 /* libvorbisfile.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libvorbisfile.dylib; path = codecs/lib/libvorbisfile.dylib; sourceTree = "<group>"; };
48FE58590D3A82C8006BB491 /* QuakeArguments.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = QuakeArguments.h; sourceTree = "<group>"; };
48FE585A0D3A82C8006BB491 /* QuakeArguments.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = QuakeArguments.m; sourceTree = "<group>"; };
631F459F26EA4AF60054208C /* snd_mpg123.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = snd_mpg123.c; path = ../Quake/snd_mpg123.c; sourceTree = SOURCE_ROOT; };
6348AF7D26EA437E00E036E2 /* default_cfg.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = default_cfg.h; path = ../Quake/default_cfg.h; sourceTree = SOURCE_ROOT; };
6348AF7E26EA438E00E036E2 /* arch_def.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = arch_def.h; path = ../Quake/arch_def.h; sourceTree = SOURCE_ROOT; };
6348AF7F26EA439C00E036E2 /* filenames.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = filenames.h; path = ../Quake/filenames.h; sourceTree = SOURCE_ROOT; };
6348AF8026EA45A600E036E2 /* lodepng.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = lodepng.c; path = ../Quake/lodepng.c; sourceTree = SOURCE_ROOT; };
6348AF8126EA45A600E036E2 /* lodepng.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = lodepng.h; path = ../Quake/lodepng.h; sourceTree = SOURCE_ROOT; };
6348AF8826EA466800E036E2 /* net_sys.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = net_sys.h; path = ../Quake/net_sys.h; sourceTree = SOURCE_ROOT; };
6348AF8926EA468900E036E2 /* q_ctype.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = q_ctype.h; path = ../Quake/q_ctype.h; sourceTree = SOURCE_ROOT; };
6348AF8A26EA469F00E036E2 /* q_stdinc.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = q_stdinc.h; path = ../Quake/q_stdinc.h; sourceTree = SOURCE_ROOT; };
6348AF8B26EA469F00E036E2 /* qs_bmp.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = qs_bmp.h; path = ../Quake/qs_bmp.h; sourceTree = SOURCE_ROOT; };
6348AF8C26EA46B700E036E2 /* snd_mikmod.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = snd_mikmod.h; path = ../Quake/snd_mikmod.h; sourceTree = SOURCE_ROOT; };
6348AF8D26EA46D300E036E2 /* snd_umx.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = snd_umx.h; path = ../Quake/snd_umx.h; sourceTree = SOURCE_ROOT; };
6348AF8E26EA46E600E036E2 /* stb_image_write.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = stb_image_write.h; path = ../Quake/stb_image_write.h; sourceTree = SOURCE_ROOT; };
6348AF8F26EA46F500E036E2 /* snd_xmp.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = snd_xmp.c; path = ../Quake/snd_xmp.c; sourceTree = SOURCE_ROOT; };
6348AF9026EA46F500E036E2 /* snd_xmp.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = snd_xmp.h; path = ../Quake/snd_xmp.h; sourceTree = SOURCE_ROOT; };
63D6EB3423A255900047028C /* snd_mp3tag.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = snd_mp3tag.c; path = ../Quake/snd_mp3tag.c; sourceTree = SOURCE_ROOT; };
664D98F919CF6B78000D395C /* QuakeSpasm-SDL2.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "QuakeSpasm-SDL2.app"; sourceTree = BUILT_PRODUCTS_DIR; };
664D98FB19CF6B78000D395C /* Info copy.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = "Info copy.plist"; sourceTree = "<group>"; };
@ -697,6 +713,7 @@
483A78660D2EEAF000CB2E4C /* gl_vidsdl.c */,
483A78670D2EEAF000CB2E4C /* gl_warp.c */,
483A78680D2EEAF000CB2E4C /* image.c */,
6348AF8026EA45A600E036E2 /* lodepng.c */,
483A78690D2EEAF000CB2E4C /* r_alias.c */,
483A786A0D2EEAF000CB2E4C /* r_brush.c */,
483A786B0D2EEAF000CB2E4C /* r_part.c */,
@ -719,9 +736,11 @@
486577CA0D31A22A00E7920A /* snd_mix.c */,
483A78540D2EEAC300CB2E4C /* snd_sdl.c */,
4854B1B01340C646004C9F45 /* snd_mp3.c */,
631F459F26EA4AF60054208C /* snd_mpg123.c */,
63D6EB3423A255900047028C /* snd_mp3tag.c */,
4885A84A179740A0000EC703 /* snd_opus.c */,
483A78640D2EEAF000CB2E4C /* snd_mikmod.c */,
6348AF8F26EA46F500E036E2 /* snd_xmp.c */,
4818B0B012D5BA1A006DD66E /* snd_umx.c */,
4818B0B212D5BA1A006DD66E /* snd_vorbis.c */,
4818B0B412D5BA1A006DD66E /* snd_wave.c */,
@ -754,12 +773,15 @@
483A77DE0D2EE8FB00CB2E4C /* Headers */ = {
isa = PBXGroup;
children = (
6348AF7E26EA438E00E036E2 /* arch_def.h */,
B021C20814A5FF7E003F18D6 /* cfgfile.h */,
483A77E60D2EE97700CB2E4C /* cmd.h */,
483A77E70D2EE97700CB2E4C /* common.h */,
483A77E80D2EE97700CB2E4C /* console.h */,
483A77E90D2EE97700CB2E4C /* crc.h */,
483A77EA0D2EE97700CB2E4C /* cvar.h */,
6348AF7D26EA437E00E036E2 /* default_cfg.h */,
6348AF7F26EA439C00E036E2 /* filenames.h */,
483A77EB0D2EE97700CB2E4C /* mathlib.h */,
483A77EC0D2EE97700CB2E4C /* menu.h */,
4846EB500D329BEB00A108DE /* platform.h */,
@ -767,6 +789,8 @@
483A77EE0D2EE97700CB2E4C /* progdefs.h */,
483A77EF0D2EE97700CB2E4C /* progs.h */,
483A77F00D2EE97700CB2E4C /* quakedef.h */,
6348AF8926EA468900E036E2 /* q_ctype.h */,
6348AF8A26EA469F00E036E2 /* q_stdinc.h */,
483A77F10D2EE97700CB2E4C /* sbar.h */,
48A7C1F914AA34940011B754 /* strl_fn.h */,
483A77F20D2EE97700CB2E4C /* sys.h */,
@ -796,6 +820,7 @@
48728D290D3004A80004D61B /* net_dgrm.h */,
48728D2B0D3004A80004D61B /* net_loop.h */,
48134A1712102F400015BF15 /* net_udp.h */,
6348AF8826EA466800E036E2 /* net_sys.h */,
483A77FB0D2EE9A900CB2E4C /* protocol.h */,
483A77FC0D2EE9A900CB2E4C /* server.h */,
);
@ -810,6 +835,9 @@
483A77FE0D2EE9BD00CB2E4C /* q_sound.h */,
4818B0AD12D5B9ED006DD66E /* snd_codec.h */,
4818B0AF12D5BA1A006DD66E /* snd_codeci.h */,
6348AF8C26EA46B700E036E2 /* snd_mikmod.h */,
6348AF9026EA46F500E036E2 /* snd_xmp.h */,
6348AF8D26EA46D300E036E2 /* snd_umx.h */,
48281300179C3F13004E1D61 /* snd_flac.h */,
4818B0B112D5BA1A006DD66E /* snd_mp3.h */,
4885A84B179740A0000EC703 /* snd_opus.h */,
@ -825,18 +853,20 @@
483A77FF0D2EE9F300CB2E4C /* anorm_dots.h */,
483A78000D2EE9F300CB2E4C /* anorms.h */,
483A78010D2EE9F300CB2E4C /* bspfile.h */,
483A78020D2EE9F300CB2E4C /* d_ifacea.h */,
483A78030D2EE9F300CB2E4C /* draw.h */,
483A78040D2EE9F300CB2E4C /* gl_model.h */,
483A78050D2EE9F300CB2E4C /* gl_texmgr.h */,
483A78060D2EE9F300CB2E4C /* gl_warp_sin.h */,
483A78070D2EE9F300CB2E4C /* glquake.h */,
483A78080D2EE9F300CB2E4C /* image.h */,
6348AF8126EA45A600E036E2 /* lodepng.h */,
6348AF8E26EA46E600E036E2 /* stb_image_write.h */,
483A78090D2EE9F300CB2E4C /* modelgen.h */,
483A780A0D2EE9F300CB2E4C /* render.h */,
483A780B0D2EE9F300CB2E4C /* screen.h */,
483A780C0D2EE9F300CB2E4C /* spritegn.h */,
483A780D0D2EE9F300CB2E4C /* vid.h */,
6348AF8B26EA469F00E036E2 /* qs_bmp.h */,
);
name = Headers;
sourceTree = "<group>";
@ -1034,6 +1064,7 @@
664D98DB19CF6B78000D395C /* snd_opus.c in Sources */,
664D98DC19CF6B78000D395C /* snd_flac.c in Sources */,
63D6EB3623A255900047028C /* snd_mp3tag.c in Sources */,
6348AF9226EA46F500E036E2 /* snd_xmp.c in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
@ -1121,6 +1152,7 @@
4885A84C179740A0000EC703 /* snd_opus.c in Sources */,
48281301179C3F13004E1D61 /* snd_flac.c in Sources */,
63D6EB3523A255900047028C /* snd_mp3tag.c in Sources */,
6348AF9126EA46F500E036E2 /* snd_xmp.c in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};

37
MacOSX/QuakeSpasmPPC.xcodeproj/project.pbxproj
View file

@ -105,6 +105,7 @@
48E2EC8815FB516600B8D476 /* libvorbis.dylib in Copy Libraries */ = {isa = PBXBuildFile; fileRef = 48E2EC7B15FB507A00B8D476 /* libvorbis.dylib */; };
48E2EC8915FB516600B8D476 /* libvorbisfile.dylib in Copy Libraries */ = {isa = PBXBuildFile; fileRef = 48E2EC7C15FB507A00B8D476 /* libvorbisfile.dylib */; };
48FE585B0D3A82C8006BB491 /* QuakeArguments.m in Sources */ = {isa = PBXBuildFile; fileRef = 48FE585A0D3A82C8006BB491 /* QuakeArguments.m */; };
6339438726EA49FE000D25C3 /* snd_xmp.c in Sources */ = {isa = PBXBuildFile; fileRef = 6339438526EA49FE000D25C3 /* snd_xmp.c */; };
63D6EB5F23A2563B0047028C /* snd_mp3tag.c in Sources */ = {isa = PBXBuildFile; fileRef = 63D6EB5E23A2563B0047028C /* snd_mp3tag.c */; };
8D11072B0486CEB800E47090 /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = 089C165CFE840E0CC02AAC07 /* InfoPlist.strings */; };
8D11072F0486CEB800E47090 /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1058C7A1FEA54F0111CA2CBB /* Cocoa.framework */; };
@ -201,7 +202,6 @@
483A77FF0D2EE9F300CB2E4C /* anorm_dots.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = anorm_dots.h; path = ../Quake/anorm_dots.h; sourceTree = SOURCE_ROOT; };
483A78000D2EE9F300CB2E4C /* anorms.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = anorms.h; path = ../Quake/anorms.h; sourceTree = SOURCE_ROOT; };
483A78010D2EE9F300CB2E4C /* bspfile.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = bspfile.h; path = ../Quake/bspfile.h; sourceTree = SOURCE_ROOT; };
483A78020D2EE9F300CB2E4C /* d_ifacea.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = d_ifacea.h; path = ../Quake/d_ifacea.h; sourceTree = SOURCE_ROOT; };
483A78030D2EE9F300CB2E4C /* draw.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = draw.h; path = ../Quake/draw.h; sourceTree = SOURCE_ROOT; };
483A78040D2EE9F300CB2E4C /* gl_model.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = gl_model.h; path = ../Quake/gl_model.h; sourceTree = SOURCE_ROOT; };
483A78050D2EE9F300CB2E4C /* gl_texmgr.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = gl_texmgr.h; path = ../Quake/gl_texmgr.h; sourceTree = SOURCE_ROOT; };
@ -301,8 +301,23 @@
48E2EC7C15FB507A00B8D476 /* libvorbisfile.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libvorbisfile.dylib; path = codecs/lib/libvorbisfile.dylib; sourceTree = "<group>"; };
48FE58590D3A82C8006BB491 /* QuakeArguments.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = QuakeArguments.h; sourceTree = "<group>"; };
48FE585A0D3A82C8006BB491 /* QuakeArguments.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = QuakeArguments.m; sourceTree = "<group>"; };
664D98FB19CF6B78000D395C /* Info copy.plist */ = {isa = PBXFileReference; lastKnownFileType = file; path = "Info copy.plist"; sourceTree = "<group>"; };
6339437326EA48EA000D25C3 /* arch_def.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = arch_def.h; path = ../Quake/arch_def.h; sourceTree = SOURCE_ROOT; };
6339437626EA48F9000D25C3 /* default_cfg.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = default_cfg.h; path = ../Quake/default_cfg.h; sourceTree = SOURCE_ROOT; };
6339437726EA4907000D25C3 /* filenames.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = filenames.h; path = ../Quake/filenames.h; sourceTree = SOURCE_ROOT; };
6339437826EA4917000D25C3 /* lodepng.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = lodepng.c; path = ../Quake/lodepng.c; sourceTree = SOURCE_ROOT; };
6339437926EA4917000D25C3 /* lodepng.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = lodepng.h; path = ../Quake/lodepng.h; sourceTree = SOURCE_ROOT; };
6339437E26EA4998000D25C3 /* net_sys.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = net_sys.h; path = ../Quake/net_sys.h; sourceTree = SOURCE_ROOT; };
6339437F26EA49AA000D25C3 /* q_ctype.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = q_ctype.h; path = ../Quake/q_ctype.h; sourceTree = SOURCE_ROOT; };
6339438026EA49B7000D25C3 /* q_stdinc.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = q_stdinc.h; path = ../Quake/q_stdinc.h; sourceTree = SOURCE_ROOT; };
6339438126EA49B7000D25C3 /* qs_bmp.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = qs_bmp.h; path = ../Quake/qs_bmp.h; sourceTree = SOURCE_ROOT; };
6339438226EA49CC000D25C3 /* snd_mikmod.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = snd_mikmod.h; path = ../Quake/snd_mikmod.h; sourceTree = SOURCE_ROOT; };
6339438326EA49DD000D25C3 /* snd_umx.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = snd_umx.h; path = ../Quake/snd_umx.h; sourceTree = SOURCE_ROOT; };
6339438426EA49EA000D25C3 /* stb_image_write.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = stb_image_write.h; path = ../Quake/stb_image_write.h; sourceTree = SOURCE_ROOT; };
6339438526EA49FE000D25C3 /* snd_xmp.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = snd_xmp.c; path = ../Quake/snd_xmp.c; sourceTree = SOURCE_ROOT; };
6339438626EA49FE000D25C3 /* snd_xmp.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = snd_xmp.h; path = ../Quake/snd_xmp.h; sourceTree = SOURCE_ROOT; };
6339438826EA4A25000D25C3 /* snd_mpg123.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = snd_mpg123.c; path = ../Quake/snd_mpg123.c; sourceTree = SOURCE_ROOT; };
63D6EB5E23A2563B0047028C /* snd_mp3tag.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = snd_mp3tag.c; path = ../Quake/snd_mp3tag.c; sourceTree = SOURCE_ROOT; };
664D98FB19CF6B78000D395C /* Info copy.plist */ = {isa = PBXFileReference; lastKnownFileType = file; path = "Info copy.plist"; sourceTree = "<group>"; };
664D990519CF6E16000D395C /* SDL2.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = SDL2.framework; sourceTree = SOURCE_ROOT; };
8D1107310486CEB800E47090 /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist; path = Info.plist; sourceTree = "<group>"; };
8D1107320486CEB800E47090 /* QuakeSpasm.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = QuakeSpasm.app; sourceTree = BUILT_PRODUCTS_DIR; };
@ -499,6 +514,7 @@
483A78660D2EEAF000CB2E4C /* gl_vidsdl.c */,
483A78670D2EEAF000CB2E4C /* gl_warp.c */,
483A78680D2EEAF000CB2E4C /* image.c */,
6339437826EA4917000D25C3 /* lodepng.c */,
483A78690D2EEAF000CB2E4C /* r_alias.c */,
483A786A0D2EEAF000CB2E4C /* r_brush.c */,
483A786B0D2EEAF000CB2E4C /* r_part.c */,
@ -521,9 +537,11 @@
486577CA0D31A22A00E7920A /* snd_mix.c */,
483A78540D2EEAC300CB2E4C /* snd_sdl.c */,
4854B1B01340C646004C9F45 /* snd_mp3.c */,
6339438826EA4A25000D25C3 /* snd_mpg123.c */,
63D6EB5E23A2563B0047028C /* snd_mp3tag.c */,
4885A84A179740A0000EC703 /* snd_opus.c */,
483A78640D2EEAF000CB2E4C /* snd_mikmod.c */,
6339438526EA49FE000D25C3 /* snd_xmp.c */,
4818B0B012D5BA1A006DD66E /* snd_umx.c */,
4818B0B212D5BA1A006DD66E /* snd_vorbis.c */,
4818B0B412D5BA1A006DD66E /* snd_wave.c */,
@ -556,11 +574,14 @@
483A77DE0D2EE8FB00CB2E4C /* Headers */ = {
isa = PBXGroup;
children = (
6339437326EA48EA000D25C3 /* arch_def.h */,
B021C20814A5FF7E003F18D6 /* cfgfile.h */,
483A77E60D2EE97700CB2E4C /* cmd.h */,
483A77E70D2EE97700CB2E4C /* common.h */,
483A77E80D2EE97700CB2E4C /* console.h */,
483A77E90D2EE97700CB2E4C /* crc.h */,
6339437626EA48F9000D25C3 /* default_cfg.h */,
6339437726EA4907000D25C3 /* filenames.h */,
483A77EA0D2EE97700CB2E4C /* cvar.h */,
483A77EB0D2EE97700CB2E4C /* mathlib.h */,
483A77EC0D2EE97700CB2E4C /* menu.h */,
@ -569,6 +590,8 @@
483A77EE0D2EE97700CB2E4C /* progdefs.h */,
483A77EF0D2EE97700CB2E4C /* progs.h */,
483A77F00D2EE97700CB2E4C /* quakedef.h */,
6339438026EA49B7000D25C3 /* q_stdinc.h */,
6339437F26EA49AA000D25C3 /* q_ctype.h */,
483A77F10D2EE97700CB2E4C /* sbar.h */,
48A7C1F914AA34940011B754 /* strl_fn.h */,
483A77F20D2EE97700CB2E4C /* sys.h */,
@ -598,6 +621,7 @@
48728D290D3004A80004D61B /* net_dgrm.h */,
48728D2B0D3004A80004D61B /* net_loop.h */,
48134A1712102F400015BF15 /* net_udp.h */,
6339437E26EA4998000D25C3 /* net_sys.h */,
483A77FB0D2EE9A900CB2E4C /* protocol.h */,
483A77FC0D2EE9A900CB2E4C /* server.h */,
);
@ -617,6 +641,9 @@
4885A84B179740A0000EC703 /* snd_opus.h */,
4818B0B312D5BA1A006DD66E /* snd_vorbis.h */,
4818B0B512D5BA1A006DD66E /* snd_wave.h */,
6339438226EA49CC000D25C3 /* snd_mikmod.h */,
6339438626EA49FE000D25C3 /* snd_xmp.h */,
6339438326EA49DD000D25C3 /* snd_umx.h */,
);
name = Headers;
sourceTree = "<group>";
@ -627,13 +654,15 @@
483A77FF0D2EE9F300CB2E4C /* anorm_dots.h */,
483A78000D2EE9F300CB2E4C /* anorms.h */,
483A78010D2EE9F300CB2E4C /* bspfile.h */,
483A78020D2EE9F300CB2E4C /* d_ifacea.h */,
483A78030D2EE9F300CB2E4C /* draw.h */,
483A78040D2EE9F300CB2E4C /* gl_model.h */,
483A78050D2EE9F300CB2E4C /* gl_texmgr.h */,
483A78060D2EE9F300CB2E4C /* gl_warp_sin.h */,
483A78070D2EE9F300CB2E4C /* glquake.h */,
483A78080D2EE9F300CB2E4C /* image.h */,
6339437926EA4917000D25C3 /* lodepng.h */,
6339438426EA49EA000D25C3 /* stb_image_write.h */,
6339438126EA49B7000D25C3 /* qs_bmp.h */,
483A78090D2EE9F300CB2E4C /* modelgen.h */,
483A780A0D2EE9F300CB2E4C /* render.h */,
483A780B0D2EE9F300CB2E4C /* screen.h */,
@ -676,6 +705,7 @@
};
buildConfigurationList = C01FCF4E08A954540054247B /* Build configuration list for PBXProject "QuakeSpasmPPC" */;
compatibilityVersion = "Xcode 3.2";
developmentRegion = English;
hasScannedForEncodings = 1;
knownRegions = (
English,
@ -790,6 +820,7 @@
4885A84C179740A0000EC703 /* snd_opus.c in Sources */,
48281301179C3F13004E1D61 /* snd_flac.c in Sources */,
63D6EB5F23A2563B0047028C /* snd_mp3tag.c in Sources */,
6339438726EA49FE000D25C3 /* snd_xmp.c in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};

BIN
MacOSX/codecs/lib/libmpg123.dylib
View file

Binary file not shown.

6
Misc/fs_search_order.patch
View file

@ -1,10 +1,10 @@
allow plain files to override files inside a PAK file -- Sander van Dijk.
diff --git a/Quake/common.c b/Quake/common.c
index 6206c3f..27833b8 100644
index bd246f1..2326383 100644
--- a/Quake/common.c
+++ b/Quake/common.c
@@ -2037,13 +2037,6 @@ static void COM_AddGameDirectory (const char *base, const char *dir)
@@ -2039,13 +2039,6 @@ static void COM_AddGameDirectory (const char *base, const char *dir)
else path_id = 1U;
_add_path:
@ -18,7 +18,7 @@ index 6206c3f..27833b8 100644
// add any pak files in the format pak0.pak pak1.pak, ...
for (i = 0; ; i++)
{
@@ -2075,6 +2068,13 @@ _add_path:
@@ -2077,6 +2070,13 @@ _add_path:
if (!pak) break;
}

19
Misc/quake_retexturing_project.patch
View file

@ -1,5 +1,5 @@
diff --git a/Quake/gl_model.c b/Quake/gl_model.c
index 2b15080..07ff6fd 100644
index 94f0023..fdb8c4c 100644
--- a/Quake/gl_model.c
+++ b/Quake/gl_model.c
@@ -37,6 +37,8 @@ qmodel_t *Mod_LoadModel (qmodel_t *mod, qboolean crash);
@ -11,24 +11,21 @@ index 2b15080..07ff6fd 100644
static byte *mod_novis;
static int mod_novis_capacity;
@@ -498,7 +500,16 @@ void Mod_LoadTextures (lump_t *l)
if (!isDedicated) //no texture uploading for dedicated server
@@ -534,6 +536,13 @@ void Mod_LoadTextures (lump_t *l)
{
if (!q_strncasecmp(tx->name,"sky",3)) //sky texture //also note -- was Q_strncmp, changed to match qbsp
+ {
{
+ if (r_externaltexture_fix.value) { //mk
+ if (strstr(tx->name,"sky4")) {
+ if (CRC_Block((byte *)(tx+1), tx->width * tx->height)==13039)
+ q_strlcpy(tx->name, "sky1", sizeof(tx->name));
+ q_strlcpy(tx->name, "sky1", sizeof(tx->name));
+ Con_Printf(" using %s\n", tx->name);
+ }
+ }
Sky_LoadTexture (tx);
+ }
else if (tx->name[0] == '*') //warping texture
{
//external textures -- first look in "textures/mapname/" then look in "textures/"
@@ -548,6 +559,50 @@ void Mod_LoadTextures (lump_t *l)
if (loadmodel->bspversion == BSPVERSION_QUAKE64)
Sky_LoadTextureQ64 (tx);
else
@@ -588,6 +597,50 @@ 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));

4
Quake/Makefile
View file

@ -51,10 +51,6 @@ LINKER = $(CC)
STRIP ?= strip
PKG_CONFIG ?= pkg-config
#CPUFLAGS= -mtune=i686
#CPUFLAGS= -march=pentium4
#CPUFLAGS= -mtune=k8
#CPUFLAGS= -march=atom
CPUFLAGS=
LDFLAGS =
DFLAGS ?=

1
Quake/Makefile.darwin
View file

@ -36,7 +36,6 @@ check_gcc = $(shell if echo | $(CC) $(1) -Werror -S -o /dev/null -xc - > /dev/nu
# ---------------------------
HOST_OS := $(shell uname|sed -e s/_.*//|tr '[:upper:]' '[:lower:]')
MACH_TYPE= $(shell sh detect.sh arch)
DEBUG ?= 0

5
Quake/Makefile.w32
View file

@ -46,10 +46,9 @@ WINDRES = windres
STRIP = strip
#CPUFLAGS= -mtune=i686
#CPUFLAGS= -march=pentium4
CPUFLAGS=
LDFLAGS = -m32 -mwindows -Wl,--large-address-aware
LDFLAGS = -m32 -mwindows -static-libgcc
LDFLAGS += -Wl,--large-address-aware #don't crash out with larger hunk sizes
LDFLAGS += $(QSS_LDFLAGS)
LDFLAGS += -Wl,--no-insert-timestamp #prevent non-determinism in the exe header. mustn't be used for dlls.
DFLAGS ?=

9
Quake/Makefile.w64
View file

@ -3,7 +3,6 @@
# To cross-compile on Linux hosts, see the build_cross_win32*.sh scripts.
# "make DEBUG=1" to build a debug client.
# "make SDL_CONFIG=/path/to/sdl-config" to override the locally included SDL versions.
# "make WINSOCK2=0" to use the old WinSock 1.1 api (NOT RECOMMENDED)
### Enable/disable SDL2
USE_SDL2=0
@ -33,7 +32,6 @@ check_gcc = $(shell if echo | $(CC) $(1) -Werror -S -o /dev/null -xc - > /dev/nu
# ---------------------------
DEBUG ?= 0
WINSOCK2?= 1
USE_ZLIB?= 1
# ---------------------------
@ -47,7 +45,7 @@ WINDRES = windres
STRIP = strip
CPUFLAGS=
LDFLAGS = -m64 -mwindows
LDFLAGS = -m64 -mwindows -static-libgcc
LDFLAGS += $(QSS_LDFLAGS)
LDFLAGS += -Wl,--no-insert-timestamp #prevent non-determinism in the exe header. mustn't be used for dlls.
DFLAGS ?=
@ -83,13 +81,8 @@ endif
SDL_CFLAGS := $(shell $(SDL_CONFIG) --cflags)
SDL_LIBS := $(shell $(SDL_CONFIG) --libs)
ifeq ($(WINSOCK2),1)
DEFWINSOCK :=-D_USE_WINSOCK2
LIBWINSOCK := -lws2_32
else
DEFWINSOCK :=
LIBWINSOCK := -lwsock32
endif
CFLAGS += $(DEFWINSOCK)
NET_LIBS := $(LIBWINSOCK)

2
Quake/OWMakefile.win32 → Quake/Makefile.wat
View file

@ -29,6 +29,8 @@ USE_ZLIB=0
# ---------------------------
CFLAGS_BASE = -zq -wx -bm -bt=nt -5s -sg -otexan -fp5 -fpi87 -ei -j -zp8
# newer OpenWatcom versions enable W303 by default
CFLAGS_BASE+= -wcd=303
CFLAGS = $(CFLAGS_BASE)
!ifneq USE_SDL2 1

23
Quake/common.c
View file

@ -1770,18 +1770,6 @@ void COM_InitArgv (int argc, char **argv)
}
}
/*
================
Test_f -- johnfitz
================
*/
#ifdef _DEBUG
static void FitzTest_f (void)
{
}
#endif
entity_state_t nullentitystate;
static void COM_SetupNullState(void)
{
@ -1849,9 +1837,6 @@ void COM_Init (void)
fitzmode = true;
cl_demoreel.string = "1"; //shouldn't be registered yet.
}
#ifdef _DEBUG
Cmd_AddCommand ("fitztest", FitzTest_f); //johnfitz
#endif
COM_SetupNullState();
}
@ -3179,11 +3164,13 @@ void COM_InitFilesystem (void) //johnfitz -- modified based on topaz's tutorial
break;
p = com_argv[i + 1];
if (!*p || !strcmp(p, ".") || strstr(p, "..") || *p=='/' || *p=='\\' || strstr(p, ":"))
Sys_Error ("gamedir should be a single directory name, not a path\n");
com_modified = true;
if (p != NULL)
{
if (!*p || !strcmp(p, ".") || strstr(p, "..") || *p=='/' || *p=='\\' || strstr(p, ":"))
Sys_Error ("gamedir should be a single directory name, not a path\n");
com_modified = true;
COM_AddGameDirectory (p);
}
}
if (com_argc>1 && (p=com_argv[1]))

9
Quake/gl_rmain.c
View file

@ -537,9 +537,6 @@ R_SetupScene -- johnfitz -- this is the stuff that needs to be done once per eye
*/
void R_SetupScene (void)
{
R_PushDlights ();
R_AnimateLight ();
r_framecount++;
R_SetupGL ();
}
@ -552,6 +549,12 @@ void R_SetupView (void)
{
int viewcontents; //spike -- rewrote this a little
int i;
// Need to do those early because we now update dynamic light maps during R_MarkSurfaces
R_PushDlights ();
R_AnimateLight ();
r_framecount++;
Fog_SetupFrame (); //johnfitz
// build the transformation matrix for the given view angles

2
Quake/quakedef.h
View file

@ -37,7 +37,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
#define FITZQUAKE_VERSION 0.85 //johnfitz
#define QUAKESPASM_VERSION 0.94
#define QUAKESPASM_VER_PATCH 0 // helper to print a string like 0.93.3
#define QUAKESPASM_VER_PATCH 1 // helper to print a string like 0.94.1
#ifndef QUAKESPASM_VER_SUFFIX
#define QUAKESPASM_VER_SUFFIX // optional version suffix string literal like "-beta1"
#endif

83
Quakespasm.html
View file

@ -8,7 +8,7 @@
<H1>QuakeSpasm</H1>
<H2></H2>
<P><EM>Page last edited: August 2021</EM></P>
<P><EM>Page last edited: Sep. 2021</EM></P>
<P>
<H2><A NAME="toc1">1.</A> <A HREF="Quakespasm.html#s1">About </A></H2>
@ -36,24 +36,25 @@
<H2><A NAME="toc5">5.</A> <A HREF="Quakespasm.html#s5">Changes</A></H2>
<UL>
<LI><A NAME="toc5.1">5.1</A> <A HREF="Quakespasm.html#ss5.1">Changes in 0.94.0</A>
<LI><A NAME="toc5.2">5.2</A> <A HREF="Quakespasm.html#ss5.2">Changes in 0.93.2</A>
<LI><A NAME="toc5.3">5.3</A> <A HREF="Quakespasm.html#ss5.3">Changes in 0.93.1</A>
<LI><A NAME="toc5.4">5.4</A> <A HREF="Quakespasm.html#ss5.4">Changes in 0.93.0</A>
<LI><A NAME="toc5.5">5.5</A> <A HREF="Quakespasm.html#ss5.5">Changes in 0.92.1</A>
<LI><A NAME="toc5.6">5.6</A> <A HREF="Quakespasm.html#ss5.6">Changes in 0.92.0</A>
<LI><A NAME="toc5.7">5.7</A> <A HREF="Quakespasm.html#ss5.7">Changes in 0.91.0</A>
<LI><A NAME="toc5.8">5.8</A> <A HREF="Quakespasm.html#ss5.8">Changes in 0.90.1</A>
<LI><A NAME="toc5.9">5.9</A> <A HREF="Quakespasm.html#ss5.9">Changes in 0.90.0</A>
<LI><A NAME="toc5.10">5.10</A> <A HREF="Quakespasm.html#ss5.10">Changes in 0.85.9</A>
<LI><A NAME="toc5.11">5.11</A> <A HREF="Quakespasm.html#ss5.11">Changes in 0.85.8</A>
<LI><A NAME="toc5.12">5.12</A> <A HREF="Quakespasm.html#ss5.12">Changes in 0.85.7</A>
<LI><A NAME="toc5.13">5.13</A> <A HREF="Quakespasm.html#ss5.13">Changes in 0.85.6</A>
<LI><A NAME="toc5.14">5.14</A> <A HREF="Quakespasm.html#ss5.14">Changes in 0.85.5</A>
<LI><A NAME="toc5.15">5.15</A> <A HREF="Quakespasm.html#ss5.15">Changes in 0.85.4</A>
<LI><A NAME="toc5.16">5.16</A> <A HREF="Quakespasm.html#ss5.16">Changes in 0.85.3</A>
<LI><A NAME="toc5.17">5.17</A> <A HREF="Quakespasm.html#ss5.17">Changes in 0.85.2</A>
<LI><A NAME="toc5.18">5.18</A> <A HREF="Quakespasm.html#ss5.18">Changes in 0.85.1</A>
<LI><A NAME="toc5.1">5.1</A> <A HREF="Quakespasm.html#ss5.1">Changes in 0.94.1</A>
<LI><A NAME="toc5.2">5.2</A> <A HREF="Quakespasm.html#ss5.2">Changes in 0.94.0</A>
<LI><A NAME="toc5.3">5.3</A> <A HREF="Quakespasm.html#ss5.3">Changes in 0.93.2</A>
<LI><A NAME="toc5.4">5.4</A> <A HREF="Quakespasm.html#ss5.4">Changes in 0.93.1</A>
<LI><A NAME="toc5.5">5.5</A> <A HREF="Quakespasm.html#ss5.5">Changes in 0.93.0</A>
<LI><A NAME="toc5.6">5.6</A> <A HREF="Quakespasm.html#ss5.6">Changes in 0.92.1</A>
<LI><A NAME="toc5.7">5.7</A> <A HREF="Quakespasm.html#ss5.7">Changes in 0.92.0</A>
<LI><A NAME="toc5.8">5.8</A> <A HREF="Quakespasm.html#ss5.8">Changes in 0.91.0</A>
<LI><A NAME="toc5.9">5.9</A> <A HREF="Quakespasm.html#ss5.9">Changes in 0.90.1</A>
<LI><A NAME="toc5.10">5.10</A> <A HREF="Quakespasm.html#ss5.10">Changes in 0.90.0</A>
<LI><A NAME="toc5.11">5.11</A> <A HREF="Quakespasm.html#ss5.11">Changes in 0.85.9</A>
<LI><A NAME="toc5.12">5.12</A> <A HREF="Quakespasm.html#ss5.12">Changes in 0.85.8</A>
<LI><A NAME="toc5.13">5.13</A> <A HREF="Quakespasm.html#ss5.13">Changes in 0.85.7</A>
<LI><A NAME="toc5.14">5.14</A> <A HREF="Quakespasm.html#ss5.14">Changes in 0.85.6</A>
<LI><A NAME="toc5.15">5.15</A> <A HREF="Quakespasm.html#ss5.15">Changes in 0.85.5</A>
<LI><A NAME="toc5.16">5.16</A> <A HREF="Quakespasm.html#ss5.16">Changes in 0.85.4</A>
<LI><A NAME="toc5.17">5.17</A> <A HREF="Quakespasm.html#ss5.17">Changes in 0.85.3</A>
<LI><A NAME="toc5.18">5.18</A> <A HREF="Quakespasm.html#ss5.18">Changes in 0.85.2</A>
<LI><A NAME="toc5.19">5.19</A> <A HREF="Quakespasm.html#ss5.19">Changes in 0.85.1</A>
</UL>
<P>
<H2><A NAME="toc6">6.</A> <A HREF="Quakespasm.html#s6">Copyright </A></H2>
@ -221,7 +222,15 @@ Compile time options include
<H2><A NAME="ss5.1">5.1</A> <A HREF="#toc5.1">Changes in 0.94.0</A>
<H2><A NAME="ss5.1">5.1</A> <A HREF="#toc5.1">Changes in 0.94.1</A>
</H2>
<P>
<UL>
<LI> Fix lightmap issues after vkQuake surface mark/cull optimizations merge (sf.net bug/50)</LI>
</UL>
</P>
<H2><A NAME="ss5.2">5.2</A> <A HREF="#toc5.2">Changes in 0.94.0</A>
</H2>
<P>
@ -246,7 +255,7 @@ Compile time options include
<LI> Source repository moved to git.</LI>
</UL>
</P>
<H2><A NAME="ss5.2">5.2</A> <A HREF="#toc5.2">Changes in 0.93.2</A>
<H2><A NAME="ss5.3">5.3</A> <A HREF="#toc5.3">Changes in 0.93.2</A>
</H2>
<P>
@ -259,7 +268,7 @@ Compile time options include
<LI> Update the third-party libraries. Other fixes/cleanups.</LI>
</UL>
</P>
<H2><A NAME="ss5.3">5.3</A> <A HREF="#toc5.3">Changes in 0.93.1</A>
<H2><A NAME="ss5.4">5.4</A> <A HREF="#toc5.4">Changes in 0.93.1</A>
</H2>
<P>
@ -273,7 +282,7 @@ Compile time options include
<LI> Update the third-party libraries. Other fixes/cleanups.</LI>
</UL>
</P>
<H2><A NAME="ss5.4">5.4</A> <A HREF="#toc5.4">Changes in 0.93.0</A>
<H2><A NAME="ss5.5">5.5</A> <A HREF="#toc5.5">Changes in 0.93.0</A>
</H2>
<P>
@ -316,7 +325,7 @@ quakespasm (cl_alwaysrun 1, cl_forwardspeed 200, cl_backspeed 200)
<LI> Update the third-party libraries.</LI>
</UL>
</P>
<H2><A NAME="ss5.5">5.5</A> <A HREF="#toc5.5">Changes in 0.92.1</A>
<H2><A NAME="ss5.6">5.6</A> <A HREF="#toc5.6">Changes in 0.92.1</A>
</H2>
<P>
@ -326,7 +335,7 @@ quakespasm (cl_alwaysrun 1, cl_forwardspeed 200, cl_backspeed 200)
<LI> Updated some of the third-party libraries.</LI>
</UL>
</P>
<H2><A NAME="ss5.6">5.6</A> <A HREF="#toc5.6">Changes in 0.92.0</A>
<H2><A NAME="ss5.7">5.7</A> <A HREF="#toc5.7">Changes in 0.92.0</A>
</H2>
<P>
@ -346,7 +355,7 @@ quakespasm (cl_alwaysrun 1, cl_forwardspeed 200, cl_backspeed 200)
<LI> Updated some of the third-party libraries. Other fixes/clean-ups.</LI>
</UL>
</P>
<H2><A NAME="ss5.7">5.7</A> <A HREF="#toc5.7">Changes in 0.91.0</A>
<H2><A NAME="ss5.8">5.8</A> <A HREF="#toc5.8">Changes in 0.91.0</A>
</H2>
@ -406,7 +415,7 @@ quakespasm (cl_alwaysrun 1, cl_forwardspeed 200, cl_backspeed 200)
<LI> Raised MAX_SFX to 1024 (was 512).</LI>
</UL>
</P>
<H2><A NAME="ss5.8">5.8</A> <A HREF="#toc5.8">Changes in 0.90.1</A>
<H2><A NAME="ss5.9">5.9</A> <A HREF="#toc5.9">Changes in 0.90.1</A>
</H2>
@ -466,7 +475,7 @@ quakespasm (cl_alwaysrun 1, cl_forwardspeed 200, cl_backspeed 200)
<LI> Update 3rd-party libraries.</LI>
</UL>
</P>
<H2><A NAME="ss5.9">5.9</A> <A HREF="#toc5.9">Changes in 0.90.0</A>
<H2><A NAME="ss5.10">5.10</A> <A HREF="#toc5.10">Changes in 0.90.0</A>
</H2>
<P>
@ -512,7 +521,7 @@ quakespasm (cl_alwaysrun 1, cl_forwardspeed 200, cl_backspeed 200)
<LI> Other fixes and clean-ups.</LI>
</UL>
</P>
<H2><A NAME="ss5.10">5.10</A> <A HREF="#toc5.10">Changes in 0.85.9</A>
<H2><A NAME="ss5.11">5.11</A> <A HREF="#toc5.11">Changes in 0.85.9</A>
</H2>
<P>
@ -536,7 +545,7 @@ quakespasm (cl_alwaysrun 1, cl_forwardspeed 200, cl_backspeed 200)
<LI> Several other minor fixes/cleanups.</LI>
</UL>
</P>
<H2><A NAME="ss5.11">5.11</A> <A HREF="#toc5.11">Changes in 0.85.8</A>
<H2><A NAME="ss5.12">5.12</A> <A HREF="#toc5.12">Changes in 0.85.8</A>
</H2>
<P>
@ -561,7 +570,7 @@ quakespasm (cl_alwaysrun 1, cl_forwardspeed 200, cl_backspeed 200)
<LI> Miscellaneous source code cleanups.</LI>
</UL>
</P>
<H2><A NAME="ss5.12">5.12</A> <A HREF="#toc5.12">Changes in 0.85.7</A>
<H2><A NAME="ss5.13">5.13</A> <A HREF="#toc5.13">Changes in 0.85.7</A>
</H2>
<P>
@ -579,7 +588,7 @@ quakespasm (cl_alwaysrun 1, cl_forwardspeed 200, cl_backspeed 200)
<LI> Several other small changes mostly invisible to the end-user</LI>
</UL>
</P>
<H2><A NAME="ss5.13">5.13</A> <A HREF="#toc5.13">Changes in 0.85.6</A>
<H2><A NAME="ss5.14">5.14</A> <A HREF="#toc5.14">Changes in 0.85.6</A>
</H2>
<P>
@ -590,7 +599,7 @@ quakespasm (cl_alwaysrun 1, cl_forwardspeed 200, cl_backspeed 200)
<LI> Minor SDL video fixes.</LI>
</UL>
</P>
<H2><A NAME="ss5.14">5.14</A> <A HREF="#toc5.14">Changes in 0.85.5</A>
<H2><A NAME="ss5.15">5.15</A> <A HREF="#toc5.15">Changes in 0.85.5</A>
</H2>
<P>
@ -609,7 +618,7 @@ quakespasm (cl_alwaysrun 1, cl_forwardspeed 200, cl_backspeed 200)
<LI> Several code updates from uHexen2 project, several code cleanups.</LI>
</UL>
</P>
<H2><A NAME="ss5.15">5.15</A> <A HREF="#toc5.15">Changes in 0.85.4</A>
<H2><A NAME="ss5.16">5.16</A> <A HREF="#toc5.16">Changes in 0.85.4</A>
</H2>
<P>
@ -627,7 +636,7 @@ quakespasm (cl_alwaysrun 1, cl_forwardspeed 200, cl_backspeed 200)
<LI> Other minor sound and cdaudio updates</LI>
</UL>
</P>
<H2><A NAME="ss5.16">5.16</A> <A HREF="#toc5.16">Changes in 0.85.3</A>
<H2><A NAME="ss5.17">5.17</A> <A HREF="#toc5.17">Changes in 0.85.3</A>
</H2>
<P>
@ -650,7 +659,7 @@ quakespasm (cl_alwaysrun 1, cl_forwardspeed 200, cl_backspeed 200)
</UL>
</P>
<H2><A NAME="ss5.17">5.17</A> <A HREF="#toc5.17">Changes in 0.85.2</A>
<H2><A NAME="ss5.18">5.18</A> <A HREF="#toc5.18">Changes in 0.85.2</A>
</H2>
<P>
@ -669,7 +678,7 @@ quakespasm (cl_alwaysrun 1, cl_forwardspeed 200, cl_backspeed 200)
</UL>
</P>
<H2><A NAME="ss5.18">5.18</A> <A HREF="#toc5.18">Changes in 0.85.1</A>
<H2><A NAME="ss5.19">5.19</A> <A HREF="#toc5.19">Changes in 0.85.1</A>
</H2>
<P>

119
Quakespasm.txt
View file

@ -19,34 +19,35 @@
4.4 Quake '2021 re-release'
5. Changes
5.1 Changes in 0.94.0
5.2 Changes in 0.93.2
5.3 Changes in 0.93.1
5.4 Changes in 0.93.0
5.5 Changes in 0.92.1
5.6 Changes in 0.92.0
5.7 Changes in 0.91.0
5.7.1 Bugfixes
5.7.2 Visual improvements
5.7.3 Interface improvements
5.7.4 Code cleanup / Other
5.7.5 Raised limits
5.8 Changes in 0.90.1
5.1 Changes in 0.94.1
5.2 Changes in 0.94.0
5.3 Changes in 0.93.2
5.4 Changes in 0.93.1
5.5 Changes in 0.93.0
5.6 Changes in 0.92.1
5.7 Changes in 0.92.0
5.8 Changes in 0.91.0
5.8.1 Bugfixes
5.8.2 Performance
5.8.3 Visual improvements
5.8.4 Interface improvements
5.8.5 Code cleanup
5.9 Changes in 0.90.0
5.10 Changes in 0.85.9
5.11 Changes in 0.85.8
5.12 Changes in 0.85.7
5.13 Changes in 0.85.6
5.14 Changes in 0.85.5
5.15 Changes in 0.85.4
5.16 Changes in 0.85.3
5.17 Changes in 0.85.2
5.18 Changes in 0.85.1
5.8.2 Visual improvements
5.8.3 Interface improvements
5.8.4 Code cleanup / Other
5.8.5 Raised limits
5.9 Changes in 0.90.1
5.9.1 Bugfixes
5.9.2 Performance
5.9.3 Visual improvements
5.9.4 Interface improvements
5.9.5 Code cleanup
5.10 Changes in 0.90.0
5.11 Changes in 0.85.9
5.12 Changes in 0.85.8
5.13 Changes in 0.85.7
5.14 Changes in 0.85.6
5.15 Changes in 0.85.5
5.16 Changes in 0.85.4
5.17 Changes in 0.85.3
5.18 Changes in 0.85.2
5.19 Changes in 0.85.1
6. Copyright
7. Contact
@ -55,7 +56,7 @@
______________________________________________________________________
Page last edited: August 2021
Page last edited: Sep. 2021
1. About
@ -259,7 +260,13 @@
5. Changes
5.1. Changes in 0.94.0
5.1. Changes in 0.94.1
o Fix lightmap issues after vkQuake surface mark/cull optimizations
merge (sf.net bug/50)
5.2. Changes in 0.94.0
o Initial support for playing the 'Quake 2021 re-release' content
(thanks to Andrei Drexler for bulk of the work, Guillaume Plourde
@ -308,7 +315,7 @@
o Source repository moved to git.
5.2. Changes in 0.93.2
5.3. Changes in 0.93.2
o Lightmaps are now dynamically allocated (from QSS), and
BLOCK_WIDTH/HEIGHT raised from 128 to 256.
@ -328,7 +335,7 @@
o Update the third-party libraries. Other fixes/cleanups.
5.3. Changes in 0.93.1
5.4. Changes in 0.93.1
o Fixed a fog regression which was introduced in 0.93.0.
@ -346,7 +353,7 @@
o Update the third-party libraries. Other fixes/cleanups.
5.4. Changes in 0.93.0
5.5. Changes in 0.93.0
o Raise default "joy_deadzone_trigger" cvar to 0.2.
@ -431,7 +438,7 @@
o Update the third-party libraries.
5.5. Changes in 0.92.1
5.6. Changes in 0.92.1
o Fixed large menu scale factors (was broken in 0.92.0).
@ -440,7 +447,7 @@
o Updated some of the third-party libraries.
5.6. Changes in 0.92.0
5.7. Changes in 0.92.0
o SDL2 Game Controller support.
@ -477,9 +484,9 @@
o Updated some of the third-party libraries. Other fixes/clean-ups.
5.7. Changes in 0.91.0
5.8. Changes in 0.91.0
5.7.1. Bugfixes
5.8.1. Bugfixes
o Fix unwanted fog mode change upon video restart.
@ -515,7 +522,7 @@
o Prevent a possible vulnerability in MSG_ReadString (old Q1/Q2 bug).
5.7.2. Visual improvements
5.8.2. Visual improvements
o New cvars r_lavaalpha, r_slimealpha, r_telealpha for fine-tuning
specific liquid opacities (from DirectQ/RMQEngine, non-archived,
@ -526,18 +533,18 @@
o GLSL gamma is now supported on older hardware without NPOT
extension.
5.7.3. Interface improvements
5.8.3. Interface improvements
o New r_pos command to show player position.
o NaN detection in traceline with "developer 1" set now warns instead
of errors.
5.7.4. Code cleanup / Other
5.8.4. Code cleanup / Other
o Update third-party libraries.
5.7.5. Raised limits
5.8.5. Raised limits
o Default max_edicts 8192 (was 2048) and no longer saved to
config.cfg.
@ -549,9 +556,9 @@
o Raised MAX_SFX to 1024 (was 512).
5.8. Changes in 0.90.1
5.9. Changes in 0.90.1
5.8.1. Bugfixes
5.9.1. Bugfixes
o Fix dynamic light artifact where changing lightmap are rendered one
frame late (bug introduced in 0.90.0).
@ -574,13 +581,13 @@
o Fix crash on out-of-bounds skin number.
5.8.2. Performance
5.9.2. Performance
o Use multithreaded OpenGL on OS X for better performance.
o New, faster mdl renderer using GLSL. Disable with "-noglslalias".
5.8.3. Visual improvements
5.9.3. Visual improvements
o New gamma correction implementation using GLSL. Fixes all known
gamma issues (affecting the full display, persisting after
@ -594,7 +601,7 @@
o r_noshadow_list cvar added (from MarkV.)
5.8.4. Interface improvements
5.9.4. Interface improvements
o Support pausing demo playback with the "pause" command.
@ -611,14 +618,14 @@
"trying to load ent", "bad chunk length", "meshing",
"PR_AlocStringSlots: realloc'ing"
5.8.5. Code cleanup
5.9.5. Code cleanup
o Clean up IDE project files to build on fresh systems.
o Update 3rd-party libraries.
5.9. Changes in 0.90.0
5.10. Changes in 0.90.0
o Fix issues on Windows systems with DPI scaling.
@ -726,7 +733,7 @@
o Other fixes and clean-ups.
5.10. Changes in 0.85.9
5.11. Changes in 0.85.9
o Fixes for several undefined behaviors in C code (gcc-4.8 support.)
@ -773,7 +780,7 @@
o Several other minor fixes/cleanups.
5.11. Changes in 0.85.8
5.12. Changes in 0.85.8
o Made Quake shareware 1.00 and 1.01 versions to be recognized
properly.
@ -820,7 +827,7 @@
o Miscellaneous source code cleanups.
5.12. Changes in 0.85.7
5.13. Changes in 0.85.7
o Added support for cross-level demo playback
@ -846,7 +853,7 @@
o Several other small changes mostly invisible to the end-user
5.13. Changes in 0.85.6
5.14. Changes in 0.85.6
o More work for string buffer safety
@ -859,7 +866,7 @@
o Minor SDL video fixes.
5.14. Changes in 0.85.5
5.15. Changes in 0.85.5
o SDL input driver updated adding native keymap and dead key support
to the console
@ -890,7 +897,7 @@
o Several code updates from uHexen2 project, several code cleanups.
5.15. Changes in 0.85.4
5.16. Changes in 0.85.4
o Implement music (OGG, MP3, WAV) playback
@ -918,7 +925,7 @@
o Other minor sound and cdaudio updates
5.16. Changes in 0.85.3
5.17. Changes in 0.85.3
o Fix the "-dedicated" option (thanks Oz) and add platform specific
networking code (default) rather than SDL_net
@ -955,7 +962,7 @@
some other CD tweaks.
5.17. Changes in 0.85.2
5.18. Changes in 0.85.2
o Replace the old "Screen size" slider with a "Scale" slider
@ -983,7 +990,7 @@
o Add OSX Makefile (tested?)
5.18. Changes in 0.85.1
5.19. Changes in 0.85.1
o 64 bit CPU support

BIN
Windows/codecs/x64/libmpg123-0.dll
View file

Binary file not shown.

BIN
Windows/codecs/x86-watcom/mpg123.lib
View file

Binary file not shown.

BIN
Windows/codecs/x86/libmpg123-0.dll
View file

Binary file not shown.