Commit Graph

71 Commits

Author SHA1 Message Date
Jare Guo b1e8e498e9 make sizeProvider error more clear 2016-05-21 18:23:03 +08:00
zhangbin eb057da554 Change the solution of issue 3007. 2016-05-19 10:00:17 +08:00
zhangbin acf765847e Solve the error in TiledMap when build for android on Windows. 2016-05-17 10:33:10 +08:00
zhangbin f6797eedcc Solve the error meta data of tmx file on windows. 2016-05-13 18:27:37 +08:00
Jare Guo f8edcbe802 remove cc.sys.isNative in html5 2016-05-13 11:21:22 +08:00
zhangbin 12b60e0112 Solve the error when parsing tmx file on Web. 2016-05-12 14:47:21 +08:00
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
zhangbin ddae03943f Solve the error z-order when a TiledMap node has non-TiledLayer child. 2016-04-26 12:47:05 +08:00
zhangbin e09bebcb0b Solve the error in component TiledMap. 2016-04-25 14:25:34 +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
Jare Guo 3265e632e6 disallow ignoreAnchorPointForPosition in render tree to avoid rotation bug can not fixed in JSB 2016-04-20 01:15:09 +08:00
zhangbin 6591f24d6e replace engine url with unpack protocol. 2016-04-19 15:38:26 +08:00
zhangbin 6e09b02f82 Move the tiled-map assets inspector to the engine. 2016-04-19 15:38:26 +08:00
zhangbin ba08f69a63 Solve the error effect in web when using rotated tile in TiledMap. 2016-04-14 18:01:58 +08:00
zhangbin bff53b3fe3 Solve the error effect in web when using rotated tile in TiledMap. 2016-04-14 17:30:13 +08:00
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