lilium-voyager/code
Zack Middleton 4837f4619e Merge branch 'master' into game/eliteforce
Conflicts:
	code/client/cl_main.c
	code/qcommon/common.c
	code/qcommon/files.c
	code/qcommon/msg.c
	code/qcommon/q_shared.h
	code/renderercommon/tr_common.h
	code/renderergl2/tr_extensions.c
	code/sdl/sdl_glimp.c
2017-09-17 23:16:55 -05:00
..
AL 5882 - Update OpenAL Headers to OpenAL Soft 1.15.1 2013-02-17 07:34:41 -06:00
asm Fix Elite Force rounding for SnapVector 2015-07-09 18:44:07 -05:00
autoupdater Use "x86_64" and not "x86-64" like everything else in ioq3. 2017-06-04 02:46:49 -04:00
botlib Merge branch 'master' into game/eliteforce 2017-09-17 23:16:55 -05:00
cgame Merge branch 'master' into game/eliteforce 2017-09-17 23:16:55 -05:00
client Merge branch 'master' into game/eliteforce 2017-09-17 23:16:55 -05:00
curl-7.54.0/include Update internal curl to 7.54.0 2017-07-28 16:32:22 +01:00
game Merge branch 'master' into game/eliteforce 2017-09-17 23:16:55 -05:00
jpeg-8c Mark JPEG lib changes, file provided by Simon McVittie 2012-07-01 18:07:56 +00:00
libogg-1.3.2 Rename (already updated) libogg-1.3.1 to libogg-1.3.2 2017-05-23 11:47:26 -05:00
libs Update internal curl to 7.54.0 2017-07-28 16:32:22 +01:00
libvorbis-1.3.5 Rename (already updated) libvorbis-1.3.4 to libvorbis-1.3.5 2017-05-23 11:47:26 -05:00
null [null/null_glimp.c] Fix up bitrot in null impl 2016-07-26 10:52:15 +01:00
opus-1.1.4 Rename (already updated) opus-1.1 to opus-1.1.4 2017-05-23 11:47:27 -05:00
opusfile-0.8 Fix more maybe-uninitialized warnings in opusfile 2017-07-09 14:01:41 -05:00
q3_ui Update UI player animation handling to match CGame 2017-09-10 20:20:30 -05:00
qcommon Merge branch 'master' into game/eliteforce 2017-09-17 23:16:55 -05:00
renderercommon Merge branch 'master' into game/eliteforce 2017-09-17 23:16:55 -05:00
renderergl1 Merge branch 'master' into game/eliteforce 2017-09-17 23:16:55 -05:00
renderergl2 Merge branch 'master' into game/eliteforce 2017-09-17 23:16:55 -05:00
sdl Merge branch 'master' into game/eliteforce 2017-09-17 23:16:55 -05:00
SDL2/include Update SDL2 to 2.0.4 2016-08-15 22:20:00 -04:00
server Merge branch 'master' into game/eliteforce 2017-09-17 23:16:55 -05:00
sys Merge branch 'master' into game/eliteforce 2017-09-17 23:16:55 -05:00
tools [botlib] Use floating point absolute value rather than truncate to integer 2016-07-25 18:36:31 +01:00
ui Merge branch 'master' into game/eliteforce 2017-09-17 23:16:55 -05:00
zlib drop some useless return statements 2013-05-30 15:43:21 -05:00