Commit Graph

13 Commits

Author SHA1 Message Date
pandamicro 1d8a6f29e0 Refactor cc.Macro to cc.macro 2016-03-14 11:49:03 +08:00
pandamicro 334d99f414 Cleanup CCCommon, CCConfig, CCMacro, CCShaders 2016-03-13 18:57:13 +08:00
Wang Nan 8c043208c2 Merge pull request #413 from nantas/master
update license file and source code header.
2016-03-01 12:05:44 +08:00
Nan Wang 3a70ae6060 update license file and source code header. 2016-03-01 11:04:12 +08:00
pandamicro faecf839c7 Fix texture2d release issue 2016-03-01 10:15:52 +08:00
pandamicro b91e00560e Fix unexpected asset delete in editor 2016-02-25 18:59:21 +08:00
pandamicro 4048a6fbb0 Polish single file loading API for cc.loader.load 2016-02-25 17:38:58 +08:00
pandamicro 0ea99226cc Replace cc.loader with pipeline loader 2016-02-25 10:34:09 +08:00
pandamicro bbfae239df Merge pull request #123 from jareguo/master
fix cc.glDeleteTexture
2015-12-25 19:43:21 +08:00
Jare Guo 4477679100 fix cc.glDeleteTexture 2015-12-25 00:57:09 +08:00
pandamicro 340ff480b0 Fix fireball-x/fireball#1033: Improve cc.textureCache.addImage logic 2015-12-24 18:18:22 +08:00
Nan Wang 3981104a1f correct example path. 2015-12-10 19:26:35 +08:00
Nan Wang c0f59c1598 synchronized to cocos2d-html5#6700f8bb94b2. starting from fresh history. 2015-12-05 12:22:41 +08:00