Commit Graph

12 Commits

Author SHA1 Message Date
2youyouo2 d6ab74a55e support physics on android 2017-03-10 10:01:36 +08:00
zhangbin 4a1ecf17ac Solve the error when building android platform. 2017-01-09 13:33:47 +08:00
zhangbin ed591faa19 Merge branch 'develop' into dragonbones
# Conflicts:
#	build/cocos2d_libs.xcodeproj/project.pbxproj
#	external/config.json
2016-09-08 09:52:09 +08:00
pandamicro 86ae89f85f Fix win32 compilation issues 2016-09-01 10:38:54 +08:00
zhangbin 1f9d49dbfe Update the project files for dragon bones. 2016-08-30 14:22:50 +08:00
pandamicro 1c01a9df2c Fix android compilation issuse 2016-08-26 19:01:13 +08:00
pandamicro 6713fd2d11 Fix js-bindings project compilation issues 2016-08-15 19:08:58 +08:00
pandamicro 1dd701936b Fix compilation issues on Mac 2016-08-11 13:57:51 +08:00
zhangbin e9d4652c31 Add TiledMap for the HEX orientation maps. 2016-07-11 17:53:52 +08:00
Wenhai Lin 43e89ca5fa Fixed warns 2016-04-27 13:55:14 +08:00
2youyouo2 ce4f78f312 add creator files 2016-04-13 15:35:27 +08:00
Wenhai Lin a6dbf31dcf cocos 2d lite version 2016-03-29 17:55:48 +08:00