1.2.4: Merge branch 'master' of https://github.com/JACoders/OpenJK
# Conflicts: # code/cgame/FxPrimitives.cpp # code/cgame/FxPrimitives.h # code/client/cl_input.cpp
# Conflicts: # code/cgame/FxPrimitives.cpp # code/cgame/FxPrimitives.h # code/client/cl_input.cpp