]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
Merge remote-tracking branch 'origin/samual/splashing'
authorSamual Lenks <samual@xonotic.org>
Sat, 25 Jan 2014 22:22:58 +0000 (17:22 -0500)
committerSamual Lenks <samual@xonotic.org>
Sat, 25 Jan 2014 22:22:58 +0000 (17:22 -0500)
* 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


Trivial merge