From: Samual Lenks <samual@xonotic.org>
Date: Sun, 24 Nov 2013 04:37:50 +0000 (-0500)
Subject: Merge remote-tracking branch 'origin/Mario/csqc_models'
X-Git-Tag: xonotic-v0.8.0~257
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=d2aa2e833adeef6854046076d65472310ac9f542;p=xonotic%2Fxonotic-data.pk3dir.git

Merge remote-tracking branch 'origin/Mario/csqc_models'

# By Mario
# Via Mario
* origin/Mario/csqc_models:
  Use WriteShort for mins/maxs linking
  Comment out size reset (can cause crashes with some models on first load)
  Use WriteChar for mins/maxs linking & WriteByte for scale linking
  Network colormod to fix sandbox object colors
  Add func_breakable CSQC model linking again
  Remove func_breakable CSQC model linking
  Allow larger model scale
  Roughly link onslaught control points
  Network model scale, mins & maxs, link sandbox & breakable models with CSQC
---

d2aa2e833adeef6854046076d65472310ac9f542