Merges in animation work so far.
authordsc <david.schoonover@gmail.com>
Mon, 16 May 2011 09:09:20 +0000 (02:09 -0700)
committerdsc <david.schoonover@gmail.com>
Mon, 16 May 2011 09:09:20 +0000 (02:09 -0700)
commit2c10354e6c6dd7f43e3aa3ba0e701a5ee5cdf168
tree0f6fa21cd90a24f673583cedce0f8cb8ac93e729
parentd41c2b4238bd08f5770627f327c87f2a8f80e87f
parent858695b87e47eec21612904954915543fc14a676
Merges in animation work so far.

Conflicts:
src/tanks/Game.h
src/tanks/Game.m
src/tanks/unit/Unit.h
src/tanks/unit/Unit.m
tanks.xcodeproj/project.pbxproj
src/render/animation/AnimationContainer.mm
src/tanks/Game.h
src/tanks/unit/Unit.h
tanks.xcodeproj/project.pbxproj