upstream imports r830
upstream imports r870

eihrul (28):
      cheaper tqaa color neighborhood estimate
      remove unused tqaareprojectscale var
      fix website links
      reduce physics rate from 200 Hz to 125 Hz
      reduce net rate from 30 Hz to 25 Hz
      change crouch time to 200 ms
      avoid some projection singularities when spotlights point straight down
      local shader param remap fix
      anim skeleton cleanups
      WIP ragdoll
      cheaper rotation limit rejection
      use RGB instead of greyscale base texture
      enet 1.3.10
      check for GL_ARB_copy_buffer
      shader param sharing for model rendering
      model color scale fix
      model envmaptmu cleanups
      faster model shader params key scheme
      tqaamovemask fix
      slightly better tqaa color neighborhood estimate
      fix missing bone normalization
      ragdoll optimizations
      don't begin a new gpu timer if one is already active
      render radiance hints during occlusion query wait
      rhinoq fixes
      use GL_ARB_gpu_shader5 by default where available
      limit mesa_texrectoffset_bug to gl version < 3.2
      better tqaa color neighborhood estimation when gl version >= 4.0 or GL_ARB_gpu_shader5 available

nieb (12):
      media: derp
      media: Bones
      media: complex waypoints
      media: Bones, run S,SW,SE animation
      src: animationinterpolationtime = 200
      src: eyeheight = 18
      src: crouch speed = 50%
      media: Bones, crouch N animation
      src: crouch speed = 40% derp
      media: Bones, crouch NE, NW, W, E, S, SE, SW animation WIP
      media: Bones
      media: Bones
upstream imports r882

eihrul (7):
      static genvbo fix
      player color selection
      use only 5 bits for encoding color
      get rid of automake build system for enet
      use := for ENET_CFLAGS
      don't build enet on mingw
      simplify check_cflags.sh cc handling

nieb (5):
      media: Bones, jump frames
      media: Bones, crouch jump frames
      doc
      doc
      media: complex waypoints
Upstream imports r978

eihrul (47):
      SDL2 2.0.1
      fix SDL_config.h
      recursive makefile for enet
      remove verbose flag from ar
      rifle -> railgun, rocket -> pulse rifle
      remove melee model
      no more fist weapon, guns instead have shoot or melee attacks
      fix ai weappref
      shoot cleanup
      don't show score particles
      credits update
      punctuation
      typo fix
      backport texturecull from RE
      hastarget fix
      enable GL_ARB_texture_gather extension by default
      remove support for GL_AMD_texture_texture4 extension since it is basically never used anymore
      entreplace cleanup
      slower air speed when crouching
      use rotation for bullet decal
      MDL_ONLYSHADOW flag
      zoom cleanup
      shadowgather tweak
      VS warning fix
      another VS warning fix
      GETPLAYERCOLOR fix
      workaround for nvidia textureGatherOffset bug with shadow samplers
      rename autograss to texgrass
      WIP rail/pulse particles/decals
      adddecal cleanup
      better glow decal handling
      glow decal cleanup
      decal colorscale fixes
      decal shader refactoring
      pulse trail tweak
      placeholder particle colors
      fixspace
      reorder particles
      mesa rgb16 fbo workaround
      maxdebris fix
      explosion fix
      remove debris/gibs
      entcopy fix
      remove old muzzle flashes
      kluge to make pulses look a bit better in first-person
      particle decal fixes
      fix mod particle transparency

nieb (49):
      src: swayside 0.10, swayup = 0.15
      media
      config
      media: pulse particle
      media: blood particle tweak
      media, src: flare tweak, JPG -> PNG
      media: flare tweak 2: the sequel
      media: flare tweak: the trilogy
      media: Bones, subtle glow for visibility
      media: Bones, glow tweak
      media, src: particles
      media: particles
      media, src: particles, decal size
      src: avatarfov = 55, avatardepth = 0.8
      media: Railgun WIP 1
      media: Railgun WIP2
      media: Railgun WIP3
      media: Railgun WIP4
      media
      media: Railgun WIP4, worldgun
      media: Railgun WIP4.1
      media: PulseRifle WIP1
      media: PulseRifle WIP2 :P
      src: typo fixes
      media: weapon wips
      src, media: avatarfov = 40
      media
      src: gameplay tweaks, attackdelay & projspeed
      src: aboveeye = 2
      media: flare particle
      media: weapon WIPs
      src: gameplay tweak
      media: weapon WIPs, on to highpolys
      media: Railgun, first test bake
      doc
      src: pulse particle size tweaks
      media: pulse_glow tweak, add pulse_burst
      media: Railgun lowpoly UVmapped
      media
      src: weapon decal tweaks
      src: more particle tweaks, colors/sizes/durations
      media: Pulserifle test bake
      src, media: more particle tweaks :D
      media: tag_muzzle setup
      media: ditto
      src: more particle tweaks
      src, media: more particle tweaks
      src, media: tweak-tastic!
      media
save smoothgroups to art cfg
Merge branch 'pending'