Commit Graph

809 Commits

Author SHA1 Message Date
minggo b8eae4cc39 fix some comments 2016-01-29 18:32:54 +08:00
minggo 22e16061bf fix some comments 2016-01-29 17:18:19 +08:00
minggo 1e11c9e547 fix some return type error 2016-01-29 15:36:01 +08:00
minggo e5f6575032 fix some comment error 2016-01-29 15:24:20 +08:00
pandamicro 7a805493cd Merge pull request #299 from dabingnn/normalizedFillCenter
using normalized fill center in scale9 sprite
2016-01-28 18:38:58 +08:00
Huabing.Xu 5d07a13583 using normalized fill center in scale9 sprite 2016-01-28 18:08:53 +08:00
pandamicro 5acea7ade2 Merge pull request #298 from dabingnn/refine_code
refine sprite code
2016-01-28 17:31:31 +08:00
Huabing.Xu 9f5cfe8591 remove contentscalefactor in sprite remove cc.SpriteType 2016-01-28 17:23:10 +08:00
pandamicro 19aa5c5753 Merge pull request #297 from zilongshanren/fixLabelLayoutBugs
Fix label layout bugs
2016-01-28 17:13:24 +08:00
pandamicro eba3344506 Merge pull request #287 from dabingnn/refineSprite
Refine sprite
2016-01-28 16:32:23 +08:00
Huabing.Xu 3ecb22611b function and variable rename filled->fill 2016-01-28 15:49:36 +08:00
Huabing.Xu 967419e90e refine code to optimisze too many news 2016-01-28 15:18:53 +08:00
zilongshanren 4701b70474 refine 2016-01-28 14:43:41 +08:00
zilongshanren 3726ce7f95 fix node active in layout 2016-01-28 13:52:05 +08:00
zilongshanren a008a91135 fix label layout issue 2016-01-28 11:22:37 +08:00
Jare Guo 1c8c3fb7d5 Merge pull request #296 from minggo/master
fix a comment error
2016-01-28 11:04:31 +08:00
minggo b88975c860 fix a comment error 2016-01-28 10:53:28 +08:00
minggo d36db23a0a fix a comment error 2016-01-28 10:50:42 +08:00
zilongshanren b7726501c0 fix label layout in editor 2016-01-28 09:58:08 +08:00
Jare Guo 1f5f5b4824 Merge pull request #295 from jareguo/master
_sgNode should reset by editor
2016-01-27 22:43:47 +08:00
Huabing.Xu a829105602 refine code 2016-01-27 18:37:20 +08:00
Jare Guo 98c161d3c2 _sgNode should reset by editor 2016-01-27 18:33:39 +08:00
Huabing.Xu 7b01babbdc scale9 sprite use quad pool 2016-01-27 17:52:22 +08:00
Jare Guo 2b1e3c4e06 Merge pull request #294 from zilongshanren/fixLabelLayoutBugs
fix label comp initial string and file issue
2016-01-27 17:12:07 +08:00
zilongshanren 1e3e136186 fix label comp initial string and file issue 2016-01-27 17:05:12 +08:00
Jare Guo 89b76c40fd Merge pull request #293 from jareguo/master
简化常用组件的 sgNode 初始化流程
2016-01-27 16:55:29 +08:00
pandamicro cba1755e43 Merge pull request #290 from zilongshanren/fix-ui-bugs
Fix layout first element don't do layout properly issue.
2016-01-27 16:44:42 +08:00
Jare Guo da5905a98d make it likely to initialize comp._sgNode just in constructor 2016-01-27 16:42:45 +08:00
Jare Guo f8738a0b65 Merge commit 'ccc04fb726d93d5a2847285db1b58c83a005fe1f' 2016-01-27 16:12:59 +08:00
Wang Nan a6fc30c63f Merge pull request #292 from nantas/master
fix click event name.
2016-01-27 16:11:57 +08:00
Jare Guo 077b6638eb make it likely to initialize comp._sgNode just in constructor 2016-01-27 16:10:51 +08:00
Nan Wang 1621f7a519 fix click event name. 2016-01-27 16:10:01 +08:00
Huabing.Xu 7e00341c02 refine code 2016-01-27 15:37:12 +08:00
Huabing.Xu d864e86168 refine code 2016-01-27 15:22:54 +08:00
Huabing.Xu 7814406c0b rename FilledType -> FillType 2016-01-27 14:51:03 +08:00
Jare Guo ccc04fb726 Merge pull request #291 from minggo/master
fix a commment
2016-01-27 14:26:30 +08:00
minggo 0d987930c9 fix a commment 2016-01-27 14:22:47 +08:00
zilongshanren 8efc7e652d refactor system label
refactoring canvasSizeX/canvasSizeY to canvasWidth/canvasHeight

add project jshintrc

fix formating issue
2016-01-27 14:21:05 +08:00
Huabing.Xu dc30a3b76c refine code 2016-01-27 14:11:42 +08:00
Huabing.Xu 352c311775 do not set this._sgNode.xxx() if this._sgNode is null 2016-01-27 13:41:41 +08:00
Huabing.Xu 12b7ea6a11 refactor filled sprite 2016-01-27 11:41:47 +08:00
zilongshanren ad68d7c410 fix layout one children layout issue 2016-01-26 20:59:25 +08:00
Huabing.Xu b01ed265de canvas works 2016-01-26 18:28:39 +08:00
Jare Guo c08c4c1607 Merge pull request #289 from 2youyouo2/event
fixed animation event
2016-01-26 17:56:50 +08:00
Jare Guo bd84751e69 Merge pull request #288 from 2youyouo2/animation
fixed error when change wrapMode
2016-01-26 17:54:38 +08:00
2youyouo2 0ac7d7efb7 fixed animation event 2016-01-26 16:52:00 +08:00
pandamicro 40f91ad4d2 Merge pull request #279 from zilongshanren/add-editobox-support
add EditBox component.
2016-01-26 15:18:30 +08:00
zilongshanren a67c846bf7 refine EditBox 2016-01-26 15:00:06 +08:00
Huabing.Xu 2a4e0199e9 rename cc.FillType -> cc.Scale9Sprite.FillType 2016-01-26 10:54:39 +08:00
2youyouo2 2ea5f94e2e fixed error when change wrapMode 2016-01-25 17:09:40 +08:00