Zack Middleton
69f9c7d692
Merge branch 'master' into game/eliteforce
...
Conflicts:
Makefile
code/qcommon/q_shared.h
2016-06-17 02:22:52 -05:00
Zack Middleton
780f0a5d3e
Prevent CL_RunCinematic from reading cinTable[-1]
...
At the end of CL_RunCinematic, RoQShutdown sets currentHandle to -1.
This causes the return at the end to be return cinTable[-1].status.
Use return FMV_EOF when RoQShutdown is called.
I think FMV_EOF should be returned instead of FMV_IDLE which is set in
RoQShutdown because RoQShutdown is clearing out state so it can be reused
for a new cinematic.
The return value isn't actually read by the ioq3 client, renderers,
cgame, or ui.
2016-06-15 13:58:26 -05:00
Victor Roemer
398dea397c
Fix Makefile for OSX
...
Bump base SDK from 10.5 -> 10.7
Just use the builtin __APPLE__
2016-06-12 17:17:33 -04:00
Zack Middleton
8b458e5457
Fix warnings that names passed to Name_PlayerNameCompletion is not const
2016-05-09 10:41:58 -05:00
SmileTheory
41791c662f
Fix frame_msec possibly being zero in cl_input.c.
...
This fixes a mouse freezing bug.
2016-01-29 20:14:35 -08:00
Zack Middleton
8d38e2307c
Fix some opus_decode issues
...
It was able to fail the assert before. I was using opus_decode wrong.
2016-01-06 05:19:10 -06:00
Zack Middleton
615b73288f
Use Opus for VoIP
...
Server/client VoIP protocol is handled by adding new cvars
cl_voipProtocol and sv_voipProtocol, sv_voip and cl_voip
are used to auto set/clear them. All users need to touch
are cl/sv_voip as 0 or 1 just like before.
Old Speex VoIP packets in demos are skipped.
New VoIP packets are skipped in demos if sv_voipProtocol
doesn't match cl_voipProtocol.
Notable difference between usage of speex and opus codecs,
when using Speex client would be sent 80ms at a time.
Using Opus, 60ms is sent at a time. This was changed because
the Opus codec supports encoding up to 60ms at a time.
(Simpler to send only one codec frame in a packet.)
2016-01-06 05:19:10 -06:00
Zachary J. Slater
fe619680f8
Merge pull request #73 from Pan7/sayto
...
sayto cmd with player name completion
2015-12-28 09:04:19 -08:00
Tim Angus
7e0dac7517
Fix check for empty rconpassword in CL_Rcon_f
2015-10-04 21:11:35 +01:00
Tim Angus
9732f1ba69
Now with less infinite recursion
2015-09-26 10:54:16 +01:00
Tim Angus
c70e10d15e
Effectively revert c2e146c1
2015-09-25 22:50:01 +01:00
Tim Angus
ec6916ded5
Fix the wonky fix to the wonky va_list usage
2015-09-09 23:33:36 +01:00
Tim Angus
566e2a18de
Fix wonky va_list usage
2015-09-09 22:32:12 +01:00
Zack Middleton
188ca86a92
Fix CL_ParseDownload when using legacy protocol
2015-08-22 20:15:30 -05:00
Zack Middleton
8eeac09569
Merge branch 'master' into game/eliteforce
2015-08-12 17:21:52 -05:00
Pan7
8fddf5d6cd
Fix va_list warning
2015-07-30 17:09:51 +02:00
Pan7
017af35969
Add missing qcurl handle cleanup
2015-07-29 16:44:59 +02:00
Tim Angus
4e1cf7ac9b
Return the result from qcurl_easy_setopt_warn
2015-07-29 13:39:27 +01:00
Tim Angus
eb3dda59e4
Merge pull request #143 from Pan7/qcurl_cleanup
...
qcurl_multi_cleanup check
2015-07-29 13:16:39 +01:00
Pan7
e9e1e25d77
qcurl_multi_cleanup check
2015-07-29 13:32:00 +02:00
Pan7
c2e146c145
qcurl_easy_setopt dev warning
2015-07-28 17:23:31 +02:00
Tim Angus
da79a3ed4e
Merge pull request #140 from Pan7/qcurl_remove
...
qcurl_multi_remove_handle check
2015-07-28 10:37:07 +01:00
Pan7
4db5c3af40
qcurl_multi_strerror not curl_multi_strerror
2015-07-27 21:04:47 +02:00
Pan7
85faec91ab
qcurl_multi_remove_handle check
2015-07-27 20:38:20 +02:00
Tim Angus
0dad4ce9fe
Merge pull request #92 from Pan7/curl_error
...
qcurl_multi_add_handle error check
2015-07-26 19:48:03 +01:00
Zack Middleton
9839534543
Merge branch 'misc/lilium_common' into game/eliteforce
2015-07-24 23:56:15 -05:00
Zack Middleton
b4b68b8e80
Remove logically dead code from CL_GetServerStatus
...
Found by Coverity.
2015-07-12 21:14:04 -05:00
Zack Middleton
6b9a3a47db
Merge branch 'master' into game/eliteforce
...
Conflicts:
code/renderergl1/tr_main.c
code/renderergl2/tr_main.c
2015-07-09 18:42:11 -05:00
Zack Middleton
6d62dc3646
Fix abs() being used for float in cl_input.c
2015-06-28 18:27:09 -05:00
Zack Middleton
70eb1fa79e
Make cinematic times be int like CL_ScaledMilliseconds
...
Cinematic's startTime and lastTime are always set from CL_ScaledMilliseconds
which returns int and are converted back and forth to int and unsigned int.
This fixes a warning that abs() is used on an unsigned int.
2015-06-28 18:02:51 -05:00
Zack Middleton
b27e0fbf95
Remove unused function WRITE_1BYTES from cl_avi.c
2015-06-28 17:55:51 -05:00
Zack Middleton
73de855c27
Merge branch 'master' into game/eliteforce
...
Conflicts:
code/client/cl_main.c
2015-06-24 16:48:46 -05:00
Jeff Kent
63e6c82f4b
fix buffer overflow in CL_CheckForResend
2015-04-18 22:43:47 -05:00
Zack Middleton
956bea9cda
Merge branch 'master' into game/eliteforce
2015-03-23 23:54:32 -05:00
Zack Middleton
4fb053b8e7
Fix incorrect strncpy in S_AL_StartBackgroundTrack
...
Error is loop argument is NULL.
Ensure that s_backgroundTrack is a null terminated string.
2015-02-05 04:37:26 -06:00
Simon McVittie
ff7ff32b0e
Ensure that mbstowcs does not overflow its buffer
...
Similar to one of the changes by Tim Angus in fd986da
: mbstowcs' third
argument is the number of wchar_t available in dest, not the number
of bytes.
This does not appear to be exploitable, because ioquake3 does
not actually call mumble_set_identity() or mumble_set_description()
anywhere, but it might be relevant to derivatives.
Spotted via compiler warnings.
2015-01-07 23:37:11 +00:00
Zack Middleton
7de09c3490
Include stdint.h instead of inttypes.h in libmumblelink.c
...
MSVC 2010 has stdint.h but not inttypes.h.
Debian (GCC, MinGW) and OS X (Clang) can compile using stdint.h.
2014-12-28 15:08:02 -06:00
Zack Middleton
7e663b7c86
Misc Elite Force code clean up
2014-10-29 10:52:23 -05:00
Zack Middleton
b7cd6b6088
Elite Force white space clean up
...
Also fixed some code to match ioq3 (a few comments, a printf, ..).
2014-10-29 10:13:12 -05:00
Zack Middleton
c6e5f060fe
Port Elite Force iorev2231 patch to latest ioq3
...
Port Thilo Schulz's Elite Force Holomatch patch to latest ioq3.
Patch for ioq3 svn r2231.
No support for OpenGL2 renderer yet.
2014-10-29 07:15:12 -05:00
Zack Middleton
0e412276c5
Add support for playing MP3s using libmad
...
Based on Thilo's Elite Force patch for ioq3.
Updated Makefile changes. Left out in-tree win32 lib support.
Striped trailing whitespace from snd_codec_mp3.c.
Changed two #if USE_CODEC_MP3 to use #ifdef.
2014-10-29 05:49:57 -05:00
Pan7
50038a7d26
qcurl_multi_add_handle error check
2014-10-26 17:10:41 +01:00
Tim Angus
f83334d81b
Add facility to describe cvars
2014-09-26 14:29:51 +01:00
Zack Middleton
a5d641b3d0
Merge pull request #84 from MAN-AT-ARMS/openal_speedsound
...
Change default value for s_alDopplerSpeed
2014-09-09 18:05:08 -05:00
MAN-AT-ARMS
a3653e475e
Change default value for s_alDopplerSpeed
2014-09-09 13:03:29 -04:00
MAN-AT-ARMS
dd83cbdc25
Fix possible division by zero in S_PaintChannelFrom16_altivec
2014-09-09 11:30:23 -04:00
Tim Angus
4f3c95c589
Fix client warnings
2014-09-01 11:13:47 +01:00
Zack Middleton
de3062623a
Use ColorIndexForNumber in Con_DrawSolidConsole
2014-08-29 01:55:47 -05:00
Zack Middleton
1d95ef210e
SDL 2 scroll/caps/num lock keys send KEYUP event when key is released
2014-08-28 20:09:37 -05:00
Pan7
18e08125dd
Add ColorIndexForNumber macro replacing '& 0x07'
...
Makes it easier to add more colors.
2014-08-28 20:09:37 -05:00