Commit Graph

16 Commits

Author SHA1 Message Date
pandamicro 77febbfe3d Merge branch 'master' into next 2018-03-13 15:07:21 +08:00
Jare Guo a6fb92ad90 updating license 2018-02-01 09:38:54 +08:00
Jare Guo bd15543093 updating license: Chukong Aipu -> Xiamen Yaji 2018-01-31 17:51:49 +08:00
pandamicro 7712da14f5 Merge remote-tracking branch 'fireball/master' into next 2018-01-15 17:51:33 +08:00
Jare Guo e3b7190cd6 support migration for texture array 2017-12-26 10:00:57 +08:00
yinkaile 7cfae81e51 support tiledmap 2017-12-21 11:39:19 +08:00
Jare Guo 57d19ebe28 use preloaded texture asset for tiled map 2017-12-14 19:22:07 +08:00
Jare Guo a1c535c6bb update texture in property 2017-10-07 16:18:51 +08:00
Nan Wang 032d2d2abd fix api doc reference 2016-10-20 18:36:01 +08:00
Jare Guo ef436d9da4 deferred load scene's raw asset 2016-07-08 17:15:57 +08:00
zhangbin 56ed6ffa92 Remove the method ctor of TiledMapAsset 2016-04-25 10:53:35 +08:00
zhangbin 2fa6efe1f1 Add CC_EDITOR for method createNode of cc.TiledMapAsset. 2016-04-25 10:23:24 +08:00
zhangbin 19bbffcc24 Solve the warning when create node with TiledMapAsset. 2016-04-25 10:16:33 +08:00
zhangbin eea144c60e Change the TiledMapAsset from RawAsset to Asset. 2016-04-22 11:42:38 +08:00
Nan Wang 3a70ae6060 update license file and source code header. 2016-03-01 11:04:12 +08:00
zhangbin f649a50227 Optimize the implementation of TiledMap component.
1. Keep the TiledMap component related files in folder `engine/cocos2d/tilemap`
2. Add comments in file CCTiledMap.js
2016-02-19 12:06:47 +08:00