Commit Graph

484 Commits

Author SHA1 Message Date
pandamicro 692cc79500 Separate JSB polyfills into different modules 2016-01-05 18:11:51 +08:00
pandamicro b62d544822 Remove comments in default uglify option 2016-01-05 11:47:22 +08:00
pandamicro dd08d378ce Merge pull request #183 from zilongshanren/v0.7
fix label bmfont and overflow issue
2016-01-05 11:28:34 +08:00
zilongshanren b55ccb8438 fix label jsb
fix ttf config

fix label overflow issue

improving coding style

make code more cleaner

remove cc._Label from cc namespace
2016-01-05 11:27:28 +08:00
Jare Guo aac17ca0b7 Merge pull request #185 from jareguo/v0.7
SGNode.onExit should not be null
2016-01-05 10:36:44 +08:00
Jare Guo 2fbe33bfb9 SGNode.onExit should not be null 2016-01-05 10:36:00 +08:00
pandamicro a66ca32af5 Merge pull request #182 from pandamicro/v0.7
Fix event propagation issue in JSB
2016-01-04 17:21:15 +08:00
pandamicro 6f15c9118b Fix event propagation issue in JSB 2016-01-04 17:19:25 +08:00
pandamicro 886efc8676 Merge pull request #181 from dabingnn/v0.7fixSpriteContentSizeJSB
fix sprite content size bug in jsb
2016-01-04 16:04:53 +08:00
Huabing.Xu 4182287532 fix sprite content size bug in jsb 2016-01-04 15:49:36 +08:00
pandamicro c344bbecd9 Merge pull request #179 from pandamicro/v0.7
Fix scheduler issues in JSB
2016-01-04 00:21:44 +08:00
pandamicro ea39a62997 Fix scheduler issues in JSB 2016-01-04 00:20:49 +08:00
Jare Guo d213070505 Merge pull request #176 from pandamicro/v0.7
Fix a bunch of JSB bug
2015-12-31 17:53:32 +08:00
pandamicro 8ce8ea66b3 Set uuid to empty in runtime 2015-12-31 17:49:43 +08:00
pandamicro d0692b42f8 Fix persistRootNode in JSB 2015-12-31 17:47:15 +08:00
pandamicro 6ea977ed0e Fix more JSB issues 2015-12-31 17:47:00 +08:00
pandamicro b015c488d5 Fix a bunch of JSB bug 2015-12-31 17:47:00 +08:00
Jare Guo f155c3926e Merge pull request #177 from jareguo/v0.7
fix bug of persist root node
2015-12-31 16:42:57 +08:00
Jare Guo 1f66c062ec fix bug of persist root node 2015-12-31 16:40:32 +08:00
pandamicro 3bc15e5fec Merge pull request #174 from pandamicro/v0.7
Fix AssetLibrary mistake
2015-12-30 23:33:59 +08:00
pandamicro 31fde55f3c Fix AssetLibrary mistake 2015-12-30 23:33:31 +08:00
pandamicro d7221535b2 Merge pull request #172 from pandamicro/0.7
Merge jsb_polyfill and jsb_engine and made jsb run
2015-12-30 22:24:39 +08:00
pandamicro 349fa29ef9 Merge jsb_polyfill and jsb_engine and made jsb run 2015-12-30 22:18:13 +08:00
pandamicro b527f36222 Fix more bugs in entity components 2015-12-30 22:18:13 +08:00
pandamicro 9db531f461 Fix JSB issues 2015-12-30 22:18:13 +08:00
Jare Guo ee0ace78b3 Merge pull request #171 from jareguo/v0.7
force reset property in assetlibrary even if query failed
2015-12-30 21:59:51 +08:00
Jare Guo 8e4a704074 force reset property in assetlibrary even if query failed, to make array fully initialized 2015-12-30 21:57:40 +08:00
Wu Jie 81194cf7c3 Merge pull request #169 from jwu/v0.7
support text asset
2015-12-30 20:41:10 +08:00
Johnny Wu 664e32bbb1 support text asset 2015-12-30 20:40:47 +08:00
Jare Guo fa09c1096c Merge pull request #168 from jareguo/v0.7
disabled sprite should not display when changing sprite frame
2015-12-30 20:28:22 +08:00
Jare Guo f73efdb7ac disabled sprite should not display when changing sprite frame 2015-12-30 20:26:55 +08:00
pandamicro 5a2800ccf0 Merge pull request #165 from dabingnn/v0.7fix
Everything is convertible to string could be set as the content of label
2015-12-30 17:56:39 +08:00
Huabing.Xu 8807d8d618 ... 2015-12-30 17:52:36 +08:00
Huabing.Xu ccf69e1815 Everything is convertible to string could be set as the content of label 2015-12-30 17:35:35 +08:00
Jare Guo 3b53d3c0f0 Merge pull request #164 from jareguo/v0.7
sprite should not response the resized event if emit by itself
2015-12-30 14:08:59 +08:00
Jare Guo b9cae11310 sprite should not response the resized event if emit by itself 2015-12-30 14:08:22 +08:00
Wang Nan 5bab7a52ce Merge pull request #163 from nantas/v0.7
update tooltip
2015-12-30 10:42:14 +08:00
Nan Wang 7b95f889ed Revert "Revert "fix infinite loop in label""
This reverts commit 7aa2bf5b48.
2015-12-30 10:41:38 +08:00
Nan Wang c213e720ab update i18n for layout tooltip. 2015-12-30 10:35:48 +08:00
Jare Guo bdd691296b Merge pull request #162 from knoxHuang/master
CCSprite.js update
2015-12-30 10:18:36 +08:00
knoxHuang de429aa237 CCSprite js update 2015-12-30 10:06:09 +08:00
Nan Wang 27b5aef75e Merge branch 'v0.7' of github.com:fireball-x/engine into v0.7 2015-12-30 10:02:11 +08:00
Jare Guo 3ba88724df Merge pull request #161 from zilongshanren/improveLayout
only doLayout when count of children > 0
2015-12-30 10:01:45 +08:00
Nan Wang 8962de5b28 Merge branch 'v0.7' of github.com:fireball-x/engine into v0.7 2015-12-30 09:56:33 +08:00
zilongshanren 32464f4f66 add defensive programming 2015-12-30 09:53:59 +08:00
zilongshanren 28c79dd17d only doLayout when count of children > 0 2015-12-30 09:43:40 +08:00
Jare Guo 1b0f741e18 Merge pull request #160 from jareguo/v0.7
refactoring sprite
2015-12-30 01:52:19 +08:00
Jare Guo e623270d3b refactoring sprite 2015-12-30 01:46:34 +08:00
pandamicro 26081fd7af Merge pull request #159 from pandamicro/0.7
Fix text wrap issue for system Label
2015-12-29 23:57:39 +08:00
pandamicro abe82c2549 Fix text wrap issue for system Label 2015-12-29 23:55:09 +08:00