From: Samual Lenks <samual@xonotic.org>
Date: Sun, 9 Mar 2014 01:07:41 +0000 (-0500)
Subject: Merge remote-tracking branch 'origin/master into samual/weapons
X-Git-Tag: xonotic-v0.8.0~152^2~32
X-Git-Url: http://de.git.xonotic.org/?a=commitdiff_plain;h=198c14c07ac0c2f4484c171fce4145dcedc42172;p=xonotic%2Fxonotic-data.pk3dir.git

Merge remote-tracking branch 'origin/master into samual/weapons

Conflicts:
	qcsrc/common/util.qh
---

198c14c07ac0c2f4484c171fce4145dcedc42172
diff --cc qcsrc/common/util.qh
index ae378ddfd,503aa2d2a..570a41e01
--- a/qcsrc/common/util.qh
+++ b/qcsrc/common/util.qh
@@@ -446,4 -442,6 +446,8 @@@ float Mod_Q1BSP_SuperContentsFromNative
  float Mod_Q1BSP_NativeContentsFromSuperContents(float supercontents);
  #endif
  
+ // Quadratic splines (bezier)
+ vector bezier_quadratic_getpoint(vector a, vector p, vector b, float t);
+ vector bezier_quadratic_getderivative(vector a, vector p, vector b, float t);
++
 +#define APPEND_TO_STRING(list,sep,add) ((list) = (((list) != "") ? strcat(list, sep, add) : (add)))