Skip to content

fixed #1509 correct bug of cc.Follow #584

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Oct 17, 2012
Merged

fixed #1509 correct bug of cc.Follow #584

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6afcacb
fixed #1509 correct bug of cc.Follow
dingpinglv Oct 17, 2012
b4c2c36
Merge branch 'master' of https://github.com/cocos2d/cocos2d-html5 int…
dingpinglv Oct 17, 2012
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion cocos2d/actions/CCAction.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -367,7 +367,7 @@ cc.Follow = cc.Action.extend(/** @lends cc.Follow# */{
rect = rect || cc.RectZero();
this._followedNode = followedNode;

this._boundarySet = cc.Rect.CCRectEqualToRect(rect, cc.RectZero());
this._boundarySet = !cc.Rect.CCRectEqualToRect(rect, cc.RectZero());

this._boundaryFullyCovered = false;

Expand Down
3 changes: 2 additions & 1 deletion cocos2d/label_nodes/CCLabelAtlas.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,8 @@ cc.LabelAtlas = cc.AtlasNode.extend(/** @lends cc.LabelAtlas# */{
textureFilename = arg[1];
width = arg[2];
height = arg[3];
startChar = String.fromCharCode(arg[4]);
//startChar = String.fromCharCode(arg[4]);
startChar = arg[4];
cc.Assert(label !== null, "Label must be non-nil");
}

Expand Down