Commit Graph

265 Commits

Author SHA1 Message Date
2youyouo2 b12914197c refine camera 2017-03-27 10:34:35 +08:00
2youyouo2 2cc177c42d fixed some physics issues 2017-03-16 18:01:27 +08:00
Nan Wang 068c38d559 merged v1.4 2017-03-14 10:04:00 +08:00
zilongshanren 3b45a3f73d fix jsb bmfont spacing X 2017-03-10 14:07:31 +08:00
Jare Guo 21eb9ed894 Merge pull request #1523 from jareguo/master
重新实现组件生命周期调用,支持脚本优先级
2017-03-09 12:56:41 +08:00
Jare Guo bdbc04b462 extract NodeActivator 2017-03-09 01:52:23 +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
pandamicro 901fee770a Fix cc.macro.REPEAT_FOREVER usage issue 2017-03-06 16:10:32 +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
Jare Guo c43c5262aa minor fix (+1 squashed commit)
Squashed commits:
[c91748a] minor fix
2017-03-01 14:02:54 +08:00
pandamicro 4b72f35e97 Fix JSB memory leak caused by Event dispatching 2017-02-24 18:38:05 +08:00
pandamicro a9ab402766 Merge part of cocos/scripting/js-bindings/scripts to engine/jsb 2017-02-24 17:41:57 +08:00
pandamicro 713bc5d8eb Fix gc crash possibly caused by system events 2017-02-17 14:55:39 +08:00
Jare Guo 5d38426653 working on component scheduler 2017-02-17 00:24:36 +08:00
Jare Guo a4beba2740 use Function instead eval to optimize evaluation and variable mangling (cocos-creator/fireball#5220) 2017-02-14 17:33:57 +08:00
Jare Guo 3ada4789f2 working on component scheduler 2017-02-10 19:59:44 +08:00
knoxHuang acb126217c fix callInNextTick execution sequence for #fireball/issues/5157 2017-02-10 11:02:04 +08:00
Jare Guo 0192e50569 Merge branch 'v1.4'
# Conflicts:
#	cocos2d/core/CCNode.js
2017-02-09 11:19:38 +08:00
pandamicro 35e2bd8bf6 Do not retain/release actions in new memory model 2017-02-06 14:05:10 +08:00
pandamicro 73cf8a288d Avoid texture memory leak 2017-02-06 13:44:12 +08:00
Jare Guo 64e253a1e7 Sync 1.4 2017-01-24 15:16:29 +08:00
pandamicro 57e4b44b91 Add cc.macro.ENABLE_GC_FOR_NATIVE_OBJECTS 2017-01-22 19:01:26 +08:00
pandamicro 3a254718e6 Add cc.macro.ENABLE_GC_FOR_NATIVE_OBJECTS to detect memory model 2017-01-22 17:34:22 +08:00
zilongshanren 8e697792f6 fix jsb label font size 2017-01-22 17:00:18 +08:00
Jare Guo 8da330d3a7 Scene now inherit from Node so some Node verification should be refactored 2017-01-12 14:47:51 +08:00
Wang Nan ae545eacb9 Merge pull request #1405 from jareguo/temp2
initialization callback for game.run should be invoked before cc.game.EVENT_GAME_INITED
2016-12-29 15:25:55 +08:00
zhangbin 5d64ffa913 Remove the usage of bind in DragonBones addEvent on JSB. 2016-12-29 12:01:14 +08:00
Jare Guo 5f51d3a764 initialization callback for game.run should be invoked before cc.game.EVENT_GAME_INITED 2016-12-29 10:01:37 +08:00
zhangbin 058121c1ad Mixin CCArmatureDisplay with EventTarget in jsb environment. 2016-12-22 16:39:58 +08:00
zilongshanren 0d0d18c1b7 add bmfont batch rendering
commit 68c7b5ed8e174238514b4b680634f197a976de60
Author: zilongshanren <guanghui8827@126.com>
Date:   Wed Dec 21 11:19:21 2016 +0800

    finish web bmfont batch

commit 3d038e14128a375848efec99f3706c0e252cdbd0
Author: zilongshanren <guanghui8827@126.com>
Date:   Fri Dec 16 17:25:05 2016 +0800

    bitmap support spriteframe on web

commit 87d371410de223956c50bd5a4b85958973181c11
Author: zilongshanren <guanghui8827@126.com>
Date:   Fri Dec 16 16:42:51 2016 +0800

    make bitmap depends on spriteframe
2016-12-21 16:49:09 +08:00
Nan Wang 52b1a7658c fix merge conflict of CCLoader getReferenceKey 2016-12-16 10:53:37 +08:00
Nan Wang 4dea8e7a8a move all error logs to DebugInfos.js and only show error id in release build 2016-12-15 17:07:01 +08:00
pandamicro a09f36187b Refactor cc.loader to use url as reference key
Deprecate any external id usage, user should use uuid / url to load
Always use url as reference key, when only uuid is available, copy uuid to url
2016-12-15 12:33:19 +08:00
Wang Nan bd2770d02f Merge pull request #1340 from knoxHuang/v1.3_fixBug
fix CCSystemEvent cc._EventListenerKeyboard.LISTENER_ID error for JSB
2016-12-09 11:02:50 +08:00
knoxHuang 01e0e9d031 add LISTENER_ID for jsb-event 2016-12-09 10:10:20 +08:00
Jare Guo 1fb594a2e4 add paramater of Director._loadSceneByUuid 2016-12-08 15:59:50 +08:00
zilongshanren f82062160a fix label jsb resize height dimensions issue 2016-11-23 14:46:32 +08:00
zilongshanren 8ff6679935 improve jsb label polyfill 2016-11-16 11:56:46 +08:00
zilongshanren de2e981423 fix label outline color error 2016-11-16 11:36:02 +08:00
knoxHuang abb655c274 fix RotateTo bug for fireball/issues/4610 2016-11-14 09:53:55 +08:00
pandamicro dba5cf9960 Undo rebind removeListeners 2016-11-06 17:01:49 +08:00
pandamicro 30653200f0 Forbid adding event listener with Component 2016-11-06 16:50:57 +08:00
pandamicro 660382a7d7 Always use uuid for depend keys
f
2016-10-26 00:26:11 +08:00
pandamicro d276e8eabb Fix X5 touch issue by adding TOUCH_TIMEOUT 2016-10-24 02:42:11 +08:00
Nan Wang 032d2d2abd fix api doc reference 2016-10-20 18:36:01 +08:00
zilongshanren 1484a038b9 add ready to play event to videoplayer 2016-10-17 12:04:35 +08:00
zilongshanren f01e116190 improve web videoplayer 2016-10-14 18:01:00 +08:00
zilongshanren d7e2e48792 tweak EditBox default input flag 2016-10-11 17:49:34 +08:00