Commit Graph

2736 Commits

Author SHA1 Message Date
Zack Middleton 9ec7931c54 Merge branch 'master' into sdl2 2014-03-08 21:32:47 -06: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
Tim Angus 1250b352be Merge branch 'master' into sdl2 2014-02-18 10:30:35 +00: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
hairball 4e67034d5a Add support for x86_64 cross compiling in Travis CI 2014-02-10 10:35:01 +00: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 ed087bb89e Merge branch 'master' into sdl2 2014-02-07 23:24:12 -06: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
Zack Middleton 166f5ab90c Merge branch 'features/upgrade-opusfile-0.5' of https://github.com/xhairball/ioq3 into opus_update 2014-02-07 22:11:31 -06:00
hairball 6fa6ab1064 When cross compiling on mingw32, make sure it finds a CC 2014-02-08 03:57:39 +00:00
hairball 2de340895f Upgrade libogg 1.3.0 to 1.3.1
This is a minor bugfix release with few changes
2014-02-08 03:38:01 +00:00
hairball b0aed02823 Upgrade opusfile 0.2 to 0.5 2014-02-08 03:29:10 +00:00
hairball 9e0c602795 Upgrade opus 1.0.2 -> 1.1 2014-02-08 03:21:02 +00:00
Zack Middleton d8e42cf02f Merge pull request #35 from inolen/no_renderer_restart
don't restart renderer in SV_SpawnServer unless client running dedicated
2014-02-01 16:22:24 -08:00
Zack Middleton aedb151d94 Merge pull request #33 from inolen/widescreen_clear_fix
don't clear screen during CA_LOADING and CA_PRIMED
2014-02-01 15:51:41 -08:00
Anthony Pesch 278d7533e5 restart the renderer after the hunk mark has been set 2014-02-01 09:58:49 -08:00
Zack Middleton 36a4075a8d Try default OpenAL driver if user set one fails to load 2014-01-27 20:09:55 -06:00
Zack Middleton 49d756364a Merge pull request #34 from robo9k/issue/libjpeg-turbo
Fix check for jpeg_mem_ to work with libjpeg-turbo
2014-01-27 15:21:05 -08:00
robo9k 1611188ef7 Fix check for jpeg_mem_ to work with libjpeg-turbo 2014-01-27 23:41:51 +01:00
Zack Middleton cc9072d098 Check for buffer overflow for rail/lightning surfaces 2014-01-25 21:15:36 -06:00
Anthony Pesch 280b5269f8 don't clear screen during CA_LOADING and CA_PRIMED 2014-01-23 13:44:36 -08:00
Zack Middleton dde36d91ce Fix OpenGL2 non-HDR map surface over brighting
Vertex lit map surfaces were saturating to white when
r_mapOverBrightBits was increased and r_hdr was disabled.

Now the color is normalized like lightmaps and lightgrid
when r_hdr is disabled. Which is the same as OpenGL1.

Noticeable on misc_model trisoup.
2014-01-16 00:12:21 -06:00
Zack Middleton aa92f7e76a Merge pull request #30 from inolen/nova_fix
don't call va each frame in GLSL_VertexAttribPointers
2014-01-14 13:23:37 -08:00
Anthony Pesch 3603102088 don't call va each frame in GLSL_VertexAttribPointers 2014-01-14 13:19:15 -08:00
SmileTheory eea652f5c5 Don't create images/framebuffers that won't be used, and add checks before use. 2014-01-12 20:52:36 -08:00
Zack Middleton d4fc617cec Merge pull request #26 from andreyv/master
Include opengl2 client in make copyfiles if USE_RENDERER_DLOPEN=0
2014-01-12 17:41:58 -08:00
Zack Middleton 0698817a7f Remove unused code path from S_Base_StartBackgroundTrack
We make sure intro isn't NULL. Then if loop is NULL, set it to intro.
2014-01-12 18:16:39 -06:00