Commit Graph

1263 Commits

Author SHA1 Message Date
ewasylishen aca6afe940 gl_model.c: Mod_LoadTextures: avoid crash on broken maps such as jam2_tronyn.bsp or kellbase1.bsp, where we try to read texture pixel data past the end of the texture lump (crashing because the textue lump is the last thing in the .bsp file buffer).
This would only hapen on OS X or Linux (perhaps just luck or windows is more leniant about reading ~40 bytes past the end of a malloc). Note this will only handle cases where the lump size is recorded as being too small, we will still crash if the bsp file itself is truncated since there are generally no checks against the whole .bsp file buffer size.

FYI, the corruption in jam2_tronyn.bsp was caused by a bug in tyrutils which is fixed now: http://disenchant.net/git/?p=tyrutils&a=commit&h=5111c5485c96918b937843715f9b8f51f263e40e
Not sure about kellbase1.bsp (quoth).

git-svn-id: svn+ssh://svn.code.sf.net/p/quakespasm/code/trunk@1228 af15c1b1-3010-417e-b628-4374ebc0bcbd
2015-06-12 02:26:10 +00:00
sezero 76b1206f7d minor doc updates
git-svn-id: svn+ssh://svn.code.sf.net/p/quakespasm/code/trunk@1227 af15c1b1-3010-417e-b628-4374ebc0bcbd
2015-06-04 17:05:39 +00:00
sezero 453d701e73 rebuilt SDL2 from SDL hg rev. 9702 to fix osx borkage
git-svn-id: svn+ssh://svn.code.sf.net/p/quakespasm/code/trunk@1226 af15c1b1-3010-417e-b628-4374ebc0bcbd
2015-06-04 17:04:54 +00:00
sezero eb7080bfee docs: minor typo fix, update edit date, some hand-editing to txt version.
git-svn-id: svn+ssh://svn.code.sf.net/p/quakespasm/code/trunk@1225 af15c1b1-3010-417e-b628-4374ebc0bcbd
2015-06-03 14:56:11 +00:00
ewasylishen a9dcbecf1f Modlist_Init: (win32) don't list "." as a mod.
git-svn-id: svn+ssh://svn.code.sf.net/p/quakespasm/code/trunk@1224 af15c1b1-3010-417e-b628-4374ebc0bcbd
2015-06-03 03:54:47 +00:00
sezero d6ec440cad recompiled SDL2 for windows and osx from SDL hg 2015-06-01/rev.9699
git-svn-id: svn+ssh://svn.code.sf.net/p/quakespasm/code/trunk@1223 af15c1b1-3010-417e-b628-4374ebc0bcbd
2015-06-02 20:00:29 +00:00
ewasylishen 4c6cb650fe Quakespasm.{html,txt}: Update
git-svn-id: svn+ssh://svn.code.sf.net/p/quakespasm/code/trunk@1222 af15c1b1-3010-417e-b628-4374ebc0bcbd
2015-06-01 05:17:00 +00:00
ewasylishen 645e511b2d docs: Quakespasm.sgml: add note that stdout.txt is no longer generated with sdl2
git-svn-id: svn+ssh://svn.code.sf.net/p/quakespasm/code/trunk@1221 af15c1b1-3010-417e-b628-4374ebc0bcbd
2015-06-01 04:40:22 +00:00
ewasylishen 5e18e31b05 docs: Update Quakespasm.sgml with latest changes
git-svn-id: svn+ssh://svn.code.sf.net/p/quakespasm/code/trunk@1220 af15c1b1-3010-417e-b628-4374ebc0bcbd
2015-05-31 21:16:57 +00:00
ewasylishen 917d8a4544 Add filename tab-completion for "playdemo" and "record" commands
git-svn-id: svn+ssh://svn.code.sf.net/p/quakespasm/code/trunk@1219 af15c1b1-3010-417e-b628-4374ebc0bcbd
2015-05-30 02:28:58 +00:00
ewasylishen b791f5379d Host_Pause_f: Allow pausing demos even if cls.demonum != -1, i.e. we are in a demo loop.
The logic to prevent pausing the demo loop was preventing pausing in some valid cases, and there's no special reason not to allow pausing a demo loop.

