Zack Middleton
107cae63d6
Merge branch 'master' into sdl2
...
Conflicts:
.travis.yml
2014-06-03 00:52:49 -05:00
Zack Middleton
cd3b7133ae
Skip merging a SDL 1.2 commit into sdl2
2014-06-03 00:51:31 -05:00
Zack Middleton
b12a9acf4d
Merge branch 'master' (early part 2) into sdl2
2014-06-03 00:50:50 -05:00
Zack Middleton
b5a17f3058
Skip merging a SDL 1.2 commit into sdl2
2014-06-03 00:50:00 -05:00
Zack Middleton
b87d889af8
Merge branch 'master' (early part 1) into sdl2
2014-06-03 00:49:05 -05:00
Ensiform
af79d2cb38
Fix an invalid null deref check in the slider code.
2014-05-29 22:27:00 -05:00
SmileTheory
9efaf819dc
OpenGL2: Really obvious optimization to previous commit.
2014-05-27 20:52:36 -07:00
SmileTheory
318d45cff5
OpenGL2: Reimplement MD3 tangent space calculation.
2014-05-27 18:20:12 -07:00
Zack Middleton
347b429fdb
Fix potential OOB in Windows Dedicated TTY CON_Show
...
Found by Coverity.
2014-05-26 23:11:56 -05:00
Zack Middleton
077ab4cbd1
Fix OOB access in CM_EdgePlaneNum without erroring in CM_GridPlane
...
I changed warning to error in 9d74227559
,
which broke JA's mp/ctf4 map and probably others.
2014-05-25 23:03:42 -05:00
Zack Middleton
eeeaf3f125
Fix potential buffer overflow caused by long tcMod args
...
Found by Coverity.
2014-05-25 18:44:17 -05:00
Zack Middleton
9c99cf29db
Have OpenGL2 "map $lightmap" check for NULL tr.lightmaps too
...
Zero length lightmap lump will have NULL tr.lightmaps.
OpenGL1 already has this check, because r_vertexLight 1
would crash Team Arena. OpenGL2 does not disable loading lightmaps
when r_vertexLight is 1 though, so it does not have that issue.
2014-05-25 18:41:57 -05:00
Zack Middleton
7a4ef47476
Fix max bans range check in SV_AddBanToList
...
Adding too many bans would write out of bounds. Found by Coverity.
2014-05-25 18:41:51 -05:00
Zack Middleton
eea9fbdb61
Fix unchecked buffer size issues in l_script.c and l_precomp.c
...
Found by Coverity.
2014-05-25 18:41:24 -05:00
Zack Middleton
078d004dc2
Fix potential buffer overflow in PS_ReadPrimitive
...
Found by Coverity.
2014-05-25 16:28:38 -05:00
Zack Middleton
e21ff01946
Don't use memset with non-zero value to fill ints
...
Coverity reported using value -2 as a bad memset. Really doesn't make sense when filling ints and not bytes too.
2014-05-25 16:10:01 -05:00
Zack Middleton
9d74227559
Fix potential out of bounds access caused by CM_GridPlane
...
Coverity doesn't care if there is a warning, out of bounds access is bad.
2014-05-25 15:59:09 -05:00
Zack Middleton
494789664e
Try to fix Travis CI MinGW builds
...
Listing i686-w64-mingw32-gcc as a compiler stopped working.
Travis tries to print version before installing it.
$ i686-w64-mingw32-gcc --version
/home/travis/build.sh: line 201: i686-w64-mingw32-gcc: command not found
The command "i686-w64-mingw32-gcc --version" failed and exited with 127 during setup.
2014-05-19 17:28:06 -05:00
Zack Middleton
6a33a69795
Disable key repeat if key catcher is 0
...
SDL1.2 branch disables key repeat when key catcher is 0.
Presumably to prevent binds from executing multiple times.
SDL2 replaced being able to disabled key repeat using SDL_EnableKeyRepeat
with a non-zero repeat value in the key event.
2014-05-19 03:45:44 -05:00
Zack Middleton
a3c2f77236
Fix Gauntlet barrel axis in UI
...
UI's PositionRotatedEntityOnTag is different than CGame's and
UI has switched pitch/roll for Gauntlet/BFG axis to get it to
look like /close to/ how it looks in CGame.
Making UI use the same *PositionRotatedEntityOnTag and axis as
CGame fixes the Gauntlet blade being wobbly in controls menu.
2014-05-18 20:38:14 -05:00
Zack Middleton
daa570c193
Fix always switching back to mgun in Q3 controls menu
...
Caused by 120e296a74
.
2014-05-18 20:27:18 -05:00
Zack Middleton
5c4e429471
Merge branch 'features/add-x86_64-travis-ci-support' of github.com:xhairball/ioq3
2014-05-12 21:34:40 -05:00
Zack Middleton
6d47ff88a6
Don't install libvorbis-dev on Travis
...
The in-tree copy of vorbis is used. No reason to install the package anymore.
2014-05-12 21:30:39 -05:00
Tim Angus
d44f4ed9ac
Merge pull request #69 from RobertoEstrada/master
...
Switched runtime library to Multithreaded DLL to fix build on VS2012.
2014-05-07 09:48:31 +01:00
Roberto Estrada
adc1b2cbd1
Switched runtime library to Multithreaded DLL to fix build on VS2012.
2014-05-07 10:37:42 +02:00
Zack Middleton
3a7298d6ae
Make R_LerpTag return qfalse if MDR tag does not exist
...
Elite Force SDK has trap_R_LerpTag return void, so this shouldn't cause issues for iostvef.
Allows new games to check if a tag exists in a MDR model.
2014-05-06 21:10:16 -05:00
Zack Middleton
b9061c8447
Fix cg.skulltrails out of bounds access in Team Arena Harvester mode
...
In Team Arena's Harvester mode, players corrupt your memory from beyond
the grave. Gib the players to stop the corruption!
CG_PlayerTokens is called for player entities, including corpses.
The entity number is used for the index in cg.skulltrails which only has
MAX_CLIENTS elements. This results in incorrect memory being overwritten
for corpse entities (as the entity number is >= MAX_CLIENTS).
So limit skull trails to valid entities (entity number < MAX_CLIENTS).
2014-05-01 21:32:21 -05:00
SmileTheory
7beff8bc7e
OpenGL2: Remove misleading documentation for gamma cvars.
2014-04-22 19:50:39 -07:00
MAN-AT-ARMS
b9b67036f3
Rebuilt MSVC SDL 1.2.15 Revision 8040 import libs
2014-04-16 15:08:21 -05:00
SmileTheory
4fe69cb418
OpenGL2: Remove sRGB support, replace with gamma cvars.
2014-04-16 05:26:03 -07:00
MAN-AT-ARMS
880a7c6bec
Add MSVC SDL 1.2.15 Revision 8040 import libs
2014-04-07 22:28:18 -05:00
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
Zack Middleton
cfcd2d2d7f
Merge pull request #65 from MAN-AT-ARMS/sdl2_203
...
Update SDL2 to 2.0.3
2014-03-24 19:37:46 -05:00
MAN-AT-ARMS
d426ed307d
Update SDL2 to 2.0.3
2014-03-24 19:13:56 -04:00
Zack Middleton
c55df2c9aa
Merge branch 'master' into sdl2
2014-03-24 17:53:08 -05:00
Zack Middleton
8b06986a9f
Skip merging sdl1.2 commit into sdl2
2014-03-24 17:52:32 -05:00
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
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
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