Commit Graph

3942 Commits

Author SHA1 Message Date
Jare Guo f115d4ed9c Merge pull request #1540 from jareguo/master
extract BaseNode.setParent
2017-03-11 17:06:30 +08:00
Jare Guo 91aa7d6899 extract BaseNode.setParent 2017-03-09 12:59:41 +08:00
Jare Guo 21eb9ed894 Merge pull request #1523 from jareguo/master
重新实现组件生命周期调用,支持脚本优先级
2017-03-09 12:56:41 +08:00
Jare Guo d48c2edb4f update according to review 2017-03-09 11:01:06 +08:00
Wang Nan 4f3c56a39a Merge pull request #1534 from nantas/typescript
Typescript support
2017-03-09 09:54:46 +08:00
Nan Wang 7620cdb009 update accord to review feedback 2017-03-09 09:54:01 +08:00
Jare Guo bdbc04b462 extract NodeActivator 2017-03-09 01:52:23 +08:00
Jare Guo 86f3a09f98 reviewed 2017-03-08 20:33:34 +08:00
Wang Nan 7585869f87 Merge pull request #1538 from 2youyou2/physics
support physics
2017-03-08 18:14:17 +08:00
Jare Guo da659752e2 minimize code 2017-03-08 17:33:20 +08:00
Jare Guo 13c9ed38bd use invoker pool 2017-03-08 17:33:20 +08:00
Jare Guo 3f3f98d08a use binary search 2017-03-08 17:33:20 +08:00
Jare Guo f2d66a3e7f test execution order 2017-03-08 17:33:20 +08:00
Jare Guo b74880fa10 fix activate child node directly in parent's onDisable 2017-03-08 17:33:20 +08:00
Jare Guo c949c486f6 fix deactivate child node directly in parent's onDisable 2017-03-08 17:33:20 +08:00
Jare Guo b272941cf6 working on execution order of lifecycle methods 2017-03-08 17:33:20 +08:00
Jare Guo 449cde5794 refine internal api of BaseNode 2017-03-08 17:33:20 +08:00
2youyouo2 dae0a14f41 Merge branch 'v1.4' of github.com:fireball-x/engine into physics 2017-03-08 16:41:00 +08:00
2youyouo2 dc1a67e33c revert changes 2017-03-08 15:54:23 +08:00
2youyouo2 c5bc1a2ad2 fixed physics module 2017-03-08 15:37:52 +08:00
2youyouo2 07479a5f5c fixed module 2017-03-08 15:07:58 +08:00
2youyouo2 3acf11a567 support physics 2017-03-08 14:02:45 +08:00
Jare Guo 0cbbbc9321 Merge pull request #1537 from zilongshanren/fix-bmfont-spacingX-loading
fix BMFont spacingX
2017-03-08 09:38:44 +08:00
zilongshanren 4a31d4bcac fix BMFont spacingX 2017-03-07 18:54:31 +08:00
Nan Wang 915c9a23a2 use lower case for decorator 2017-03-07 17:54:27 +08:00
Wang Nan c43f57c005 Merge pull request #1533 from pandamicro/v1.4
Fix adaptation issue in iframe nested game
2017-03-07 14:07:49 +08:00
pandamicro 310cf2a9ca Improve doc for FIX_ARTIFACTS_BY_STRECHING_TEXEL 2017-03-07 11:20:07 +08:00
pandamicro 6dc195acc2 Fix adaptation issue in iframe nested game 2017-03-07 11:07:10 +08:00
pandamicro 7108626d67 remove unimplemented cc.game.onEnd 2017-03-07 11:07:10 +08:00
Jare Guo 9fce1b96f9 Merge pull request #1495 from pandamicro/artifacts
Activate FIX_ARTIFACTS_BY_STRECHING_TEXEL by default
2017-03-06 20:56:34 +08:00
Jare Guo e53ceb8f37 Merge pull request #1531 from natural-law/issue4980
Init the event listeners when the sgNode of spine is re-created.
2017-03-06 20:34:09 +08:00
Wang Nan b39ff528bb Merge pull request #1532 from pandamicro/v1.4
Fix cc.macro.REPEAT_FOREVER usage issue
2017-03-06 16:22:37 +08:00
pandamicro 901fee770a Fix cc.macro.REPEAT_FOREVER usage issue 2017-03-06 16:10:32 +08:00
pandamicro 2c009b0cd8 Merge pull request #1530 from pandamicro/v1.4
Fix has keyboard event detection issue in native
2017-03-06 16:09:49 +08:00
zhangbin ea2d9af39b Init the event listeners when the sgNode of spine is re-created. 2017-03-06 12:01:54 +08:00
pandamicro 190ae77297 Fix has keyboard event detection issue in native 2017-03-05 13:48:10 +08:00
Nan Wang f06678020b update decorator to add reset function 2017-03-03 18:56:52 +08:00
Nan Wang 8ecf4bbf04 add es6 helper for typescript 2017-03-03 18:11:13 +08:00
Jare Guo a5b5df2484 Merge pull request #1529 from natural-law/issue5344
Fix that playTimes parameter of playAnimation is no effect sometimes.
2017-03-03 13:31:31 +08:00
zhangbin 71ea7572a0 Fix that playTimes parameter of playAnimation is no effect sometimes. 2017-03-03 12:06:44 +08:00
Nan Wang 3ac4c75c1e add typescript class, add decorator for typescript 2017-03-02 18:39:13 +08:00
Jare Guo 454671046b Merge pull request #1528 from 2youyou2/playOnLoad
add _playedOnLoad for CCAnimation
2017-03-02 17:01:53 +08:00
2youyouo2 4c62bd89fe playOnLoad should work in start 2017-03-02 16:54:45 +08:00
2youyouo2 a624733058 add _playedOnLoad for CCAnimation 2017-03-02 15:46:36 +08:00
Jare Guo cbe953bb30 Merge commit '6c45b902f8ee1451b8cb343019c943a1c07a8caa' into temp2 2017-03-02 14:31:54 +08:00
Jare Guo 1f0b5503f0 Merge commit 'aaa2ac73b9dc0b05bf3d1b05342d10676e0ad432' into temp2
# Conflicts:
#	cocos2d/core/platform/CCClass.js
#	cocos2d/core/platform/CCView.js
#	cocos2d/core/platform/_CCClass.js
#	jsb/jsb-director.js
2017-03-02 14:30:09 +08:00
Wang Nan aaa2ac73b9 Merge pull request #1525 from jareguo/v1.4
fix property shorthand about Raw Asset
2017-03-02 10:47:37 +08:00
Jare Guo 6c45b902f8 Merge pull request #1526 from jareguo/temp2
minor fix
2017-03-01 14:07:27 +08:00
Jare Guo c43c5262aa minor fix (+1 squashed commit)
Squashed commits:
[c91748a] minor fix
2017-03-01 14:02:54 +08:00
Jare Guo 38eecf3e03 fix property shorthand about Raw Asset 2017-03-01 13:49:27 +08:00