git-svn-id: svn+ssh://svn.code.sf.net/p/quakespasm/code/trunk@1218 af15c1b1-3010-417e-b628-4374ebc0bcbd
2015-05-29 18:33:19 +00:00
ewasylishen 6e8f4cd5dc ExtraMaps_Add: merge with Modlist_Add into new FileList_Add
git-svn-id: svn+ssh://svn.code.sf.net/p/quakespasm/code/trunk@1217 af15c1b1-3010-417e-b628-4374ebc0bcbd
2015-05-29 18:33:14 +00:00
ewasylishen 0b04690279 Convert to Con_DWarning (developer 1 only) the remaining two "exceeded standard limit" warnings.
git-svn-id: svn+ssh://svn.code.sf.net/p/quakespasm/code/trunk@1216 af15c1b1-3010-417e-b628-4374ebc0bcbd
2015-05-29 18:33:08 +00:00
ewasylishen 237eec45ed xcode project: add indentation settings
git-svn-id: svn+ssh://svn.code.sf.net/p/quakespasm/code/trunk@1215 af15c1b1-3010-417e-b628-4374ebc0bcbd
2015-05-25 19:55:58 +00:00
ewasylishen e924d51054 Move more spammy message from "developer 1" to "developer 2", continued:
- .ent, .lit not found in COM_FindFile (they will usually be missing, we print a message with "develoepr 1" when they are found)
- "trying to load" .ent file
- "bad chunk length"

git-svn-id: svn+ssh://svn.code.sf.net/p/quakespasm/code/trunk@1214 af15c1b1-3010-417e-b628-4374ebc0bcbd
2015-05-25 18:38:37 +00:00
ewasylishen 86fedcc281 Move more spammy message from "developer 1" to "developer 2":
- "meshing", "tri vert cmd"
- "PR_AlocStringSlots: realloc'ing"

git-svn-id: svn+ssh://svn.code.sf.net/p/quakespasm/code/trunk@1213 af15c1b1-3010-417e-b628-4374ebc0bcbd
2015-05-25 03:39:05 +00:00
ewasylishen c532ecfabd COM_FindFile: in addition to .pcx, suppress "can't find" warning for .tga textures when developer.value < 2
git-svn-id: svn+ssh://svn.code.sf.net/p/quakespasm/code/trunk@1212 af15c1b1-3010-417e-b628-4374ebc0bcbd
2015-05-25 02:00:06 +00:00
ewasylishen cb0357e98c Make "exceeds standard limit of" messages only display when developer cvar is set, with a new Con_DWarning function.
Have heard these are confusing players and mappers/modders; people assume there is an error or a limit in QS is exceeded, but the messages are only about exceeding the limits in vanilla WinQuake/GLQuake.

git-svn-id: svn+ssh://svn.code.sf.net/p/quakespasm/code/trunk@1211 af15c1b1-3010-417e-b628-4374ebc0bcbd
2015-05-25 01:48:03 +00:00
ewasylishen a3f63c8023 add r_noshadow_list cvar (from MarkV), removing hardcoded list of models to not have shadows
git-svn-id: svn+ssh://svn.code.sf.net/p/quakespasm/code/trunk@1210 af15c1b1-3010-417e-b628-4374ebc0bcbd
2015-05-18 18:00:49 +00:00
ewasylishen 0ef7b2be15 r_shadows: Better stencil shadow rendering from MarkV.
Now an 8-bit stencil buffer is requested when using a 24-bit depth buffer (the default).

