22583 Commits

Author SHA1 Message Date
2youyouo2 1fcf650ac0 add cc.affineTransformClone 2015-12-08 13:42:27 +08:00
Jare Guo 89508d7bf0 loader should return error if load failed 2015-12-08 13:41:12 +08:00
Huabing.Xu e522073ef2 raw version mask works 2015-12-08 11:28:02 +08:00
Jare Guo 92d16ba44f Merge pull request #11 from jareguo/master
support loading builtin raw assets
2015-12-07 21:34:54 +08:00
Jare Guo b97e70e71d support loading builtin raw assets 2015-12-07 21:33:24 +08:00
zilongshanren 0384560614 don't reset fontsize and line height.
1. when switching from ttf to bmfont, don't reset the fontsize and
height.
2015-12-07 20:24:03 +08:00
pandamicro e9901dcea9 Merge pull request #8 from 2youyouo2/merge-update
remove cc.engine events
2015-12-07 18:45:19 +08:00
2youyouo2 169445998a move drawScene logic to mainLoop 2015-12-07 18:43:21 +08:00
Wang Nan 0afe28285e Merge pull request #6 from dabingnn/fix-label-color
Fix label color
2015-12-07 18:41:18 +08:00
Wang Nan 41a12cf918 Merge pull request #9 from zilongshanren/master
Fix horizontal clamp and shrink issue
2015-12-07 18:40:40 +08:00
zilongshanren e37e7b8f44 fix clamp issue 2015-12-07 18:27:19 +08:00
zilongshanren 190dca63a1 make clamp works 2015-12-07 17:11:17 +08:00
2youyouo2 26402c4637 remove cc.engine events 2015-12-07 15:59:15 +08:00
zilongshanren 5b9950ba58 fix bmfont clamp font size issue 2015-12-07 15:57:20 +08:00
Jare Guo beecebf0fc Merge pull request #7 from jareguo/master
update component menu
2015-12-07 15:56:04 +08:00
Jare Guo b15e2af7e3 update component menu 2015-12-07 15:54:42 +08:00
Huabing.Xu af4b65ca45 Merge branch 'master' into fix-label-color 2015-12-07 15:15:02 +08:00
Huabing.Xu 2079439ac7 try to fix label color 2015-12-07 14:58:19 +08:00
Jare Guo b5e1974c42 Merge pull request #5 from 2youyouo2/sample-curve
fixed sample-curve frame index error
2015-12-07 14:56:11 +08:00
Jare Guo eabbc1beba Merge pull request #4 from 2youyouo2/master
fixed wrap time not right when update clip
2015-12-07 14:55:50 +08:00
Huabing.Xu 68affd39da raw version for mask 2015-12-07 14:47:22 +08:00
2youyouo2 cee270b146 add test 2015-12-07 11:14:06 +08:00
2youyouo2 ecb7e8d4b0 fixed wrap time not right when update clip 2015-12-07 10:37:52 +08:00
2youyouo2 c66179ca98 fixed sample-curve frame index error 2015-12-07 09:58:03 +08:00
2youyouo2 cf9e8941fc refine 2015-12-07 09:55:31 +08:00
pandamicro ec075ca0d2 Merge pull request #3 from pandamicro/master
Support chipmunk physics
2015-12-07 01:42:52 +08:00
pandamicro 17e14adfd2 Support chipmunk physics 2015-12-07 01:39:38 +08:00
Wang Nan 344f31eec1 Merge pull request #2 from nantas/master
update engine path in tests
2015-12-06 20:08:31 +08:00
Nan Wang c8a9b18ce4 change package name back to cocos2d-html5 2015-12-06 20:07:54 +08:00
Nan Wang db8b4ac9e0 update engine path in tests. 2015-12-06 20:02:48 +08:00
Wang Nan 452a4eab31 Merge pull request #1 from nantas/master
update to fireball-x/cocos2d-html5#dc5f6bc7
2015-12-06 18:03:48 +08:00
Nan Wang 79e546d6cf update to fireball-x/cocos2d-html5#dc5f6bc7aeaeb473e53a93436dd3c7d94c4fbfbc 2015-12-06 18:01:18 +08:00
Nan Wang c0f59c1598 synchronized to cocos2d-html5#6700f8bb94b2. starting from fresh history. 2015-12-05 12:22:41 +08:00