Jare Guo
3f1b682d19
Merge commit '0d438a748a5aae594e29344fffe4ea040e235c81'
...
# Conflicts:
# cocos2d/core/components/CCRendererInSG.js
# cocos2d/core/load-pipeline/asset-table.js
# cocos2d/tilemap/CCTiledMap.js
# jsb/jsb-editbox.js
2016-04-27 10:01:06 +08:00
Johnny Wu
41ca344fe1
fix properties define syntax error
2016-04-25 10:30:01 +08:00
Johnny Wu
68ca51085f
add distortion scale
2016-04-25 10:20:11 +08:00
Huabing.Xu
6b86b638ec
add distortion sprite
2016-04-22 10:15:20 +08:00
Wang Nan
5e8922f58f
Merge pull request #598 from cocos-creator/v1.0
...
merge v1.0
2016-04-14 12:00:59 +08:00
Huabing.Xu
1237b2bbe9
fix indices out of range when using tiled sprite ( #596 )
...
* fix indices out of range when using tiled sprite
* change default indices size to 54
2016-04-13 18:55:57 +08:00
SijieWang
71cb529763
9宫格在只进行visit的时候状态不更新的问题 ( #572 )
...
* Fixed a bug about update _displayColor and _transform
* Fixed a bug about Sprite transform
* Fixed a bug about Sprite transform
* Fixed a bug about Sprite transform
2016-04-11 16:21:06 +08:00
Huabing.Xu
e4ec5a5e7e
optimise sprite rendering by using indexBuffer
2016-03-27 10:49:06 +08:00
pandamicro
5a690106ea
Modulize and cleanup shaders
2016-03-14 21:46:12 +08:00
pandamicro
1d8a6f29e0
Refactor cc.Macro to cc.macro
2016-03-14 11:49:03 +08:00
pandamicro
8306801243
Modulize event-manager, renderer and clean up core
2016-03-14 11:49:03 +08:00
pandamicro
334d99f414
Cleanup CCCommon, CCConfig, CCMacro, CCShaders
2016-03-13 18:57:13 +08:00
Huabing.Xu
da4dec3509
raw version of radial works
2016-01-22 14:24:56 +08:00
pandamicro
a48f9ba64f
Remove useless cocos2d modules in modular-cocos2d.js
2016-01-05 18:24:33 +08:00