git-svn-id: svn+ssh://svn.code.sf.net/p/quakespasm/code/trunk@1209 af15c1b1-3010-417e-b628-4374ebc0bcbd
2015-05-18 06:11:56 +00:00
ewasylishen de90e2c4ea cl_parse.c: fix viewmodel lerping on large maps (e.g. zendar, warpd)
cl.stats[STAT_WEAPON] was being used before the high 8 bits were filled in, which is done with the SU_WEAPON2 byte.
Moved the block which clears the viewmodel lerp state to be after handling SU_WEAPON2.

git-svn-id: svn+ssh://svn.code.sf.net/p/quakespasm/code/trunk@1208 af15c1b1-3010-417e-b628-4374ebc0bcbd
2015-05-16 22:15:15 +00:00
ewasylishen f0b0851885 r_alias.c: GLSL: fix for fullbright pixels on alias models not respecting alpha.
e.g. fixes light_flame_small_yellow entity (progs/flame2.mdl) with alpha 0.5 showing up as solid (most of the pixels on flame2.mdl are fullbright)

git-svn-id: svn+ssh://svn.code.sf.net/p/quakespasm/code/trunk@1207 af15c1b1-3010-417e-b628-4374ebc0bcbd
2015-05-16 20:55:56 +00:00
sezero 56ec5951d0 oslibs, codecs: recompiled libmikmod and libmodplug for osx and win
git-svn-id: svn+ssh://svn.code.sf.net/p/quakespasm/code/trunk@1206 af15c1b1-3010-417e-b628-4374ebc0bcbd
2015-05-05 05:11:09 +00:00
ewasylishen aa75a54a4a r_alias.c: for out of range skin numbers, bring back the checkerboard texture wihch was removed in the last commit
git-svn-id: svn+ssh://svn.code.sf.net/p/quakespasm/code/trunk@1205 af15c1b1-3010-417e-b628-4374ebc0bcbd
2015-05-05 04:51:05 +00:00
ewasylishen 7493e7e712 r_alias.c: fix crash on out-of-range skin numbers. This bounds check was in WinQuake, but not FitzQuake.
Fixes crash in malice TC reported by NightFright: http://www.celephais.net/board/view_thread.php?id=60831&start=829

git-svn-id: svn+ssh://svn.code.sf.net/p/quakespasm/code/trunk@1204 af15c1b1-3010-417e-b628-4374ebc0bcbd
2015-05-01 09:24:06 +00:00
ewasylishen fce5c733c0 R_Clear: clear stencil buffer together with depth buffer if we have one.
mh suggest that not doing this may cause performance
issues: http://forums.inside3d.com/viewtopic.php?t=2408
It's also mentioned in a "Depth In-Depth" document from AMD.

git-svn-id: svn+ssh://svn.code.sf.net/p/quakespasm/code/trunk@1203 af15c1b1-3010-417e-b628-4374ebc0bcbd
2015-04-16 23:57:45 +00:00
ewasylishen 4aad7272bc R_DrawParticles: exit early if there is nothing to draw, avoid a useless glBegin() glEnd() pair.
This fixes a weird bug on Windows/AMD, where under some conditions, the
world would be drawn totally corrupted. Conditions for the bug were:
- gl_clear 0
- gamma 1
- glsl alias code in use
- status bar hidden, or, scr_sbaralpha 1
- map e1m1, look around the start position

git-svn-id: svn+ssh://svn.code.sf.net/p/quakespasm/code/trunk@1202 af15c1b1-3010-417e-b628-4374ebc0bcbd
2015-04-16 23:57:39 +00:00
sezero 606671f486 fix windows linkage after r1200
git-svn-id: svn+ssh://svn.code.sf.net/p/quakespasm/code/trunk@1201 af15c1b1-3010-417e-b628-4374ebc0bcbd
2015-04-14 18:15:09 +00:00
ewasylishen 7f9d335967 sys_sdl_win.: call timeBeginPeriod(1) to set OS timer resolution to 1ms.
Works around buffer underruns with directsound and SDL2, but also will
make Sleep()/SDL_Dleay() accurate to 1ms which should help framerate
stability.

