Commit graph

2502 commits

Author SHA1 Message Date
Zack Middleton
0448f68a13 Fix predicting touching items in CTF and 1FCTF
In CTF, rail or plasma gun/ammo were not predicted for pickup depending on what team player is on. The rail and plasma values are the same as PW_REDFLAG and PW_BLUEFLAG.
In 1FCTF, only neutral flag, BFG, and BFG ammo were predicted for pickup. WP_BFG is equal to PW_NEUTRALFLAG.
2013-05-23 00:55:32 -05:00
Simon McVittie
69999280c6 Find Speex via user override, pkg-config or default search path 2013-05-19 21:32:20 +01:00
Simon McVittie
cff1fcd658 Look for system Vorbis, Opus and Ogg via pkg-config
As usual, the order of precedence is: user override, pkg-config,
or assume they're in standard locations.

In particular, Opus isn't in the default search path on Debian.
2013-05-19 21:31:26 +01:00
Simon McVittie
c817ab5ae0 Find system zlib via user override, pkg-config or in standard locations 2013-05-19 21:31:12 +01:00
Simon McVittie
9ff2fc3324 Allow system libjpeg to be in a non-standard location
It doesn't have pkg-config metadata (at least on Debian), so if the
user doesn't override it, assume normal system paths.
2013-05-19 21:28:31 +01:00
Simon McVittie
2821aa41d7 Allow OpenAL to be in a non-standard location on all platforms
Similar to libcurl, we didn't use OPENAL_LIBS and assumed it was
always "-lopenal".
2013-05-19 21:27:24 +01:00
Simon McVittie
b1da355644 Allow libcurl to be in a non-standard location on all platforms
We didn't add CURL_CFLAGS to CLIENT_CFLAGS on all platforms, and didn't
use CURL_LIBS at all, so if "pkg-config --libs" returned "-L... -lcurl"
or even "/.../libcurl.a", it wouldn't work.
2013-05-19 21:23:50 +01:00
Simon McVittie
608347c84d Centralize checks for Freetype, with a user override
This lets us find a library in a non-standard library directory
(via -L in the pkg-config metadata), and allows overrides similar to
the Autoconf convention, e.g.

    make FREETYPE_CFLAGS=-I/opt/freetype/include \
        FREETYPE_LIBS="-L/opt/freetype/lib -lfreetype"

If pkg-config didn't work, assume that Freetype is in the default
location.
2013-05-19 21:20:43 +01:00
Simon McVittie
1fe4e0c239 Add USE_INTERNAL_LIBS, a default for USE_INTERNAL_*
Linux distributions that want to link dependencies externally will
generally want to link (almost) every dependency externally; similarly,
minimal-dependency builds that want to use the embedded copies of
dependencies will generally want to do so for (almost) every dependency.
Make it easier to choose one of those by setting USE_INTERNAL_LIBS=0
or USE_INTERNAL_LIBS=1, respectively.

The default can still be overridden per-dependency; for instance,
"make USE_INTERNAL_LIBS=0 USE_INTERNAL_OPUS=1" will use the system
version of everything except Opus.
2013-05-19 21:19:52 +01:00
Ensiform
53bbfc2cd6 Remove unused renderCommandList variable from renderers 2013-05-13 12:08:16 -05:00
Tim Angus
d9d52f0306 Merge branch 'master' into sdl2
Conflicts:
	Makefile
	code/renderercommon/qgl.h
	code/renderergl1/tr_local.h
	code/sdl/sdl_glimp.c
