Commit Graph

8 Commits

Author SHA1 Message Date
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
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 b397ac686e Solve the errors in simulator project. 2016-07-12 14:00:09 +08:00
Wenhai Lin 94c95d5838 Withespaces does matter. 2016-03-31 23:50:02 +08:00
Wenhai Lin a6dbf31dcf cocos 2d lite version 2016-03-29 17:55:48 +08:00