git-svn-id: svn+ssh://svn.code.sf.net/p/quakespasm/code/trunk@1200 af15c1b1-3010-417e-b628-4374ebc0bcbd
2015-04-14 18:01:33 +00:00
ewasylishen ff6a179844 Com_Game_f: print reminder message to player about "exec quake.rc"
git-svn-id: svn+ssh://svn.code.sf.net/p/quakespasm/code/trunk@1199 af15c1b1-3010-417e-b628-4374ebc0bcbd
2015-04-03 19:03:17 +00:00
sezero 744556426a constify NET_QSocketGetTime() and NET_QSocketGetAddressString()
git-svn-id: svn+ssh://svn.code.sf.net/p/quakespasm/code/trunk@1198 af15c1b1-3010-417e-b628-4374ebc0bcbd
2015-04-01 09:30:10 +00:00
sezero 270f270d44 recompiled SDL-1.2 with a fix for sdl bug #2049 backported.
also patched for windows to ensure vsnprintf() null terminates the string.


git-svn-id: svn+ssh://svn.code.sf.net/p/quakespasm/code/trunk@1197 af15c1b1-3010-417e-b628-4374ebc0bcbd
2015-03-28 20:40:36 +00:00
sezero dfc0815664 recompiled SDL2 for windows and osx with a few patches from current
hg for bugs 1825, 2835, and 2049, also with xaudio2 driver disabled
for windows which seems more trouble than its worth.

git-svn-id: svn+ssh://svn.code.sf.net/p/quakespasm/code/trunk@1196 af15c1b1-3010-417e-b628-4374ebc0bcbd
2015-03-27 10:05:06 +00:00
sezero eda76ea06e codecs, windows: rebuilt opus and opusfile for x64 with a patch applied to use xmm intrinsics for lrintf() with mingw-w64
git-svn-id: svn+ssh://svn.code.sf.net/p/quakespasm/code/trunk@1195 af15c1b1-3010-417e-b628-4374ebc0bcbd
2015-03-20 20:47:23 +00:00
sezero e87c843f2c minor reorganization of windows includes
git-svn-id: svn+ssh://svn.code.sf.net/p/quakespasm/code/trunk@1194 af15c1b1-3010-417e-b628-4374ebc0bcbd
2015-03-18 00:00:05 +00:00
ewasylishen 319588d3cd Xcode proj: Rename build product for SDL2 target to QuakeSpasm-SDL2.app
git-svn-id: svn+ssh://svn.code.sf.net/p/quakespasm/code/trunk@1193 af15c1b1-3010-417e-b628-4374ebc0bcbd
2015-03-17 22:35:00 +00:00
sezero 3e5f21cae2 update the plain text doc for possibly better readability.
git-svn-id: svn+ssh://svn.code.sf.net/p/quakespasm/code/trunk@1192 af15c1b1-3010-417e-b628-4374ebc0bcbd
2015-03-17 21:56:01 +00:00
ewasylishen 591e67b8f2 Regenerate Quakespasm.{html,txt}
git-svn-id: svn+ssh://svn.code.sf.net/p/quakespasm/code/trunk@1191 af15c1b1-3010-417e-b628-4374ebc0bcbd
2015-03-17 21:32:09 +00:00
ewasylishen 3704870652 Update docs with changes in 0.90.1
git-svn-id: svn+ssh://svn.code.sf.net/p/quakespasm/code/trunk@1190 af15c1b1-3010-417e-b628-4374ebc0bcbd
2015-03-17 21:32:04 +00:00
sezero 5ce6680dab remove unused GLUT.framework from Xcode project file
git-svn-id: svn+ssh://svn.code.sf.net/p/quakespasm/code/trunk@1189 af15c1b1-3010-417e-b628-4374ebc0bcbd
2015-03-14 20:56:31 +00:00
ewasylishen 6bd0bf7039 GLSL gamma: implement some suggestions from Spike - remove redundant glClear, remove matrix changes (not used in programmable pipeline), change filter mode to nearest (no filtering will happen anyway)
git-svn-id: svn+ssh://svn.code.sf.net/p/quakespasm/code/trunk@1188 af15c1b1-3010-417e-b628-4374ebc0bcbd
2015-03-08 21:13:26 +00:00
sezero c166006a1e recompile SDL2 for windows from latest upstream hg repo, r9379
git-svn-id: svn+ssh://svn.code.sf.net/p/quakespasm/code/trunk@1187 af15c1b1-3010-417e-b628-4374ebc0bcbd
2015-03-08 12:55:38 +00:00
sezero 59c3029346 recompiled SDL2 for osx with a patch for SDL bug #2718 applied. also used
the -no_function_starts and -no_data_in_code_info linker flags to avoid
generation of LC_FUNCTION_STARTS and LC_DATA_IN_CODE load commands in the
final image, so that the library is usable with Xcode 3.2.6 and its tools.


