Commit Graph

16 Commits

Author SHA1 Message Date
zhangbin cabcc205e9 Improve the implementation of showing Object Group in TiledMap. 2016-09-13 16:11:19 +08:00
zhangbin 11ccbf28c4 Solve the error when compile project with NDK r10. 2016-09-12 10:43:07 +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 fcbcce65d8 Merge branch 'develop' of github.com:cocos-creator/cocos2d-x-lite into develop
Conflicts:
	cocos/platform/android/CCDevice-android.cpp
	cocos/platform/android/java/src/org/cocos2dx/lib/Cocos2dxBitmap.java
	cocos/platform/ios/CCDevice-ios.mm
	cocos/platform/mac/CCDevice-mac.mm
	cocos/platform/win32/CCDevice-win32.cpp
2016-08-31 14:39:08 +08:00
zhangbin 6c92d8daaa Solve the error when compile project with NDK r10. 2016-08-30 14:08:27 +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 9bf561baee Upgrade to v3.13 release 2016-08-26 14:30:32 +08:00
zhangbin ac3b05b491 Solve the issue by reviewed. 2016-08-12 17:55:47 +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
zhangbin 9fd7d51932 Support CSV format tmx file in TiledMap. 2016-05-31 14:50:35 +08:00
Wenhai Lin e6e2d22724 Bug fix:
1.Downloader crash when storage path contains spaces on iOS
2.Memory leak when read empty file
3.Actions may not have been executed
4.TMXXMLParser::TMXObjectInfo support "id" key
2016-04-19 16:33:21 +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