Fixed conflicts to merge kickbox in.

2015-01-27 18:03:41 -07:00
parent 80a02b40bb cf66c5e78d
commit 40b25e6220
269 changed files with 2639 additions and 514 deletions
@@ -22,7 +22,7 @@ public:
 	virtual void Update( float fDeltaTime );
 	virtual void DrawPrimitives();

-	virtual void Init( const PlayerState* pPlayerState, float fYReverseOffsetPixels );
+	virtual void Init( const PlayerState* pPlayerState, float fYReverseOffsetPixels, bool use_states_zoom= true );
 	virtual void Load( 
 		const NoteData* pNoteData, 
 		int iDrawDistanceAfterTargetsPixels,