Commit Graph

9 Commits

Author SHA1 Message Date
zhangbin b47a800400 Solve the error logic when re-init the TiledMap with a new resource. 2016-09-30 09:44:52 +08:00
zhangbin 33fdd229a2 Solve the issue reviewed. 2016-09-09 16:30:48 +08:00
zhangbin bf54012c70 Support show the object group in TiledMap. 2016-09-09 16:28:10 +08:00
pandamicro 86ae89f85f Fix win32 compilation issues 2016-09-01 10:38:54 +08:00
pandamicro 66a38aa3a4 Merge branch 'develop' of github.com:cocos-creator/cocos2d-x-lite into develop
Conflicts:
	cocos/2d/CCFastTMXTiledMap.cpp
2016-08-26 20:48:38 +08:00
zhangbin ac3b05b491 Solve the issue by reviewed. 2016-08-12 17:55:47 +08:00
pandamicro 8642f8ef74 Upgrade cocos/2d to v3.13 2016-08-04 11:59:26 +08:00
zhangbin 7116026244 Support show the object group in TiledMap. 2016-08-02 11:42:50 +08:00
zhangbin e9d4652c31 Add TiledMap for the HEX orientation maps. 2016-07-11 17:53:52 +08:00