Jare Guo
|
cfa41eef89
|
Merge pull request #1506 from jareguo/master
fix engine bulid error again
|
2017-02-17 18:34:25 +08:00 |
|
Jare Guo
|
e36f4b9c33
|
fix engine bulid error again
|
2017-02-17 18:33:17 +08:00 |
|
Jare Guo
|
86edd2bfc7
|
Merge pull request #1502 from jareguo/master
重构组件生命周期方法调用
|
2017-02-17 18:17:33 +08:00 |
|
Jare Guo
|
52b1e9d5e1
|
reviewed
|
2017-02-17 17:19:26 +08:00 |
|
Jare Guo
|
5d38426653
|
working on component scheduler
|
2017-02-17 00:24:36 +08:00 |
|
Jare Guo
|
a1c17ea7d2
|
Merge pull request #1489 from natural-law/issue5199
Solve the error effect when a spine node with custom color.
|
2017-02-15 15:20:50 +08:00 |
|
zhangbin
|
11fb51fcf6
|
Reviewed issue.
|
2017-02-15 15:15:37 +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
|
2f218f5c58
|
Merge pull request #1490 from jareguo/temp
fix engine bulid error
|
2017-02-14 16:41:51 +08:00 |
|
Jare Guo
|
9c629cf32d
|
fix engine bulid error
|
2017-02-14 16:35:06 +08:00 |
|
zhangbin
|
ed8bb71cd2
|
Solve the error effect when a spine node with custom color.
|
2017-02-14 14:27:37 +08:00 |
|
Jare Guo
|
3ada4789f2
|
working on component scheduler
|
2017-02-10 19:59:44 +08:00 |
|
Jare Guo
|
d358293527
|
Merge pull request #1484 from jareguo/temp
use babel compiler
|
2017-02-10 18:14:44 +08:00 |
|
Jare Guo
|
1029c9d9f5
|
use babel compiler
|
2017-02-10 17:58:37 +08:00 |
|
Jare Guo
|
0192e50569
|
Merge branch 'v1.4'
# Conflicts:
# cocos2d/core/CCNode.js
|
2017-02-09 11:19:38 +08:00 |
|
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
|
842267ad98
|
Merge pull request #1469 from jareguo/master
remove unused prototype properties
|
2017-02-04 14:50:12 +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
|
5f9e46996b
|
refine CCClass
|
2017-02-04 02:24:03 +08:00 |
|
Jare Guo
|
89aedebc3a
|
remove unused prototype properties
|
2017-02-03 21:26:50 +08:00 |
|
Jare Guo
|
c861b7ded2
|
Merge pull request #1468 from cocos-creator/v1.4
Sync V1.4
|
2017-02-03 21:24:43 +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
|
90b7e1bf25
|
Merge pull request #1466 from jareguo/master
refactor scheduler
|
2017-02-03 15:32:41 +08:00 |
|
Jare Guo
|
42ba8c1fd3
|
reviewed
|
2017-02-03 14:40:05 +08:00 |
|
Jare Guo
|
037a32259d
|
fix _priorityIn
|
2017-02-03 14:20:12 +08:00 |
|
Jare Guo
|
36a7328f40
|
remove unused prototype properties
|
2017-02-03 13:53:54 +08:00 |
|
Jare Guo
|
78cb8d488c
|
minify ClassManager
|
2017-02-03 11:44:23 +08:00 |
|
Jare Guo
|
f3a069f8cc
|
refactor scheduler
|
2017-02-03 11:18:09 +08:00 |
|
Jare Guo
|
73dc2ebd55
|
Merge pull request #1463 from jareguo/master
optimize binarySearch
|
2017-02-03 11:13:56 +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 |
|