Skip to content

Sync improvements made in legend project #3412

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.

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 45 commits into from
Dec 13, 2016
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
45 commits
Select commit Hold shift + click to select a range
43c08b2
'additionalTransform' correct processing
anlide Oct 2, 2016
de5f52a
Honor device pixel ratio in CCLabelTTF.getContentSize()
ntrrgc Nov 9, 2016
946367a
Revert "Fix UIText issue and Label getContentSize value wrong in reti…
ntrrgc Nov 9, 2016
cb1f68e
Avoid using cc.isString, cc.isXXX
Nov 18, 2016
4eab965
Add cc.view.setDocumentPixelWidth API
Nov 18, 2016
c715c42
Fix Editbox adaptation issue
Nov 18, 2016
360eba7
Reimplementation of DrawNode under WebGL
Nov 18, 2016
fbe6f6b
Remove useless comments
Nov 18, 2016
28d62b2
Improve Action System by reducing memory usage
Nov 18, 2016
5ba285e
Improve render command syncStatus logic
Nov 18, 2016
c4f4886
Fix protected node transform issue
Nov 18, 2016
7d0f69a
Improve WebGL Rendering performance
Nov 18, 2016
5cf049d
Fix Editbox default input mode issue
Nov 18, 2016
e0a4b95
Remove GL State cache
Nov 18, 2016
2ac19ad
Improve Scheduler memory footprint
Nov 21, 2016
1dc258f
Small improvements
Nov 21, 2016
57e0c0d
Improve EventManager performance
Nov 22, 2016
d79cf76
Fix Scale9Sprite transform issue causing transform stack corrupt
Nov 23, 2016
735ec99
Merge branch 'simpler-getContentSize' of github.com:ntrrgc/cocos2d-ht…
Dec 6, 2016
956b26e
Fix issues in #3407
Dec 6, 2016
e666a01
Merge branch 'develop' of github.com:anlide/cocos2d-html5 into legend
Dec 6, 2016
abf8cd7
Merge branch 'develop' of git://github.com/cocos2d/cocos2d-html5 into…
Dec 6, 2016
a6dd034
Code formatting
Dec 8, 2016
35d19b7
A set of small improvements
Dec 8, 2016
56710d4
Async loading project.json file, avoid chrome warning
Dec 8, 2016
c2bce43
Improve Class construction performance
Dec 8, 2016
bb0c171
Reduce cc.Color memory footprint
Dec 8, 2016
0ce51b1
Fix scissor clipping issue
Dec 8, 2016
41b1026
Improve updateProjectionUniform performance
Dec 8, 2016
7f9e68a
Improve RenderCmd construction performance
Dec 8, 2016
926c9e4
Improve construction performance in general
Dec 8, 2016
59d4645
Improve label adaptation performance
Dec 8, 2016
c1c76b0
Reimplement UIScale9Sprite using creator approach
Dec 8, 2016
b6f5e8c
Improve CCB reader performance
Dec 8, 2016
0bda54c
Improve UI Parser 1.x performance
Dec 8, 2016
523b231
Flat recursive call using stack for onEnter/onExit/cleanup etc
Dec 8, 2016
c93c8e1
Improve UI and support lazy loading
Dec 9, 2016
8f05415
Reformat CCBoot and improve cc.loader implementation
Dec 9, 2016
f37ba7c
Reformat code and improve CCAudio
Dec 9, 2016
467008a
Delay initialize shader cache
Dec 12, 2016
4d71e89
Fix bug
Dec 12, 2016
6325b10
Improve visit logic, reduce call stack depth
Dec 12, 2016
8c03b45
Fix 3D projection
Dec 12, 2016
40cab0a
Fix getPreferredSize is not a function issue
Dec 12, 2016
efdd358
Fix issues:
Dec 12, 2016
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
432 changes: 179 additions & 253 deletions CCBoot.js

Large diffs are not rendered by default.

144 changes: 72 additions & 72 deletions cocos2d/actions/CCAction.js

Large diffs are not rendered by default.

11 changes: 9 additions & 2 deletions cocos2d/actions/CCActionCatmullRom.js
Original file line number Diff line number Diff line change
Expand Up @@ -44,9 +44,10 @@
* @param {cc.Point} p3
* @param {Number} tension
* @param {Number} t
* @param {cc.Point} [out]
* @return {cc.Point}
*/
cc.cardinalSplineAt = function (p0, p1, p2, p3, tension, t) {
cc.cardinalSplineAt = function (p0, p1, p2, p3, tension, t, out) {
var t2 = t * t;
var t3 = t2 * t;

Expand All @@ -62,7 +63,13 @@ cc.cardinalSplineAt = function (p0, p1, p2, p3, tension, t) {

var x = (p0.x * b1 + p1.x * b2 + p2.x * b3 + p3.x * b4);
var y = (p0.y * b1 + p1.y * b2 + p2.y * b3 + p3.y * b4);
return cc.p(x, y);
if (out !== undefined) {
out.x = x;
out.y = y;
}
else {
return cc.p(x, y);
}
};

/**
Expand Down
Loading