Jare Guo
|
e4b407affe
|
Merge pull request #1478 from jareguo/v1.4
fix prefab loading issue
|
2017-02-08 12:11:16 +08:00 |
|
Jare Guo
|
bd6750fc0a
|
fix prefab loading issue
|
2017-02-08 12:06:45 +08:00 |
|
Jare Guo
|
c9178120c6
|
Merge pull request #1477 from knoxHuang/v1.4
fix CCParticleSystem error for fireball/issues/5155
|
2017-02-08 00:16:27 +08:00 |
|
knoxHuang
|
df4e421c48
|
fix CCParticleSystem error for fireball/issues/5155
|
2017-02-07 22:46:48 +08:00 |
|
pandamicro
|
3b1f1cdac0
|
Merge pull request #1476 from knoxHuang/v1.4
fix native error for fireball/issues/5169
|
2017-02-07 17:53:54 +08:00 |
|
knoxHuang
|
744f4b2481
|
fix native error for fireball/issues/5169
|
2017-02-07 17:48:40 +08:00 |
|
pandamicro
|
5f6511adb4
|
Merge pull request #1475 from knoxHuang/v1.4
fix initWithVertexShaderByteArray bug to CCGLProgram for fireball/iss…
|
2017-02-06 17:14:50 +08:00 |
|
knoxHuang
|
7b4828e8c8
|
fix initWithVertexShaderByteArray bug to CCGLProgram for fireball/issues/5160
|
2017-02-06 17:10:34 +08:00 |
|
Wang Nan
|
4734728f70
|
Merge pull request #1474 from pandamicro/v1.4
Improvements to v1.4
|
2017-02-06 16:25:02 +08:00 |
|
pandamicro
|
b95de398a2
|
Use rAF when frameRate is 30
|
2017-02-06 15:56:36 +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
|
b7bda3794a
|
Merge pull request #1473 from knoxHuang/v1.4
fix particleSystem bug for fireball/issues/5155
|
2017-02-06 11:56:27 +08:00 |
|
knoxHuang
|
a218ca9c9d
|
fix particleSystem bug for fireball/issues/5155
|
2017-02-06 11:45:27 +08:00 |
|
pandamicro
|
7313332daf
|
Remove cc.spriteFrameCache
|
2017-02-06 10:43:08 +08:00 |
|
Jare Guo
|
8b39c26b92
|
Merge pull request #1472 from pandamicro/v1.4
Fix color red channel extraction issue
|
2017-02-04 13:59:55 +08:00 |
|
pandamicro
|
7e2878c041
|
Fix color red channel extraction issue
|
2017-02-04 13:52:57 +08:00 |
|
Wang Nan
|
9e5bafca1e
|
Merge pull request #1471 from natural-law/tiledmap-crack
Solve the cracks in TiledMap.
|
2017-02-04 11:49:44 +08:00 |
|
zhangbin
|
31b29fcb72
|
Solve the cracks in TiledMap.
|
2017-02-04 11:42:38 +08:00 |
|
Jare Guo
|
cfad0d0ade
|
Merge pull request #1467 from jareguo/v1.4
should enable try catch for life-cycle methods in edit mode
|
2017-02-03 17:58:20 +08:00 |
|
Jare Guo
|
7e7c58a058
|
should enable try catch for life-cycle methods in edit mode
|
2017-02-03 17:57:12 +08:00 |
|
Jare Guo
|
0f1dff6fc2
|
Merge pull request #1464 from zilongshanren/fix-editbox-inital-string-display-isue
fix editbox inital string display issue
|
2017-01-24 22:23:09 +08:00 |
|
zilongshanren
|
806a038207
|
remove editing mode change
|
2017-01-24 18:33:53 +08:00 |
|
zilongshanren
|
f3b39b7730
|
update editingmode
|
2017-01-24 18:30:39 +08:00 |
|
zilongshanren
|
5ac07331c7
|
fix editbox inital string display issue
|
2017-01-24 18:27:44 +08:00 |
|
Wang Nan
|
368609c613
|
Merge pull request #1462 from nantas/v1.4
fix ccmacro api doc error
|
2017-01-24 14:23:22 +08:00 |
|
Nan Wang
|
16b7f87f02
|
fix ccmacro api doc error
|
2017-01-24 14:15:18 +08:00 |
|
pandamicro
|
761fa5b71a
|
Merge pull request #1461 from pandamicro/v1.4
Fix unit tests
|
2017-01-23 16:14:25 +08:00 |
|
pandamicro
|
6c90a1d96c
|
Merge pull request #1460 from jareguo/v1.4
minor optimization
|
2017-01-23 15:58:35 +08:00 |
|
pandamicro
|
873c27f9c0
|
Fix unit tests
|
2017-01-23 15:51:00 +08:00 |
|
Jare Guo
|
b040b3aefa
|
minor optimization
|
2017-01-23 15:42:16 +08:00 |
|
Wang Nan
|
06a0621011
|
Merge pull request #1459 from pandamicro/v1.4
Remove reference to cc.spriteFrameCache
|
2017-01-23 13:42:11 +08:00 |
|
pandamicro
|
7eee9d33ed
|
Improve performance of performRecursive & vertex calculation
|
2017-01-23 12:09:45 +08:00 |
|
pandamicro
|
2e055f0908
|
Fix particle system loading issue
|
2017-01-23 12:09:14 +08:00 |
|
pandamicro
|
f285545e03
|
Remove reference to cc.spriteFrameCache
|
2017-01-23 12:09:00 +08:00 |
|
pandamicro
|
465b9eb1c0
|
Merge pull request #1458 from pandamicro/v1.4
Small fixes
|
2017-01-22 19:03:09 +08:00 |
|
pandamicro
|
57e4b44b91
|
Add cc.macro.ENABLE_GC_FOR_NATIVE_OBJECTS
|
2017-01-22 19:01:26 +08:00 |
|
pandamicro
|
d375942ca8
|
Small fixes
|
2017-01-22 19:01:09 +08:00 |
|
Wang Nan
|
9298a222e7
|
Merge pull request #1457 from pandamicro/v1.4
Sync Cocos2d-html5 v3.14 to Creator
|
2017-01-22 17:44:03 +08:00 |
|
pandamicro
|
e8f116778a
|
Fix issues
|
2017-01-22 17:35:38 +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
|
a084ae056a
|
Remove logics for SpriteBatchNode
|
2017-01-22 17:34:22 +08:00 |
|
pandamicro
|
8ad9170410
|
Small improvements and fixes
|
2017-01-22 17:34:22 +08:00 |
|
pandamicro
|
cf59d3bf01
|
Flat recursive call using stack for onEnter/onExit/cleanup etc
|
2017-01-22 17:34:22 +08:00 |
|
pandamicro
|
839d5028d7
|
Open WebGL access for more browsers and forbid auto full screen in wechat
|
2017-01-22 17:34:22 +08:00 |
|
pandamicro
|
3a254718e6
|
Add cc.macro.ENABLE_GC_FOR_NATIVE_OBJECTS to detect memory model
|
2017-01-22 17:34:22 +08:00 |
|
pandamicro
|
f7aaf398da
|
Improve vertex calculation performance in Scale9Sprite
|
2017-01-22 17:34:22 +08:00 |
|
pandamicro
|
4b826f0d44
|
Improve Node creation performance in general
|
2017-01-22 17:34:22 +08:00 |
|
pandamicro
|
8b5f981cac
|
Improve updateProjectionUniform performance
|
2017-01-22 17:34:22 +08:00 |
|
pandamicro
|
a9aaaec6ab
|
Improve RenderCmd construction performance
|
2017-01-22 17:34:22 +08:00 |
|