git-svn-id: svn+ssh://svn.code.sf.net/p/quakespasm/code/trunk@1186 af15c1b1-3010-417e-b628-4374ebc0bcbd
2015-03-03 20:00:07 +00:00
sezero cb9a4f728f rebuild some music decoders for windows and macosx:
- update vorbis to xiph.org svn r19451 (fixes xiph.org bug #2139)
- update libmpg123 to latest 1.22.0 release
- update libmikmod to v3.3.8/mercurial repo snapshot 2015-02-28.


git-svn-id: svn+ssh://svn.code.sf.net/p/quakespasm/code/trunk@1185 af15c1b1-3010-417e-b628-4374ebc0bcbd
2015-03-03 00:10:09 +00:00
sezero c02fd49811 rebuild SDL2 from upstream mercurial repo (2015-03-02, rev. 9375.)
do set svn:mime-type application/octet-stream on SDL binary files.


git-svn-id: svn+ssh://svn.code.sf.net/p/quakespasm/code/trunk@1184 af15c1b1-3010-417e-b628-4374ebc0bcbd
2015-03-02 22:23:12 +00:00
sezero f5a269c8d5 change windows makefiles so that they aren't for cross-building by default;
keep the cross-build stuff only in the scripts. update the explanations in
windows and darwin makefiles.


git-svn-id: svn+ssh://svn.code.sf.net/p/quakespasm/code/trunk@1183 af15c1b1-3010-417e-b628-4374ebc0bcbd
2015-03-02 22:04:26 +00:00
sezero a6ae6b3afe Makefile.darwin (SDL_FRAMEWORK_PATH): seems like older OSX ld does not
treat '-F dir' the same as '-Fdir' and fails, so directly use -Fdir as
LDFLAGS, instead of -Wl,-F,dir .


git-svn-id: svn+ssh://svn.code.sf.net/p/quakespasm/code/trunk@1182 af15c1b1-3010-417e-b628-4374ebc0bcbd
2015-03-02 22:03:18 +00:00
sezero 3d355d61ab fix the cross-build scripts after r1180.
git-svn-id: svn+ssh://svn.code.sf.net/p/quakespasm/code/trunk@1181 af15c1b1-3010-417e-b628-4374ebc0bcbd
2015-03-02 22:01:12 +00:00
ewasylishen 530c6db666 Update makefiles to use local SDL/SDL2 copies. Add sdl[2]-config. Patch from szo.
git-svn-id: svn+ssh://svn.code.sf.net/p/quakespasm/code/trunk@1180 af15c1b1-3010-417e-b628-4374ebc0bcbd
2015-03-02 21:43:04 +00:00
sezero d97dd45952 remove empty directory
git-svn-id: svn+ssh://svn.code.sf.net/p/quakespasm/code/trunk@1179 af15c1b1-3010-417e-b628-4374ebc0bcbd
2015-03-02 08:37:02 +00:00