]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commit
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)
commit8c76eca6b11a16b366b59eb9a308bb19cecaa789
tree0286a990e1245c0d8baa0a52d6823d57d487b29a
parent53e872ae4dc8dfbe10ed92aa30ec5329a491a4ff
parent865c96c6f00d5912f86165ddc9066993c0c6b1b4
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