Commit Graph

109 Commits

Author SHA1 Message Date
Nan Wang 9a934c8b46 Merge branch 'v1.3' of github.com:cocos-creator/cocos2d-x-lite into develop 2016-11-07 15:21:33 +08:00
zhangbin 4b2e32af7f Generate multi app-abi libraries for android in gulp gen-libs. 2016-11-07 13:38:51 +08:00
pandamicro 721658116d Merge pull request #373 from pandamicro/v1.3
Manually bind EventDispatcher::addCustomEventListener to avoid memory issue
2016-11-02 18:18:02 +08:00
pandamicro ee8bb071c4 Manually bind EventDispatcher::addCustomEventListener to avoid memory issue 2016-11-02 18:14:52 +08:00
pandamicro 9990187a4c Merge pull request #372 from pandamicro/v1.3
Manual bind EventListenerCustom::create to avoid memory issue
2016-11-02 12:13:37 +08:00
pandamicro 028d3c9f3c Manual bind EventListenerCustom::create to avoid memory issue 2016-11-02 12:10:17 +08:00
pandamicro cf8539133b Merge pull request #368 from pandamicro/v1.3
Manual bind EventListenerAcceleration::create to avoid memory issue
2016-11-01 21:42:19 +08:00
pandamicro 8d90e127a3 Manual bind EventListenerAcceleration::create to avoid memory issue 2016-11-01 21:38:27 +08:00
zhangbin 57f79e9be9 Update the submodule cocos2d-console.
Changed : Improve `cocos run -p iOS`  for support XCode 8.
2016-10-27 15:34:29 +08:00
子龙山人 cc1e708495 Update before-install.sh 2016-10-24 14:04:31 +08:00
子龙山人 7eb05b1158 Update before-install.sh 2016-10-24 13:55:32 +08:00
子龙山人 639707ebe1 Merge pull request #361 from zilongshanren/fix-travis-build
fix yaml issue
2016-10-23 22:38:12 -07:00
zilongshanren e387ab35cd fix yaml issue 2016-10-24 13:35:43 +08:00
pandamicro 1ad947925b Unify function name of Texture2D::releaseTexture 2016-10-24 02:49:18 +08:00
zhangbin 3e295176ff Update submodule cocos2d-console. 2016-10-11 18:04:33 +08:00
zhangbin 1e8ea4ee58 Solve the error on platform win32. 2016-09-27 15:14:12 +08:00
zhangbin 976a4e75e1 Update submodule cocos2d-console. 2016-09-22 18:22:06 +08:00
zhangbin ab293df6bd Merge branch 'develop' of github.com:cocos-creator/cocos2d-x-lite into dragonbones
# Conflicts:
#	cocos/scripting/js-bindings/auto/jsb_cocos2dx_auto.cpp
2016-09-22 17:42:48 +08:00
zhangbin c981f0e488 Improve the implementation of dragonbones. 2016-09-22 17:37:35 +08:00
zhangbin eb4ce7d13a Solve the errors in jsbindings. 2016-09-21 15:23:35 +08:00
zhangbin 070bada185 Solve the errors in js bindings. 2016-09-19 17:44:12 +08:00
zhangbin 119fec9efe Merge branch 'develop' into dragonbones
# Conflicts:
#	external/config.json
2016-09-13 16:29:59 +08:00
zhangbin cabcc205e9 Improve the implementation of showing Object Group in TiledMap. 2016-09-13 16:11:19 +08:00
zhangbin bbae20da07 Add config for dragonbones jsbinding. 2016-09-09 16:02:33 +08:00
pandamicro f581b673eb Fix Android compilation issues for simulator 2016-09-08 15:40:01 +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
Nan Wang ef368ef409 merged v1.2 2016-09-07 18:47:59 +08:00
zhangbin 4acadb9595 Update the version of rapid json. 2016-09-02 11:40:59 +08:00
pandamicro 473325bc1e Merge pull request #302 from pandamicro/develop
Fix mac simulator
2016-09-02 10:59:07 +08:00
pandamicro 651551055a Fix mac simulator 2016-09-02 10:57:21 +08:00
zilongshanren 1ecec7bdd8 fix jsb travis script 2016-09-01 18:39:49 +08:00
zilongshanren 2e00a5158c fix travis binidngs generator 2016-09-01 18:21:49 +08:00
natural-law a240bef9bc Add dragonbones project for win32. 2016-08-30 15:21:48 +08:00
yanli.huang 20e981f64e update cocos2d-console commit id :fix cocos package can't update 2016-08-30 13:59:45 +08:00
zhangbin 36bdf9aac7 Update the version of rapid json. 2016-08-30 11:48:57 +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
Wang Nan 789320bbe3 Merge pull request #269 from natural-law/issue3120
Support show the object group in TiledMap.
2016-08-26 20:15:22 +08:00
pandamicro 2763b53ac1 Merge branch 'develop' of github.com:cocos-creator/cocos2d-x-lite into develop
Conflicts:
	cocos/platform/android/java/src/org/cocos2dx/lib/Cocos2dxVideoHelper.java
2016-08-26 19:11:51 +08:00
pandamicro 26117d82b3 Fix compilation issues on iOS 2016-08-26 18:52:25 +08:00
zhangbin f97b23514b Use java reflection to avoid API level dependent, Use API Level 10. 2016-08-25 09:56:32 +08:00
yanli.huang 17bba052e5 update cocos2d-console commit id :add cocospackage.pyc 2016-08-22 16:46:10 +08:00
yanli.huang 0df076d508 update cocos2d-console commit id : cocos package so change pyc 2016-08-22 16:29:13 +08:00
yanli.huang 15515c3d2d update cocos2d-console commit: add --env param to cocos package 2016-08-16 11:48:52 +08:00
yanli.huang c31ae1fe2c update cocos2d-console commit :add --env param to cocos package 2016-08-16 11:43:11 +08:00
pandamicro 6713fd2d11 Fix js-bindings project compilation issues 2016-08-15 19:08:58 +08:00
pandamicro 32b4f63d45 Fix Creator module memory not controlled by cpp 2016-08-15 01:11:32 +08:00
zhangbin 4e8915ecd8 Solve the error is generated js bindings. 2016-08-12 15:56:52 +08:00
pandamicro f06b057a3e Update bindings configurations 2016-08-11 13:59:38 +08:00
yanli.huang 4f08f963e5 update cocos2d-console commit
1.add mode param when call cocos package encrypt
2.fault-tolerant. call encrypt if and only if used cocos package to import plugin
2016-07-29 18:40:58 +08:00
yanli.huang 1931d6e2e1 update cocos2d-console commit:
fix: Interrupt to compile when cocos package prompted user to update
2016-07-26 18:30:41 +08:00