Jare Guo
|
8f831af4d3
|
reviewed
|
2017-05-10 01:00:20 +08:00 |
|
Jare Guo
|
0c26addab6
|
fix ES6 Classes on JSB
|
2017-05-09 15:04:48 +08:00 |
|
Jare Guo
|
ff6dd78d2a
|
fix typescript on JSB
|
2017-05-08 15:03:05 +08:00 |
|
2youyouo2
|
b648accd4d
|
support offset of PhysicsCircleCollider
|
2017-04-26 14:40:08 +08:00 |
|
pandamicro
|
4f5da96c26
|
Merge pull request #1607 from pandamicro/revert-action
Reverse pure JS Action, reuse JSB Action
|
2017-04-23 03:17:20 +08:00 |
|
pandamicro
|
8a7e8ceabe
|
Reverse pure JS Action, reuse JSB Action
|
2017-04-22 14:58:55 +08:00 |
|
pandamicro
|
ad53286a3f
|
Remove Focus listener and fix event listener leak caused by anonymous function
|
2017-04-22 12:23:34 +08:00 |
|
Jare Guo
|
4b8bc8fe8f
|
fix JSB: ReferenceError: __extends is not defined
|
2017-04-19 14:33:36 +08:00 |
|
Jare Guo
|
900d7236cf
|
fix js_creator_Scale9SpriteV2_setInsetTop : Error processing arguments
|
2017-04-18 17:23:43 +08:00 |
|
2youyouo2
|
09c079e688
|
Merge branch 'master' of github.com:fireball-x/engine into physics
|
2017-04-01 17:37:07 +08:00 |
|
pandamicro
|
5daa540b12
|
Pure JS action system working in JSB
|
2017-03-29 18:42:28 +08:00 |
|
pandamicro
|
07d4f22c26
|
Move ActionManager to actions module
|
2017-03-29 18:42:28 +08:00 |
|
Nan Wang
|
d9b5cef497
|
merge v1.4
|
2017-03-29 18:16:41 +08:00 |
|
2youyouo2
|
0109d9b0d7
|
optimize physics
|
2017-03-29 17:33:23 +08:00 |
|
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 |
|
pandamicro
|
fce4f2ccca
|
Remove useless debug setting
|
2017-03-12 15:25:36 +08:00 |
|
pandamicro
|
34cd3c30b7
|
Remove arguments usage in jsb
|
2017-03-12 15:25:36 +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 |
|