Commit Graph

2468 Commits

Author SHA1 Message Date
2youyouo2 6c77064f2c set camera executeInEditMode to false 2017-03-27 14:41:06 +08:00
2youyouo2 5e94bc4a87 refine camera 2017-03-27 12:00:50 +08:00
2youyouo2 e1090e85e1 refine camera 2017-03-27 11:28:33 +08:00
2youyouo2 b12914197c refine camera 2017-03-27 10:34:35 +08:00
2youyouo2 cf536cc315 add camera 2017-03-24 14:01:30 +08:00
2youyouo2 8c5f75906d disallow set RigidBody enabled, should use node.active instead 2017-03-17 11:59:01 +08:00
2youyouo2 1b173ea6d2 optimize raycast 2017-03-17 10:04:57 +08:00
2youyouo2 2cc177c42d fixed some physics issues 2017-03-16 18:01:27 +08:00
2youyouo2 43d5d7ffc2 split points when points length bigger than b2.maxPolygonVertices 2017-03-16 18:01:08 +08:00
2youyouo2 126e61e800 sync enabled state with RigidBody and PhysicsCollider 2017-03-16 18:00:56 +08:00
2youyouo2 09b3b60695 add fraction to raycast callback 2017-03-16 18:00:31 +08:00
2youyouo2 dc0e1c74b8 fixed init PolygonCollider points 2017-03-16 18:00:02 +08:00
Nan Wang 068c38d559 merged v1.4 2017-03-14 10:04:00 +08:00
Jare Guo 05a488037b fix deltaTime in editor 2017-03-13 22:55:24 +08:00
Jare Guo f115d4ed9c Merge pull request #1540 from jareguo/master
extract BaseNode.setParent
2017-03-11 17:06:30 +08:00
zilongshanren 4e1bd339aa only set spacingX when label is bmfont 2017-03-10 14:10:37 +08:00
Wang Nan a403d9f0d9 Merge pull request #1541 from pandamicro/v1.4
Fix Editbox adaptation issues on some browser
2017-03-10 11:00:27 +08:00
pandamicro 27ac8b1d4e Fix Editbox adaptation issues on some browser 2017-03-09 16:12:19 +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
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 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
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
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
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 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