2013-05-08 14:27:15 +01:00
Zack Middleton
42eeb7551d Merge pull request #2 from jonathangray/openbsd_fixes
OpenBSD fixes
2013-05-04 20:08:27 -07:00
Jonathan Gray
a88357b93c sync the OpenBSD cflags with Linux 2013-05-05 11:56:24 +10:00
Jonathan Gray
258c4782c6 correct the linked libs on OpenBSD 2013-05-05 11:40:57 +10:00
Jonathan Gray
3234d2b141 dlopen libopenal.so not libopenal.so.1 on OpenBSD 2013-05-05 11:28:54 +10:00
Zack Middleton
ee7bd0cae6 Show surface names in excessive vertexes and triangles warnings
Add newlines to renderergl2's R_LoadMD3 vertex and triangle warnings.
2013-05-03 14:28:18 -05:00
SmileTheory
3a47192ba8 Use specular texture RGB as specular reflectance, multiplied by per-material value. 2013-05-03 00:32:59 -07:00
SmileTheory
aff3f18101 #5889: Do post-processing only on viewport portion of frame buffer. 2013-04-26 18:49:48 -07:00
Zack Middleton
b6d64b7dc4 Correct TeamCount return type and team argument type 2013-04-26 15:46:12 -05:00
Harley Laue
1b2a6abed9 Rename FS_CheckFilenameIsNotImmutable to ..IsMutable 2013-04-24 14:45:37 -05:00
Zack Middleton
6c88bf8aee Rename FS_CheckFilenameIsNotExecutable to ..NotImmutable 2013-04-24 14:14:13 -05:00
Zack Middleton
936db459ee Don't allow modifying qvms or pk3s
Exception for allowing pk3s to be downloaded.
2013-04-24 14:11:18 -05:00
SmileTheory
8270d54a25 Don't scale shadow multipliers by overbrightbits, and improve documentation. 2013-04-22 21:52:16 -07:00
Zack Middleton
feb012152c Give botlib com_basegame for botlib.log path
Before it always used BASEGAME fallback code.
2013-04-22 23:11:10 -05:00
Zack Middleton
b95d8a91aa Fix referencing pk3 with only qagame QVM 2013-04-22 16:21:46 -05:00
Zack Middleton
a7317ac0d5 Add fallback for __func__ (ioq3 isn't compiled as c99 by default)
Using Debian gcc version 4.7.2 and clang 3.0-6.1 anyway.
2013-04-20 21:28:21 -05:00
Mikael Pettersson
1c66e30e7e Fix memmove()
[The lcc source] overrides the libc memmove() with its own implementation,
but that implementation fails to follow the specification. In particular,
it returns NULL rather than memmove()'s first parameter.

GCC now optimizes based on this aspect of the specification, so things go
wrong at runtime.

[Text & patch from http://gcc.gnu.org/bugzilla/show_bug.cgi?id=56881#c8]
2013-04-14 20:08:08 +01:00
Tim Angus
6983187a99 Remove old .mak files from botlib 2013-04-13 11:26:42 +01:00
Zack Middleton
319df2d4d7 Fix zone memory leak in OpenGL2 renderer
meminfo command showed the dynamic renderer zone amount going up by 1824 bytes each time I reloaded map using map command.
2013-04-10 23:21:40 -05:00
Tim Angus
230af8c9e9 Fix shfolder.dll not getting freed 2013-04-09 21:43:01 +01:00
Zack Middleton
0f62a565f9 Fix setting CVAR_VM_CREATED flag on user created cvars
Fix setting CVAR_VM_CREATED flag on cvars created using set[asu] commands (including archived cvars from cfg) and trap_Cvar_Set.

trap_Cvar_Register called Cvar_Get which cleared CVAR_USER_CREATED flag, but CVAR_VM_CREATED wasn't set because the cvar already existed.
2013-04-06 01:06:34 -05:00
SmileTheory
6a763f0671 Merge branch 'HEAD' of https://github.com/ioquake/ioq3.git into suntest 2013-04-02 00:18:24 -07:00
SmileTheory
28e14c4546 Add sunlight/lightmap merging by multiply (r_sunlightMode 1)
Merge additive sunlight and map lighting into one GLSL shader (r_sunlightMode 2)
Change single lightmap blends to use lightall
2013-04-02 00:17:24 -07:00
Tim Angus
efaa87de10 Fix typo preventing OSX native compiles 2013-03-28 11:13:58 +00:00
Tim Angus
0183f3978a Fix OSX app/ub scripts 2013-03-28 09:56:29 +00:00
Zack Middleton
59061e853e Change missionpack QVM build order in Makefile
Now it matches native libs and baseq3 QVMs.
2013-03-27 14:26:34 -05:00
Tim Angus
2b3c5492c7 Add option to create archive of build product 2013-03-27 14:35:11 +00:00
Tim Angus
838fcf45cb Make the build summary more pretty 2013-03-26 23:12:17 +00:00
Tim Angus
946c89b5f1 Fix 'make -jX clean release' 2013-03-26 20:58:55 +00:00
Tim Angus
12115c28cd Fix the warning caused by fixing the warnings 2013-03-26 18:32:36 +00:00
Tim Angus
98360bcd57 Fix some of the things clang --analyze flagged 2013-03-26 16:50:03 +00:00
SmileTheory
66acde6d60 Merge branch 'HEAD' of https://github.com/ioquake/ioq3.git into suntest 2013-03-25 21:05:27 -07:00
Tim Angus
352cd151e0 Cross compiling for OS X 2013-03-25 22:41:45 +00:00
Zachary Slater
01efc26654 s/enum/typedef enum/g on uniform_t for glorious fix of mac build. h/t MAN-AT-ARMS 2013-03-25 14:28:01 -07:00
Tim Angus
4f452fcfed Enable building QVMs when cross-compiling 2013-03-24 22:06:45 +00:00
Tim Angus
cae7ae9ce6 (bug #5904) Fix OpenBSD and Solaris builds 2013-03-23 12:14:03 +00:00
Tim Angus
d50338fb57 Use distclean for jenkins builds 2013-03-22 16:53:29 +00:00
Tim Angus
5d862d222e Make travis silent 2013-03-22 16:41:47 +00:00
Tim Angus
02a625a1b3 Fix it more 2013-03-22 14:47:37 +00:00
Tim Angus
6155816672 (Hopefully) fix the Jenkins build 2013-03-22 14:26:29 +00:00