Zack Middleton
73aa7ef2c7
Merge branch 'master' (early part) into sdl2
2014-03-24 17:51:57 -05:00
Tobias Kuehnhammer
63463d1bcf
Fix compiling game VM with OBSTACLEDEBUG defined
2014-03-24 17:10:24 -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
Zack Middleton
9f22ae9cb2
Fix ctrl-c etc codes for edit fields
2014-03-17 12:46:09 -05:00
Zack Middleton
344ff23164
Fix multisampling on X11
...
Setting SDL_GL_ACCELERATED_VISUAL was disabled for ioq3 SDL 1.2
for other reasons. However, it causes creating GL context to fail
if multisampling is enabled on X11 for both SDL1.2 and SDL2.
Tested using nVidia proprietary driver on Debian 7.
2014-03-17 12:24:59 -05:00
SmileTheory
375f6247d4
OpenGL2: Parallax corrected cubemap (cheaper trick)
2014-03-16 16:29:38 -07:00
Zack Middleton
8455b5a833
Don't crash when fail to create SDL window
2014-03-15 17:54:00 -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
MAN-AT-ARMS
dafed0fd66
Update SDL2 to 2.0.2
2014-03-08 21:33:02 -06:00
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
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
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
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
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
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
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
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
Zack Middleton
ebac005c9e
Don't read clc.voipIncomingSequence until range checked sender
2014-01-12 18:01:02 -06:00
Zack Middleton
581b6316b7
Fix GL2 deluxemap 0,0,0 to 127,127,127
...
Checked if first byte was 0 twice instead of checking second byte.
2014-01-12 17:02:21 -06:00
Zack Middleton
52e72408d9
Fix demoName Com_sprintf size larger than buffer
...
Maybe this is why demoName is a static global with the comment 'compiler bug workaround'?
2014-01-12 16:22:46 -06:00
Zack Middleton
43c6ebee8d
Fix music studder in base sound when starting silent cinematics
2014-01-12 15:14:38 -06:00
Zack Middleton
a889d7a14f
Remove extra client_t::csUpdated[] slot
...
sv.configstrings[] is limited to 0 to MAX_CONFIGSTRINGS-1, make client_t::csUpdated[] the same.
2014-01-11 17:37:06 -06:00
Zack Middleton
4520857fc9
Make GL2 MDR code use R_VboPackNormal for normal
2014-01-10 12:48:17 -06:00
Zack Middleton
fda03ee4ca
Fix PNG tRNS length checks
2014-01-10 12:34:48 -06:00
SmileTheory
bc2efc4870
#6077 : OpenGL2: Add r_ignoreDstAlpha.
2013-12-17 04:08:25 -08:00
Zack Middleton
1a86229538
Fix playback of stereo sounds in Base sound system
...
Already works correctly in OpenAL.
2013-12-15 00:23:10 -06:00
SmileTheory
623d107f42
OpenGL2: Small glsl shader optimizations, fixes, and cleanup.
2013-12-12 21:38:01 -08:00
Amanieu d'Antras
efe8437cde
Fix crash in OpenAL when no input devices are available
2013-12-10 16:40:28 -06:00
SmileTheory
f6f3a19f73
OpenGL2: Support GL_ARB_vertex_type_2_10_10_10_rev for normals/tangents/lightdirs
2013-12-09 17:33:54 -08:00
Zack Middleton
2ba7a33715
Have ui_test cmd in missionpack ui return qtrue
2013-12-07 21:27:17 -06:00
Zack Middleton
fa9fd1b1fc
Support spatialized raw streams in base sound, e.g. for VoIP
2013-12-07 00:15:29 -06:00
Zack Middleton
7c0491d7fd
Add latch to r_centerWindow and r_allowResize
2013-12-06 23:42:23 -06:00
IR4T4
ca23b626a0
r_noborder changes require a restart
2013-12-06 23:29:47 -06:00
Zack Middleton
973a616061
Fix white flash levelshot bug in OpenGL1
...
If you tried to draw the last loaded image, gl texture 0 (which is appearently white)
was used because renderer thought the image was already bound.
Why OpenGL1 renderer binds texture 0, I have no idea. It's been removed from OpenGL2.
2013-12-06 23:06:52 -06:00
James Canete
c02528cf1d
Merge pull request #21 from cmf028/master
...
Fix glsl DEFORM_BULGE calculation
2013-12-01 19:33:51 -08:00
cmf028
e01b66aef5
Fix glsl DEFORM_BULGE calculation
2013-12-01 21:19:26 -06:00
Zack Middleton
0a4da32d62
Remove R_AddAnimSurfaces and R_MakeAnimModel prototypes
2013-11-30 03:16:05 -06:00
SmileTheory
ecc1f23b1d
OpenGL2: Remove redundant GLS_* enum.
...
Thanks Xycaleth for pointing out.
2013-11-29 23:40:48 -08:00
SmileTheory
6f3edb20b8
#6069 : Remove md4 model support.
2013-11-29 16:13:47 -08:00
Zack Middleton
952fd0489c
Readd backspace char event for UI VM text fields
...
UI VMs expect a backspace char event, but sdl2 branch only was only sending a key event.
Revert cl_keys.c to master branch (it would cause backspace to happen twice in console).
2013-11-26 17:03:15 -06:00
Zack Middleton
ad514c9689
Merge branch 'master' into sdl2
2013-11-26 16:57:10 -06:00
Zack Middleton
2044bcb12d
Silence warnings about unused static functions in opengl2
2013-11-25 15:27:09 -06:00
Zack Middleton
1633ac5b93
Make kamikaze timer loops use level.num_entities instead of MAX_GENTITIES
...
Optimization. Many other loops use level.num_entities, there was no
special reason that MAX_GENTITIES was used for these.
2013-11-21 02:26:31 -06:00
Zack Middleton
57eae5da91
Fix signal 6 in S_Base_StartBackgroundTrack on OS X 10.9
...
In S_UpdateBackgroundTrack, s_backgroundLoop was passed to
S_Base_StartBackgroundTrack and tried to copy to itself using Q_strncpyz.
2013-11-20 23:19:17 -06:00
Zack Middleton
8af9516e88
End current draw surface before drawing cinematic
...
Fixes drawing StretchPic *before* CIN_DrawCinematic resulting
in cinematic being drawn before the StretchPic.
2013-11-20 21:37:17 -06:00
SmileTheory
d63d7ba6bf
OpenGL2: Use RGBA16F format for HDR.
...
RGB16F is not 4-byte aligned and not supported by certain hardware.
2013-11-20 00:48:18 -08:00
SmileTheory
e686010d73
#6059 : OpenGL2: Read depths from resolve fbo when msaa is on in RB_TestFlare().
2013-11-20 00:45:08 -08:00
SmileTheory
c350963bf2
OpenGL2: Match glsl data type names: matrix_t -> mat4_t, vec*i_t -> ivec*_t
2013-11-19 03:23:50 -08:00
Zack Middleton
3736968943
Merge branch 'master' into sdl2
2013-11-17 19:01:35 -06:00
SmileTheory
6e5f8cc918
OpenGL2: Calculate bitangent in shader, and store normal/tangent as normalized byte arrays.
2013-11-12 19:21:51 -08:00