Commit graph

2363 commits

Author SHA1 Message Date
Tim Angus
20086f392c Merge pull request #63 from kungfooman/visualstudio
Add misc/msvc11/ to support Microsoft Visual Studio 2012 Express Edition
2014-04-04 11:04:11 +01:00
kungfooman
40985b53d6 Add misc/msvc12/ to support Microsoft Visual Studio 2012 Express Edition 2014-04-01 17:30:57 +02:00
Tobias Kuehnhammer
63463d1bcf Fix compiling game VM with OBSTACLEDEBUG defined 2014-03-24 17:10:24 -05:00
Zack Middleton
cf7d8ef9cf Remove -falign-loops and -falign-jumps from Makefile
Clang warns and errors because of them on various platforms.

Based on pull request #43 by @xhairball.
2014-03-24 13:09:49 -05:00
Zack Middleton
9f3fd12501 Remove unused extern qboolean charSet
No variable even exists.
2014-03-24 12:47:14 -05:00
Tim Angus
3185ae6b1f Merge pull request #56 from MAN-AT-ARMS/net_stop
Release network bindings on shutdown
2014-03-24 14:35:34 +00:00
Tim Angus
1cbb5e9771 Merge pull request #44 from xhairball/features/add-vorbis-1.3.4
Add vorbis 1.3.4 support
2014-03-24 14:15:11 +00:00
Tim Angus
2393c8f44f Merge pull request #55 from MAN-AT-ARMS/status_command
Fix colored name padding and allow IPv6 address to fit in output of 'status' command
2014-03-24 14:12:06 +00:00
Tim Angus
9027365be6 Merge pull request #59 from MAN-AT-ARMS/sdl_1215_hg
Update SDL 1.2.15 to Revision 8040
2014-03-24 13:23:24 +00:00
SmileTheory
b099255748 #6095: OpenGL2: Use areamask and leaf cluster for PVS when VIS is missing. 2014-03-19 17:59:07 -07:00
Zack Middleton
67d9ecd070 Fix FS_FOpenFileReadDir non-zero file handle when file not found in pk3
If a pk3 search path is passed to FS_FOpenFileReadDir, a non-zero
file handle is returned if file is not found. This causes incorrect
behavior in FS_ReadFileDir (when a pk3 search path is passed in)
which only checks file handle, not length, for seeing if file exists.

I don't know of any issues in ioq3 caused by this.
2014-03-18 20:49:52 -05:00
Zack Middleton
0861d3c583 Revert "DMA 44100Hz needs more memory for sound buffers"
This reverts commit 0e6632f464.

Cause crashes if com_soundMegs is 32.
2014-03-17 13:44:30 -05:00
SmileTheory
375f6247d4 OpenGL2: Parallax corrected cubemap (cheaper trick) 2014-03-16 16:29:38 -07:00
Zack Middleton
d0d1883895 Merge pull request #60 from smokin-guns/master
Bunch of comment fixes
2014-03-12 20:28:49 -05:00
Tequila
baca82d64e Bunch of comment fixes 2014-03-13 02:20:54 +01:00
Zack Middleton
0e6632f464 DMA 44100Hz needs more memory for sound buffers
It doubles the size of the data compared to the default (22050),
so increase the buffer automatically. Likewise, decreasing speed
doesn't need as much (though that doesn't really matter).
2014-03-11 17:16:03 -05:00
Zack Middleton
a167110f43 Don't mix sfx with NULL soundData
Caused a crash. Already done for looping sounds.
2014-03-11 16:44:50 -05:00
Zack Middleton
63d1911c18 Parse q3map_sunExt in OpenGL1 too
Used for drawing sun, which is supported by both OpenGL1 and OpenGL2.
OpenGL2 already parses it.
2014-03-11 12:38:53 -05:00
Zack Middleton
07290a7d52 Fix typo in animMap and videoMap warnings 2014-03-10 19:58:55 -05:00
Zack Middleton
c8c7bb1dc3 Fix R_GetEntityToken ending prematurely
If spawn var key or value is "" it caused R_GetEntityToken (available to
cgame, used by opengl2) to stop parsing, whereas game VM would continue.

Changed it to match parsing used for game VM
(see G_GET_ENTITY_TOKEN in code/server/sv_game.c).

The map poq3dm5 has a "wait" key with value "".
2014-03-10 16:27:31 -05:00
Zack Middleton
5a3e10d716 Don't say cubemap is outside lightgrid 6 times 2014-03-10 16:12:49 -05:00
Zack Middleton
b98e6d5cc0 Fix error handling in R_ParseSpawnVars
When R_GetEntityToken returns qfalse it resets pointer for parsing, by
R_ParseSpawnVars not returning qfalse it could cause an infinite loop.

Also add newlines to printfs.
2014-03-10 15:57:26 -05:00
MAN-AT-ARMS
5e1011bf70 Update SDL 1.2.15 to Revision 8040 2014-03-09 09:24:54 -04:00
Zack Middleton
e7f43545ed Don't wash out HDR vertex lite surfaces in OpenGL2
Vertex lite surfaces being brighter than light maps looks bad,
they're meant to look the same. Especially in ET, which mixes
them fequently. It's noticeable in Q3 too though.

BSP lightmaps (i.e. not external HDR lightmaps) use
R_ColorShiftLightingBytes, now *Floats (used by vertex colors)
has the same behavior.

