Commit Graph

146 Commits

Author SHA1 Message Date
Jare Guo 0192e50569 Merge branch 'v1.4'
# Conflicts:
#	cocos2d/core/CCNode.js
2017-02-09 11:19:38 +08:00
zhangbin 31b29fcb72 Solve the cracks in TiledMap. 2017-02-04 11:42:38 +08:00
Jare Guo 42ba8c1fd3 reviewed 2017-02-03 14:40:05 +08:00
Jare Guo 36a7328f40 remove unused prototype properties 2017-02-03 13:53:54 +08:00
pandamicro 38226ea61f Flat visit call stack by move visit from render command to node 2017-01-22 17:35:38 +08:00
pandamicro a9aaaec6ab Improve RenderCmd construction performance 2017-01-22 17:34:22 +08:00
zhangbin 3a2c6c6f13 Improve the logic. 2017-01-16 13:54:35 +08:00
zhangbin 29fc50c2c5 Solve the error node order when reopen scene in Editor. 2017-01-16 13:34:21 +08:00
Nan Wang 4dea8e7a8a move all error logs to DebugInfos.js and only show error id in release build 2016-12-15 17:07:01 +08:00
zhangbin cba8ddc932 Solve the warning in TMXXMLParser. 2016-11-10 16:45:50 +08:00
zhangbin 5ff80345a7 Solve the error calculation of the image object's position. 2016-11-09 14:13:41 +08:00
Nan Wang 032d2d2abd fix api doc reference 2016-10-20 18:36:01 +08:00
zhangbin 9dd87ec674 Fix that can't hide a tile by setVisible in canvas.
If get a tile sprite by `cc.TiledLayer.getTileAt()`, then invoke `setVisible(false)` for the sprite. It's not work in canvas.
2016-10-17 15:07:15 +08:00
zhangbin 8c75d1733c Solve the error logic in setTileGID. 2016-10-08 13:52:54 +08:00
zhangbin 0fe0d20f85 Solve the error logic in TMXObjectGroup. 2016-09-29 16:28:35 +08:00
zhangbin 899f121859 Improve the implementation of showing Object Group in TiledMap. 2016-09-13 16:12:12 +08:00
zhangbin d4d3a22531 Support draw shape objects in Object Group. 2016-09-12 12:04:00 +08:00
zhangbin 36e6bcd8de Improve the implementation of TMXObjectGroup & TMXObject. 2016-09-09 18:08:47 +08:00
zhangbin 28fa0aab1b Merge branch 'master' of github.com:cocos-creator/engine into issue3120
# Conflicts:
#	cocos2d/tilemap/CCSGTMXObjectGroup.js
2016-09-09 16:58:21 +08:00
zhangbin df4be9dd3c Improve the logic of tile map parser. 2016-09-09 16:56:14 +08:00
zhangbin d33cb280ae Solve the error in the TiledMap parser. 2016-09-07 15:15:56 +08:00
zhangbin df2675bd2c Solve the error when delete TiledMap node & undo the delete action. 2016-08-26 17:21:16 +08:00
zhangbin af69c2ae3c Solve the logic error in _ccsg.TMXLayer.
It's caused by code merging.
2016-08-09 15:56:52 +08:00
zhangbin c38a848931 Solve the error interface name in _ccsg.TMXLayer. 2016-08-09 10:30:29 +08:00
pandamicro f16ad78698 Merge pull request #1003 from pandamicro/v1.2
Fix tile map transform update issue under Canvas
2016-08-02 15:21:27 +08:00
Nan Wang 67322b3f2a fixed api comment syntax error 2016-08-02 15:19:25 +08:00
pandamicro 7781aff2ab Fix tile map transform update issue under Canvas 2016-08-02 14:39:32 +08:00
zhangbin 09e0b05067 Add interface for set the tiles opacity of TiledLayer. 2016-08-01 11:30:09 +08:00
zhangbin a6eeb678f7 Solve the errors in logic. 2016-07-25 18:27:53 +08:00
zhangbin 4dd2557e04 Support show object group of Tiled Map. 2016-07-25 15:56:20 +08:00
pandamicro a2eefba043 Merge pull request #945 from pandamicro/master
Fix some issues
2016-07-22 15:00:32 +08:00
pandamicro bfd3e854d4 Fix tile map black border in canvas render mode too 2016-07-22 14:50:05 +08:00
pandamicro 7d30603dac Merge pull request #938 from pandamicro/master
Fix Tilemap black border issue
2016-07-21 18:03:10 +08:00
pandamicro 7814b3fda6 Fix black border for Tilemap 2016-07-21 17:54:11 +08:00
zhangbin 6df1dac06d Merge branch 'master' of github.com:cocos-creator/engine into issue3120 2016-07-21 16:19:38 +08:00
zhangbin 3fea3ab177 Improve component TiledObject & TiledObjectGroup. 2016-07-21 16:18:47 +08:00
pandamicro 3f69ba6068 Merge pull request #931 from natural-law/issue3622
Solve the error content size of hex tiled map.
2016-07-21 13:59:14 +08:00
pandamicro 0f025452ba Merge pull request #935 from dabingnn/refine_canvas_scaleX/Y
refine rendering of canvas for scaleX and scaleY
2016-07-21 11:51:48 +08:00
Huabing.Xu 06b612be01 refine rendering of canvas for scaleX and scaleY 2016-07-21 11:44:38 +08:00
zhangbin abd7ce21d3 Add component TiledObject & TiledObjectGroup. 2016-07-21 10:16:08 +08:00
zhangbin 684950064c Optimize the logic of TiledMap & ObjectGroup. 2016-07-21 10:06:47 +08:00
zhangbin 3f4f0f2191 Solve the error content size of hex tiled map. 2016-07-21 09:35:48 +08:00
zhangbin e3626c6f15 Solve the error position of object in hex map. 2016-07-20 18:05:12 +08:00
zhangbin 18dc13e393 Merge branch 'master' into issue3120 2016-07-20 16:02:02 +08:00
Wang Nan c09bee2d5d Merge pull request #928 from natural-law/issue3622
Support hex map with stagger axis is y.
2016-07-20 15:59:02 +08:00
zhangbin c043da9ae1 Support hex map with stagger axis is y. 2016-07-19 18:33:10 +08:00
pandamicro 72c3b62ce6 Merge pull request #926 from pandamicro/webgl
Fix Tilemap opacity not used issue
2016-07-19 16:16:12 +08:00
pandamicro deddde866a Fix webgl rendering issue and clipping issue of Tilemap 2016-07-19 15:46:40 +08:00
pandamicro d7aa3a0480 Fix Tilemap opacity not used issue 2016-07-19 14:43:18 +08:00
Nan Wang 1f7adb2c5c merge v1.1 fixes 2016-07-19 10:04:06 +08:00