Commit Graph

53 Commits

Author SHA1 Message Date
knoxHuang 73d39c3cf5 fix CCTiledLayer API 2016-03-28 11:29:35 +08:00
knoxHuang 325175ec53 fix tile map api error 2016-03-28 10:58:13 +08:00
knoxHuang b2c6ed3dfd update Tiled Map API 2016-03-25 18:35:27 +08:00
Jare Guo aa9304626d minor tweaks 2016-03-24 20:28:06 +08:00
Nan Wang 9fbaee07cc fixed api types. 2016-03-18 16:43:47 +08:00
knoxHuang 7e79937f7c add Sprite related api 2016-03-15 15:56:55 +08:00
pandamicro 11359695ba Improve docs and implementation 2016-03-15 12:24:07 +08:00
pandamicro b6f7dd04f0 Cleanup Particle and TiledMap 2016-03-14 21:46:12 +08:00
pandamicro 8d8e21831b Clean up macros 2016-03-14 21:46:12 +08:00
pandamicro 4317508f29 Modulize compression 2016-03-14 21:46:12 +08:00
Jare Guo a445adbf93 Merge pull request #472 from natural-law/tiledmap
Tiledmap
2016-03-14 13:15:03 +08:00
zhangbin a83b918db4 Optimize the logic code. 2016-03-14 12:02:03 +08:00
pandamicro 1d8a6f29e0 Refactor cc.Macro to cc.macro 2016-03-14 11:49:03 +08:00
zhangbin f35b848cf3 Add missed method setTexture for TiledLayer. 2016-03-14 11:16:29 +08:00
zhangbin fffdf5c3ea Solve the error: There isn't any effect when disable the TiledLayer node in creator. 2016-03-14 11:06:44 +08:00
pandamicro 334d99f414 Cleanup CCCommon, CCConfig, CCMacro, CCShaders 2016-03-13 18:57:13 +08:00
zhangbin 73ab7abac6 Solve the problems when using TiledMap in native environment. 2016-03-02 17:32:11 +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
zhangbin bed5222733 Solve the error when a node with TiledMap component is destroyed. 2016-02-29 18:04:27 +08:00
zhangbin 4edaad9904 Remove TiledLayers when the TiledMap component is destroyed. 2016-02-29 16:36:31 +08:00
zhangbin a4618620d0 Optimize the implementation of TiledMap:
1. Disable TiledLayer components when the TiledMap component disabled.
2. Just remove the TiledLayer components when the tmxFile is cleared.
2016-02-29 14:56:22 +08:00
zhangbin de43c1831f Solve the error logic in component TiledMap. 2016-02-29 10:57:40 +08:00
Jare Guo f25669efaa inherit tilemap from renderer component 2016-02-27 22:25:32 +08:00
Jare Guo 94da7696c5 update PR 2016-02-27 17:09:06 +08:00
Jare Guo e115117881 add RendererInSG 2016-02-26 19:28:22 +08:00
Jare Guo 0d4022436c rename ComponentInSG -> RendererBelowSG 2016-02-26 19:28:22 +08:00
pandamicro b91e00560e Fix unexpected asset delete in editor 2016-02-25 18:59:21 +08:00
Wang Nan b6be145cea Merge pull request #384 from nantas/master
fix api syntax.
2016-02-25 17:53:52 +08:00
Nan Wang 5c2725a965 fix api syntax. 2016-02-25 17:51:42 +08:00
pandamicro 4048a6fbb0 Polish single file loading API for cc.loader.load 2016-02-25 17:38:58 +08:00
zhangbin f8a543520a Move emitEvents from cc.Component to cc.Component.EventHandler. 2016-02-25 14:25:02 +08:00
zhangbin db94ac1cc4 Emit error when parse map info failed. 2016-02-25 14:25:02 +08:00
zhangbin e10ae216e8 Emit mapLoaded when the map loading is finished. 2016-02-25 14:25:02 +08:00
zhangbin 9cb3557ede Solve the error effect in method onLoad of component TiledMap. 2016-02-25 14:23:36 +08:00
pandamicro 0ea99226cc Replace cc.loader with pipeline loader 2016-02-25 10:34:09 +08:00
Jare Guo 4a2d59d411 Merge pull request #372 from natural-law/import-tiled
Solve the coupling between onEnable/onDisable and _applyFile in component TiledMap.
2016-02-24 17:09:53 +08:00
zhangbin e6b1adc722 Remove all tmx layers when the tmxFile is cleared. 2016-02-24 16:51:04 +08:00
zhangbin c4c902ff79 Solve the coupling between onEnable/onDisable and _applyFile in component TiledMap. 2016-02-24 16:38:27 +08:00
knoxHuang 4c623eeb22 Merge branch 'master' of github.com:cocos-creator/engine 2016-02-24 13:55:54 +08:00
zhangbin 5ff4fbafcf Solve the error effect when clear tmxFile in component TiledMap. 2016-02-24 11:36:31 +08:00
zhangbin a4d9eebe26 Update the comments for API doc. 2016-02-24 10:49:22 +08:00
zhangbin 16cb7e014b Modify the comments & parameter names of some methods. 2016-02-24 09:26:45 +08:00
zhangbin 9038869d18 Move component TiledMap to menu renderers 2016-02-23 18:25:59 +08:00
zhangbin 847b424154 Optimize the implementation of component TiledMap. 2016-02-23 17:23:34 +08:00
zhangbin 16cbc4fb85 Implement component cc.TiledLayer 2016-02-22 18:28:38 +08:00
knoxHuang 36b5f75aec remove contentScaleFactor 2016-02-22 17:42:59 +08:00
zhangbin f11aa3e43f Remove the TMXLayers before building TiledMap with new Map information. 2016-02-22 11:19:58 +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
zhangbin ff4584ebdc Implement the component TMXTiledMap. 2016-02-19 10:10:45 +08:00