I don't even... merge/conflict failed here, sorry.
Q_StripColor patch from Didz
Also strip ^8 and ^9 with Q_StripColor
Revert ioq3 change that prevents using the caps/num/scroll lock keys as binds
Changed the output of the SP project to openjk_sp.x86.dll. Fixed one check involving the text crawl.
Updated .gitignore and removed 1 useless file (winquake.res)
Reverted 1ca0aab1e, which fixes issue #165
Fixed badness in NPC_AI_Jedi.c (WP_ForcePowerUsable has 2 args in reality, but externed as having 3)
Fixed target_level_change (taspir1->taspir2 caused crash) and trigger brushmodels
Some GT_SINGLE_PLAYER cleanup, allowed voting and map selection, etc
Added NPC_AI_Hazardtrooper.c file, currently incomplete. TODO: rewrite from scratch
Bunch of fixes, cleaned up NPC precaching, bad ICARUS error messages, allowed GT_SINGLE_PLAYER in menus with a valid .arena file
fixing conflicts
Sorted NPC precache table
Fixed COM_ParseExt 1 byte buffer overflow issue in MP
Disable epilepsy mode with r_clear 42 in MP
Fixed some general buffer overwrites, possible NULL dereferencing and one particularly volatile issue where writing a .sab with a saber whose name is too long causes nasty out of bounds memory access.
Merge branch 'master' of https://github.com/Razish/OpenJK
Tweaked CG_AddRadarEnt and CG_AddBracketEnt as Ensiform suggested, after I noted some issues in VS' code analysis.
Corrected a few potential buffer overruns that might be caused by some nefarious server mods...