Updated AUTHORS & CHANGELOG

paulsm · Sep 22, 2011 · e9db31f · e9db31f
1 parent 3fa02fe
commit e9db31f
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 2 deletions.
diff --git a/AUTHORS b/AUTHORS
@@ -24,6 +24,9 @@ Contributors (alphabetically ordered):
 	Author of the new reorder Sprite/Node algorithm
 	Schedule: added support for delay and repeat
 	ESRenderer: don't recreate the renderer when it is not needed
+	Actions: Instant actions can be sequenceables
+	Actions: durtion is not divided by zero
+	Actions: Repeat & RepeatForever work as expectd
 
 * Ricardo Ruiz:
 	Added support for RGB888 textures

diff --git a/CHANGELOG b/CHANGELOG
@@ -10,6 +10,9 @@ version 1.1 - XX-Ago-2011
 . [NEW] Textures: Added support for RGB888 textures (issue #958)
 . [NEW] TileMap: TMX map supports flipped tiles (issue #1233)
 . [FIX] Actions: removed #undef CLAMP (issue #1210)
+. [FIX] Actions: Repeat & RepeatForEver work as expected(issue #1247)
+. [FIX] Actions: duration is not divided by zero (issue #615)
+. [FIX] Actions: Instant actions can be sequenceables (issue #1166)
 . [FIX] ESRenderer: Don't recreate if it is not needed (issue #1153)
 . [FIX] FileUtils: Loads -hd resources even if the sd resource is not present (issue #1179)
 . [FIX] FileUtils: renamed ccRemoveSuffixFromFile to +[CCFileUtils removeSuffixFromFile:];

diff --git a/cocos2d/CCActionInterval.m b/cocos2d/CCActionInterval.m
@@ -90,7 +90,7 @@ -(void) step: (ccTime) dt
 	} else
 		elapsed_ += dt;
 
-	[self update: MIN(1, elapsed_/MAX(duration_,0.000001f))];
+	[self update: MIN(1, elapsed_/MAX(duration_,FLT_EPSILON))];
 }
 
 -(void) startWithTarget:(id)aTarget
@@ -184,7 +184,7 @@ -(void) dealloc
 -(void) startWithTarget:(id)aTarget
 {
 	[super startWithTarget:aTarget];	
-	split_ = [actions_[0] duration] / MAX(duration_, 0.000001f);
+	split_ = [actions_[0] duration] / MAX(duration_, FLT_EPSILON);
 	last_ = -1;
 }