This may be a problem for HDR lightmaps, as the RGB will always be
scaled to 0.0 to 1.0 range.

I had enabled this for non-HDR before, but now HDR needs it too.
2014-03-08 12:30:47 -06:00
James Canete
8caeb62741 Merge pull request #57 from MAN-AT-ARMS/specularScale
OpenGL2: Set default normal/specular in RE_RegisterShaderFromImage
2014-03-04 18:01:25 -08:00
MAN-AT-ARMS
11ed883298 OpenGL2: Set default normal/specular in RE_RegisterShaderFromImage 2014-03-04 20:31:31 -05:00
SmileTheory
ee67d0a981 OpenGL2: Add normalScale and parallaxDepth stage keywords and helper cvars. 2014-03-03 21:02:39 -08:00
SmileTheory
ea2810c085 OpenGL2: Minor GLSL shader improvements. 2014-03-03 17:32:07 -08:00
MAN-AT-ARMS
89fab090d7 Fix s_alDopplerSpeed default value 2014-03-02 23:00:46 -06:00
Ensiform
950dc7254a Fix native trap_BotMutateGoalFuzzyLogic 2014-03-02 22:53:15 -06:00
MAN-AT-ARMS
8661e0509b Release netowrk bindings on shutdown 2014-02-22 21:18:34 -05:00
MAN-AT-ARMS
94e36c288c Fix colored name padding and allow IPv6 address to fit in output of
'status' command
2014-02-22 20:47:18 -05:00
MAN-AT-ARMS
71386beaac OpenGL2: Fix pshadows for MDR models 2014-02-22 18:09:48 -06:00
Zack Middleton
5bf4f26d5f Remove references to alDopplerVelocity
Let's load driver even if it doesn't have the deprecated alDopplerVelocity.
2014-02-22 18:06:04 -06:00
MAN-AT-ARMS
6887a69064 Replace deprecated alDopplerVelocity with alSpeedOfSound per OpenAL 1.1 spec 2014-02-22 18:02:22 -06:00
SmileTheory
3740c55dec OpenGL2: Remove and force r_softOverbright. 2014-02-20 17:01:50 -08:00
SmileTheory
5fabc28dff OpenGL2: Fix rendering when r_hdr = 0 and r_floatLightmap = 1 2014-02-14 22:41:25 -08:00
Zack Middleton
3cfc1bb1f9 Rebuilt Windows libcurl-7.35.0 static libraries
Fix linking with mingw32.
Enable FTPS and HTTPS.
2014-02-14 20:08:48 -06:00
SmileTheory
78f8100d74 OpenGL2: Oops, set lightmap alpha to 1. 2014-02-14 03:31:54 -08:00
SmileTheory
7a23bb1c59 OpenGL2: Fix bug in ColorToRGBM(). 2014-02-14 02:52:22 -08:00
SmileTheory
79e9baedf8 OpenGL2: Set RGBM to use a multiplier of 1, and only use it with HDR lightmaps. 2014-02-13 18:04:23 -08:00
Zack Middleton
6beab9cf58 Merge pull request #45 from xhairball/features/upgrade-curl-7.35.0
Upgrade libcurl to the latest release (7.35.0).
2014-02-13 16:50:25 -06:00
Zack Middleton
718d0a0d11 Fix sending pk3 download error messages to clients
Disabled in e52a492f61.
2014-02-09 20:23:48 -06:00
user
922d7044f6 Merge branch 'master' into features/upgrade-curl-7.35.0 2014-02-10 00:28:57 +00:00
Zack Middleton
90eb32c5ab Clear referenced paks when disconnecting
After playing Team Arena, if you switch to Q3A and try to play a demo with
cl_allowDownload enabled it would print "Need Paks: blah blah" and not play the demo.
2014-02-08 22:09:30 -06:00
hairball
31d8f95427 Remove unnecessary NEED_VORBIS since you have USE_CODEC_VORBIS
Thanks zturtleman for catching this
2014-02-08 22:02:24 +00:00
hairball
1435e78454 Upgrade from libcurl 7.15.5 (2006-08-07) to 7.35.0 (2014-01-29)
Note: This uses the generic curlbuild.h because it is used by multiple platforms.
A system curl would have a configure generated one.

The libraries for win32 and win64 were cross compiled with these options:

  --disable-shared --enable-static --disable-ares --enable-http \
  --enable-ftp --disable-ldap --disable-ldaps --disable-rtsp \
  --disable-dict --disable-file --disable-telnet --disable-tftp \
  --disable-pop3 --disable-imap --disable-smtp --disable-gopher \
  --enable-ipv6 --without-ssl \
  --disable-manual --disable-libcurl-option

This effectively enables only HTTP and FTP protocol support.
2014-02-08 17:33:56 +00:00
hairball
cc40051839 Add vorbis 1.3.4 build support 2014-02-08 08:26:03 +00:00
Zack Middleton
c2e2514efc Merge pull request #41 from xhairball/fixes/check-cc-when-cross-compiling-mingw32
When cross compiling on mingw32, make sure it finds a CC
2014-02-07 22:33:02 -06:00
Zack Middleton
d0b1fb4fed Merge branch 'features/upgrade-opus-1.1' of https://github.com/xhairball/ioq3 into opus_update
Conflicts:
	Makefile
2014-02-07 22:12:59 -06:00