Commit Graph

12 Commits

Author SHA1 Message Date
James Chen 4da873ecb8 Merge branch 'v1.8' into develop
# Conflicts:
#	cocos/scripting/js-bindings/script/jsb_cocos2d.js
2018-02-23 10:26:48 +08:00
James Chen eb1d2e46cf Removes unused Texture2D::forceDeleteALLTexture2D which was added from runtime. (#1090) 2018-02-05 10:46:41 +08:00
Jare Guo d9bd3d763c update license (#1089)
* updating license

* update license
2018-02-01 15:20:01 +08:00
zilongshanren d76dae6409 add label outline effect to mac 2016-12-30 18:08:13 +08:00
Nan Wang ef368ef409 merged v1.2 2016-09-07 18:47:59 +08:00
knoxHuang b73e97e403 add enableAntiAlias for Native for fireball/issues/2836 2016-08-29 16:33:52 +08:00
pandamicro 1dd701936b Fix compilation issues on Mac 2016-08-11 13:57:51 +08:00
pandamicro ab95942886 Upgrade cocos/renderer to v3.13 2016-08-05 19:30:31 +08:00
zilongshanren c2e5a97f6a add system font label overflow 2016-06-12 17:43:02 +08:00
Wenhai Lin efc97073e3 Fixed memory leak 2016-04-18 11:06:14 +08:00
Wenhai Lin 94c95d5838 Withespaces does matter. 2016-03-31 23:50:02 +08:00
Wenhai Lin a6dbf31dcf cocos 2d lite version 2016-03-29 17:55:48 +08:00