Commit graph

1717 commits

Author SHA1 Message Date
Shpoike
af7f137d91 Switch to unix endings on a windows file to try to avoid git being so awkward... 2019-12-29 16:28:19 +00:00
Shpoike
d4db22a449 Merge branch 'master' of https://github.com/ericwa/Quakespasm 2019-11-20 05:11:26 +00:00
ewasylishen
d40ff71625 Reject lit files if they're the wrong size (eg hipnotic/start.bsp vs id1/start.lit or just a bsp that no longer has any coloured lits, etc).
From Spike.

git-svn-id: svn+ssh://svn.code.sf.net/p/quakespasm/code/trunk@1654 af15c1b1-3010-417e-b628-4374ebc0bcbd
2019-11-20 02:47:04 +00:00
Shpoike
93d8adae91 Reject lit files if they're the wrong size (eg hipnotic/start.bsp vs id1/start.lit or just a bsp that no longer has any coloured lits, etc). 2019-11-19 21:26:45 +00:00
sezero
39669b94e6 oslibs, codecs: updated libflac and libopusfile builds.
git-svn-id: svn+ssh://svn.code.sf.net/p/quakespasm/code/trunk@1653 af15c1b1-3010-417e-b628-4374ebc0bcbd
2019-11-18 09:51:03 +00:00
sezero
cc2c53b6ea lodepng.c: fix LODEPNG_RESTRICT for gcc
previously, it ignored any gcc with __GNUC_MINOR__ == 0.
(patch submitted to upstream at github as PR/120)

