zilongshanren
|
cee31521bd
|
remove debug msg
|
2017-05-11 17:17:07 +08:00 |
|
Jare Guo
|
65a3f04796
|
optimizing startup time
|
2017-05-05 13:37:03 +08:00 |
|
Jare Guo
|
00947c6afe
|
Merge pull request #1599 from 2youyou2/camera
add warn info for camera
|
2017-04-19 09:55:30 +08:00 |
|
2youyouo2
|
bfc6fa87ab
|
add warn info for camera
|
2017-04-18 18:00:18 +08:00 |
|
Jare Guo
|
ecb242f046
|
fix JSB crash of label when texture not loaded
|
2017-04-18 17:23:43 +08:00 |
|
Jare Guo
|
0bd31f0932
|
Merge commit 'be31191693322daf4f2cd5c25060502fa2fda0ca'
# Conflicts:
# cocos2d/core/platform/CCClass.js
|
2017-04-07 10:37:08 +08:00 |
|
Jare Guo
|
7b660e8c9f
|
add decorators for CCClass, add ES6 support for unit test
|
2017-04-01 16:27:11 +08:00 |
|
2youyouo2
|
5e94bc4a87
|
refine camera
|
2017-03-27 12:00:50 +08:00 |
|
2youyouo2
|
b12914197c
|
refine camera
|
2017-03-27 10:34:35 +08:00 |
|
2youyouo2
|
124605c804
|
refine warn info
|
2017-03-17 13:06:49 +08:00 |
|
2youyouo2
|
8c5f75906d
|
disallow set RigidBody enabled, should use node.active instead
|
2017-03-17 11:59:01 +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 |
|
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 |
|
zhangbin
|
4f8e4ba6d5
|
Improve the initialization logic of Label with BitmapFont.
|
2017-02-16 10:36:24 +08:00 |
|
Jare Guo
|
0192e50569
|
Merge branch 'v1.4'
# Conflicts:
# cocos2d/core/CCNode.js
|
2017-02-09 11:19:38 +08:00 |
|
pandamicro
|
7313332daf
|
Remove cc.spriteFrameCache
|
2017-02-06 10:43:08 +08:00 |
|
Jare Guo
|
64e253a1e7
|
Sync 1.4
|
2017-01-24 15:16:29 +08:00 |
|
Wang Nan
|
ca3fdca9b7
|
Merge pull request #1444 from jareguo/temp
Improve CCClass
|
2017-01-24 09:38:44 +08:00 |
|
pandamicro
|
f285545e03
|
Remove reference to cc.spriteFrameCache
|
2017-01-23 12:09:00 +08:00 |
|
pandamicro
|
38226ea61f
|
Flat visit call stack by move visit from render command to node
|
2017-01-22 17:35:38 +08:00 |
|
pandamicro
|
8ad9170410
|
Small improvements and fixes
|
2017-01-22 17:34:22 +08:00 |
|
Jare Guo
|
7c872f947c
|
receive __ctor__ in CCClass to allow user to skip ctor detection
|
2017-01-17 17:46:11 +08:00 |
|
Jare Guo
|
2efa1d9d1d
|
allow declare constructor for components
|
2017-01-16 21:47:01 +08:00 |
|
Jare Guo
|
4351f7c82c
|
add progress callback for loadRes
|
2017-01-13 15:56:58 +08:00 |
|
Jare Guo
|
338c8d90d2
|
prevent method name duplicate with property name
|
2016-12-28 23:51:03 +08:00 |
|
Jare Guo
|
11f5e3d6a9
|
Merge pull request #1381 from pandamicro/master
Fix loader load subAsset with the same url issue
|
2016-12-21 12:51:25 +08:00 |
|
pandamicro
|
181d6b32a3
|
Fix loader load subAsset with the same url issue
|
2016-12-21 11:12:16 +08:00 |
|
knoxHuang
|
bd8127aff7
|
optimization shader and tooltip for #fireball/issues/4771
|
2016-12-19 18:19:18 +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 |
|