From: Samual Lenks <samual@xonotic.org>
Date: Sat, 25 Jan 2014 22:22:58 +0000 (-0500)
Subject: Merge remote-tracking branch 'origin/samual/splashing'
X-Git-Tag: xonotic-v0.8.0~233
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=8c76eca6b11a16b366b59eb9a308bb19cecaa789;p=xonotic%2Fxonotic-data.pk3dir.git

Merge remote-tracking branch 'origin/samual/splashing'

* origin/samual/splashing:
  Move the supercontents/nativecontents functions to util.qc
  Add proper cvar for the gameplayfix setting
  Final cleanup for now
  Remove some debug prints
  Need advice: Add TODO comment for the gameplayfix cvar
  cleanup comments, some debug, add .contentstransition func support
  Aaaaand it works.
  Working on adding CheckContentsTransition to CSQC movetypes
  Begin messing around with contents transition
---

8c76eca6b11a16b366b59eb9a308bb19cecaa789