git-svn-id: svn+ssh://svn.code.sf.net/p/quakespasm/code/trunk@1652 af15c1b1-3010-417e-b628-4374ebc0bcbd
2019-11-18 09:47:04 +00:00
sezero
2f0a418604 minor update from SDL-1.2 mainstream tree. (our binaries don't change.)
git-svn-id: svn+ssh://svn.code.sf.net/p/quakespasm/code/trunk@1650 af15c1b1-3010-417e-b628-4374ebc0bcbd
2019-11-13 11:55:04 +00:00
sezero
20a4a27bb0 revert r1647
git-svn-id: svn+ssh://svn.code.sf.net/p/quakespasm/code/trunk@1649 af15c1b1-3010-417e-b628-4374ebc0bcbd
2019-11-12 07:35:22 +00:00
sezero
1c4af13133 lodepng.c: minor update (cf. mainstream PR/119)
git-svn-id: svn+ssh://svn.code.sf.net/p/quakespasm/code/trunk@1648 af15c1b1-3010-417e-b628-4374ebc0bcbd
2019-11-11 22:14:22 +00:00
sezero
766eb2de10 oslibs: rebuilt libflac decoder after applying a fix from mainstream
git-svn-id: svn+ssh://svn.code.sf.net/p/quakespasm/code/trunk@1647 af15c1b1-3010-417e-b628-4374ebc0bcbd
2019-11-11 11:38:59 +00:00
sezero
d8ec39dfdb lodepng.c (lodepng_zlib_compress): Fix alloc fail check.
From https://github.com/lvandeve/lodepng/pull/118

git-svn-id: svn+ssh://svn.code.sf.net/p/quakespasm/code/trunk@1646 af15c1b1-3010-417e-b628-4374ebc0bcbd
2019-11-11 09:37:06 +00:00
sezero
d07b36135b r_brush.c (AllocBlock): add a FIXME note about a valgrind warning.
git-svn-id: svn+ssh://svn.code.sf.net/p/quakespasm/code/trunk@1645 af15c1b1-3010-417e-b628-4374ebc0bcbd
2019-11-11 09:35:19 +00:00
sezero
3f0e330e33 SDL2: rebuilt from latest SDL2-hg-r13229.
fixes a missing export in previous build.

git-svn-id: svn+ssh://svn.code.sf.net/p/quakespasm/code/trunk@1644 af15c1b1-3010-417e-b628-4374ebc0bcbd
2019-11-05 07:01:09 +00:00
Shpoike
6c45ac34de Add skybox console command for dynamic use (blame sock). Additional args for skyroom speed and axis of rotation. 2019-11-02 20:22:54 +00:00
Shpoike
ed4da3f2ca Hacked in support for IQMs. 2019-11-02 15:50:53 +00:00
Shpoike
d5e2ff0b29 Lets just use 999 by default. 2019-11-02 15:38:32 +00:00
sezero
e368a5a241 SDL2: rebuilt from latest SDL2-hg-r13226 to test upcoming v2.0.12.
git-svn-id: svn+ssh://svn.code.sf.net/p/quakespasm/code/trunk@1643 af15c1b1-3010-417e-b628-4374ebc0bcbd
2019-11-02 07:20:12 +00:00
sezero
5d8343c4f6 rebuilt SDL-1.2 from latest source.
git-svn-id: svn+ssh://svn.code.sf.net/p/quakespasm/code/trunk@1642 af15c1b1-3010-417e-b628-4374ebc0bcbd
2019-11-02 07:14:02 +00:00
sezero
0ca7238671 oslibs: rebuilt FLAC and mpg123 decoders.
git-svn-id: svn+ssh://svn.code.sf.net/p/quakespasm/code/trunk@1641 af15c1b1-3010-417e-b628-4374ebc0bcbd
2019-11-02 07:11:17 +00:00
Eric Wasylishen
634d4cae33
VS project: Fix failure to find "winsock2.h" (#8)
and undefined reference to __imp__freeaddrinfo@4 (link Ws2_32.lib)
2019-10-06 16:06:28 -06:00
Shpoike
3dfd9cf3b6 Remove MAX_HANDLES limit. 2019-10-04 22:19:49 +01:00
Shpoike
f071fa3412 Merge branch 'master' of https://github.com/ericwa/Quakespasm 2019-09-22 22:24:57 +01:00
sezero
11783961e1 update docs
git-svn-id: svn+ssh://svn.code.sf.net/p/quakespasm/code/trunk@1640 af15c1b1-3010-417e-b628-4374ebc0bcbd
2019-09-20 18:41:06 +00:00
sezero
eddb292e78 snd_sdl.c: pass NULL as the 'obtained' spec to SDL_OpenAudio():
this way, SDL will convert to hardware format for us if needed.
most of the times we do get what we want. however, for example,
the WASAPI backend of SDL2 returns AUDIO_F32LSB as the obtained
format (which is not an SDL thing but a WASAPI thing) and we do
not support that. the SDL2.dll we ship with has WASAPI disabled,
but if the user replaces our dll with a one with WASAPI enabled
(official libsdl.org build or his own build) then we refuse the
obtained AUDIO_F32LSB format and run without sound.  after this
patch, such a thing is transparent to us.

git-svn-id: svn+ssh://svn.code.sf.net/p/quakespasm/code/trunk@1639 af15c1b1-3010-417e-b628-4374ebc0bcbd
2019-09-20 18:40:00 +00:00
sezero
2cfd74bef2 remove Steve's name from quit menu message too, per his request.
git-svn-id: svn+ssh://svn.code.sf.net/p/quakespasm/code/trunk@1638 af15c1b1-3010-417e-b628-4374ebc0bcbd
2019-09-18 09:39:00 +00:00
sezero
8bcf0ebef5 GL_BuildLightmaps: minor warning fixes. more accurate developer warning.
git-svn-id: svn+ssh://svn.code.sf.net/p/quakespasm/code/trunk@1637 af15c1b1-3010-417e-b628-4374ebc0bcbd
2019-09-18 09:17:24 +00:00
sezero
9957d1ec7d remove Steve's name from various doco/contacts as per his request.
git-svn-id: svn+ssh://svn.code.sf.net/p/quakespasm/code/trunk@1636 af15c1b1-3010-417e-b628-4374ebc0bcbd
2019-09-17 11:10:18 +00:00
sezero
368d82e0fe oslibs, codecs: rebuilt flac decoder after applying fixes from upstream
git-svn-id: svn+ssh://svn.code.sf.net/p/quakespasm/code/trunk@1635 af15c1b1-3010-417e-b628-4374ebc0bcbd
2019-09-16 11:10:28 +00:00
sezero
0e09cc97d4 r_brush.c (AllocBlock): add casts to malloc and realloc
( in case someone wants to build using C++ compilers. )

git-svn-id: svn+ssh://svn.code.sf.net/p/quakespasm/code/trunk@1634 af15c1b1-3010-417e-b628-4374ebc0bcbd
2019-09-16 11:00:38 +00:00
Shpoike
e29e9c405d Fix stupid coop parms bug. 2019-09-13 19:05:24 +01:00
Shpoike
1a0bd0a56b Added FTE_ENT_SKIN_CONTENTS support. 2019-09-13 19:04:49 +01:00
Shpoike
dad6791383 Added FTE_ENT_SKIN_CONTENTS support. 2019-09-13 18:51:16 +01:00
sezero
a0327f55a7 SDL2: rebuilt from latest SDL2-hg-r13074 to test upcoming v2.0.11.
git-svn-id: svn+ssh://svn.code.sf.net/p/quakespasm/code/trunk@1633 af15c1b1-3010-417e-b628-4374ebc0bcbd
2019-09-12 17:20:28 +00:00
sezero
016c62b660 oslibs: rebuilt SDL-1.2 from latest mainstream source.
git-svn-id: svn+ssh://svn.code.sf.net/p/quakespasm/code/trunk@1632 af15c1b1-3010-417e-b628-4374ebc0bcbd
2019-09-12 17:14:01 +00:00
sezero
5e38066687 bump version to 0.93.2, update changelog.
git-svn-id: svn+ssh://svn.code.sf.net/p/quakespasm/code/trunk@1631 af15c1b1-3010-417e-b628-4374ebc0bcbd
2019-09-12 12:36:59 +00:00
sezero
968f31d158 move LMBLOCK_WIDTH/HEIGHT from bspfile.h to glquake.h
git-svn-id: svn+ssh://svn.code.sf.net/p/quakespasm/code/trunk@1630 af15c1b1-3010-417e-b628-4374ebc0bcbd
2019-09-12 12:34:12 +00:00
sezero
2a79b43e12 minor simplification
git-svn-id: svn+ssh://svn.code.sf.net/p/quakespasm/code/trunk@1629 af15c1b1-3010-417e-b628-4374ebc0bcbd
2019-09-12 12:33:02 +00:00
ewasylishen
1777fac4ae r_brush.c: dynamically allocate lightmaps, from QuakeSpasm-Spike
This raises LMBLOCK_WIDTH/HEIGHT from 128 to 256 which should
be supported everywhere and decrease draw calls

git-svn-id: svn+ssh://svn.code.sf.net/p/quakespasm/code/trunk@1628 af15c1b1-3010-417e-b628-4374ebc0bcbd
2019-09-12 06:49:35 +00:00
ewasylishen
0594fa4192 r_brush.c: rename BLOCK_WIDTH/HEIGHT to LMBLOCK_WIDTH/HEIGHT to match QSS
(no other changes)

git-svn-id: svn+ssh://svn.code.sf.net/p/quakespasm/code/trunk@1627 af15c1b1-3010-417e-b628-4374ebc0bcbd
2019-09-12 06:49:27 +00:00
ewasylishen
fb7b52d44b raise MAXALIASTRIS from 2048 to 4096 so SlayerTest mdl's load.
TODO: look at switching to Spike's mdl code from QSS
TODO: add "exceeds standard limit" warnings

git-svn-id: svn+ssh://svn.code.sf.net/p/quakespasm/code/trunk@1626 af15c1b1-3010-417e-b628-4374ebc0bcbd
2019-09-12 04:06:57 +00:00
ewasylishen
9d323e3e8c Mod_LoadAliasModel: don't corrupt memory if MAXALIASTRIS exceeded
git-svn-id: svn+ssh://svn.code.sf.net/p/quakespasm/code/trunk@1625 af15c1b1-3010-417e-b628-4374ebc0bcbd
2019-09-12 04:06:55 +00:00
ewasylishen
72ee1b3643 Sky_NewMap: avoid stack buffer underflow on the "remove trailing spaces"
line that happened if a map had an empty string worldspawn key,
detected by ASan on macOS with demo_map.bsp from SlayerTest.

Also prevent the strcpy's from overflowing the buffers in case of long
keys.

git-svn-id: svn+ssh://svn.code.sf.net/p/quakespasm/code/trunk@1624 af15c1b1-3010-417e-b628-4374ebc0bcbd
2019-09-12 04:06:54 +00:00
Shpoike
a9b5e4c238 Fix revision string escapes. 2019-09-10 19:02:39 +01:00
Shpoike
fc9be8e37a Quick attempt at skyrooms. Seems to work for me. Note that the server's pvs is not opened, nor have I tried to depthmask sky surfaces to avoid leakage. _skyroom "x y z" in worldspawn to use. 2019-09-10 18:58:03 +01:00
Shpoike
48cc790784 Merge branch 'master' of https://github.com/ericwa/Quakespasm 2019-09-10 15:58:52 +01:00
Shpoike
0da18d5281 Added support for LMSTYLES16 bspx lump, allowing up to 16 lightstyles per face and a lot more switchable light styles. 2019-09-10 15:41:11 +01:00
sezero
a99372766a update lodepng to 20190824 version from mainstream.
git-svn-id: svn+ssh://svn.code.sf.net/p/quakespasm/code/trunk@1623 af15c1b1-3010-417e-b628-4374ebc0bcbd
2019-08-28 00:10:02 +00:00
sezero
d36f35ab2e watcom makefiles: make wlink quiet
git-svn-id: svn+ssh://svn.code.sf.net/p/quakespasm/code/trunk@1622 af15c1b1-3010-417e-b628-4374ebc0bcbd
2019-08-28 00:01:04 +00:00
sezero
b98b15325d SDL2: rebuilt from latest SDL2-hg-r13033 to test upcoming v2.0.11.
git-svn-id: svn+ssh://svn.code.sf.net/p/quakespasm/code/trunk@1621 af15c1b1-3010-417e-b628-4374ebc0bcbd
2019-08-24 09:21:07 +00:00
sezero
58bb88d36d oslibs, SDL-1.2: rebuilt from latest code (1.2.16).
git-svn-id: svn+ssh://svn.code.sf.net/p/quakespasm/code/trunk@1620 af15c1b1-3010-417e-b628-4374ebc0bcbd
2019-08-23 08:47:40 +00:00