Merge remote-tracking branch 'origin/master' into 4.3.4

Conflicts:
	src/server/game/Entities/Unit/Unit.cpp
	src/server/game/Handlers/SkillHandler.cpp
This commit is contained in:
Nay committed 2012-09-08 01:34:24 +01:00
commit 242a2fdbc1
18 files changed
+132 -12

No files matched your search

@@ -167,6 +167,7 @@ void MoveSpline::Initialize(const MoveSplineInitArgs& args)
point_Idx_offset = args.path_Idx_offset;
initialOrientation = args.initialOrientation;
onTransport = false;
time_passed = 0;
vertical_acceleration = 0.f;
effect_start_time = 0;