From: terencehill <piuntn@gmail.com>
Date: Wed, 26 Aug 2015 12:24:11 +0000 (+0200)
Subject: Merge branch 'master' into terencehill/slider_anim_improvements
X-Git-Tag: xonotic-v0.8.2~1890^2~4
X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=commitdiff_plain;h=08e6497842b33529d0c1b0caa431b49ca98d79da

Merge branch 'master' into terencehill/slider_anim_improvements

Conflicts:
	qcsrc/menu/anim/animation.qc
---

08e6497842b33529d0c1b0caa431b49ca98d79da
diff --cc qcsrc/menu/anim/animation.qc
index 2a954db369,d52ae4f719..5563b969d9
--- a/qcsrc/menu/anim/animation.qc
+++ b/qcsrc/menu/anim/animation.qc
@@@ -3,20 -3,19 +3,20 @@@
  #include "../oo/base.qh"
  void setterDummy(entity, float);
  CLASS(Animation, Object)
- 	METHOD(Animation, configureAnimation, void(entity, entity, void(entity, float), float, float, float, float))
- 	METHOD(Animation, update, void(entity, float, float, float))
- 	METHOD(Animation, setTimeStartEnd, void(entity, float, float))
- 	METHOD(Animation, setTimeStartDuration, void(entity, float, float))
- 	METHOD(Animation, setValueStartEnd, void(entity, float, float))
- 	METHOD(Animation, setValueStartDelta, void(entity, float, float))
- 	METHOD(Animation, setObjectSetter, void(entity, entity, void(entity, float)))
- 	METHOD(Animation, tick, void(entity, float))
- 	METHOD(Animation, calcValue, float(entity, float, float, float, float))
- 	METHOD(Animation, isStopped, float(entity))
- 	METHOD(Animation, stopAnim, void(entity))
- 	METHOD(Animation, resumeAnim, void(entity))
- 	METHOD(Animation, isFinished, float(entity))
- 	METHOD(Animation, finishAnim, void(entity))
+ 	METHOD(Animation, configureAnimation, void(entity, entity, void(entity, float), float, float, float, float));
++	METHOD(Animation, update, void(entity, float, float, float));
+ 	METHOD(Animation, setTimeStartEnd, void(entity, float, float));
+ 	METHOD(Animation, setTimeStartDuration, void(entity, float, float));
+ 	METHOD(Animation, setValueStartEnd, void(entity, float, float));
+ 	METHOD(Animation, setValueStartDelta, void(entity, float, float));
+ 	METHOD(Animation, setObjectSetter, void(entity, entity, void(entity, float)));
+ 	METHOD(Animation, tick, void(entity, float));
+ 	METHOD(Animation, calcValue, float(entity, float, float, float, float));
+ 	METHOD(Animation, isStopped, float(entity));
+ 	METHOD(Animation, stopAnim, void(entity));
+ 	METHOD(Animation, resumeAnim, void(entity));
+ 	METHOD(Animation, isFinished, float(entity));
+ 	METHOD(Animation, finishAnim, void(entity));
  	ATTRIB(Animation, object, entity, NULL)
  	ATTRIB(Animation, setter, void(entity, float), setterDummy)
  	ATTRIB(Animation, value, float, 0)