Commit Graph

89 Commits

Author SHA1 Message Date
pandamicro a06a9b7ff4 Merge pull request #900 from pandamicro/webgl
Upgrade WebGL Renderer with auto batching
2016-07-15 13:52:30 +08:00
pandamicro 4ef771c043 Fix remained issues in new renderer 2016-07-13 14:04:25 +08:00
pandamicro b4e6234010 Issue fixes 2016-07-12 16:33:52 +08:00
pandamicro 07e592dced Upgrade Scale9Sprite renderer & set index buffer dynamically 2016-07-12 16:33:52 +08:00
pandamicro c532c09eff Merge Cocos2d-html5 v3.12 webgl renderer 2016-07-12 16:33:51 +08:00
Jare Guo ef436d9da4 deferred load scene's raw asset 2016-07-08 17:15:57 +08:00
Nan Wang afa335e00d fix api comment syntax error 2016-07-07 14:17:33 +08:00
zhangbin a7b594f974 Solve the error in web when tmx files & image files are not in the same folder. 2016-07-04 11:45:20 +08:00
Huabing.Xu b81e14d2e7 function rename 2016-06-28 14:06:55 +08:00
Huabing.Xu cbae75e5fd function rename 2016-06-27 15:43:06 +08:00
Huabing.Xu f04a1b6053 fix visible error by extract propagateFlags from _syncStatus 2016-06-27 15:39:06 +08:00
zhangbin f1eb36dbb6 Move the deprecated methods to deprecated.js 2016-06-12 14:46:46 +08:00
zhangbin 3e73454df7 Rename the method getTileset/setTileset to getTileSet/setTileSet. 2016-06-12 14:33:35 +08:00
zhangbin 092b8bafbd Solve the error effect of TiledMap in Windows Creator. 2016-06-03 15:28:42 +08:00
zhangbin 206fade8cc Remove the size provider when a TiledLayer component is destroyed. 2016-05-27 12:05:08 +08:00
zhangbin 4453110d09 Improve the method name. 2016-05-27 11:56:16 +08:00
zhangbin a6c55e73e5 Solve the issue : Can't reorder the children of TiledMap nodes. 2016-05-27 11:37:27 +08:00
zhangbin c2aa26f43b Record the TiledMap depended resources info in postImport. 2016-05-26 15:12:42 +08:00
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