Commit Graph

921 Commits

Author SHA1 Message Date
zilongshanren d3149a7ec2 fix viewport size change after capture screen 2016-11-08 16:02:01 +08:00
Nan Wang 4572d56594 fix travis branch for develop 2016-11-07 15:23:36 +08:00
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
Wang Nan 12e12a3f40 Merge pull request #377 from natural-law/issue4514
Generate multi app-abi libraries for android in gulp gen-libs.
2016-11-07 15:09:51 +08:00
zhangbin 4b2e32af7f Generate multi app-abi libraries for android in gulp gen-libs. 2016-11-07 13:38:51 +08:00
子龙山人 902f56a668 Merge pull request #375 from CocosRobot/update_cocosfiles_1478241173
[AUTO][ci skip]: updating cocos2dx_files.json
2016-11-03 23:34:59 -07:00
CocosRobot 4774895ce0 [AUTO][ci skip]: updating cocos2dx_files.json 2016-11-04 06:32:53 +00:00
Nan Wang 4c387a184e added update-version workflow 2016-11-04 14:31:53 +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 44e8069ae1 Merge pull request #371 from DavidDeSimone/hh-help-fixv2
Fixing issue where JSScheduleTarget::dump will trigger a bad access
2016-11-02 11:42:15 +08:00
David DeSimone 473c5f1fae Fixing issue where JSScheduleTarget::dump will trigger a bad access due to NULL pointer access. 2016-11-01 16:52:52 -07:00
子龙山人 f30200e87e Merge pull request #370 from zilongshanren/fix-editbox-macos-sierra
fix editbox can't input on macos sierra
2016-11-01 07:51:28 -07:00
zilongshanren b289d6010e fix editbox sierra 2016-11-01 22:29:42 +08:00
pandamicro 1c9dd03112 Merge pull request #369 from pandamicro/v1.3
Update auto bindings manually
2016-11-01 22:11:56 +08:00
pandamicro f1b3a9e24a Update auto bindings manually 2016-11-01 22:08:29 +08:00
pandamicro b96b64d218 Merge pull request #367 from DavidDeSimone/set-width-fix
Fixing improperly named variable in cc.LabelBMFont.
2016-11-01 21:43:24 +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
David DeSimone ea0ed5adcf Fixing improperly named variable in cc.LabelBMFont. 2016-10-31 19:42:07 -07:00
pandamicro b5f6d6825d Merge pull request #365 from dumganhar/fix/sync-audio
Updates lite audio engine sources from upstream (cocos2d-x).
2016-10-28 16:40:27 +08:00
Wang Nan 6cdbc73649 Merge pull request #364 from natural-law/v1.3
Update the submodule cocos2d-console.
2016-10-28 14:56:47 +08:00
James Chen 725aa66556 Updates lite audio engine sources from upstream (cocos2d-x). 2016-10-28 11:30:29 +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
pandamicro e21eb21301 Merge pull request #363 from pandamicro/v1.3
Fix issue: js_remove_object_reference can not remove non binding objects
2016-10-26 16:48:04 +08:00
pandamicro 4b36047ec3 Fix issue: js_remove_object_reference can not remove non binding objects 2016-10-26 16:42:20 +08:00
Wang Nan 48b1e242a6 Merge pull request #362 from zilongshanren/fix-travis-build
fix system font rendering issue
2016-10-24 17:13:02 +08:00
zilongshanren 60e1033188 fix system font rendering issue 2016-10-24 16:35:22 +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
子龙山人 1f8fa5adaf Update .travis.yml 2016-10-24 13:41:41 +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
子龙山人 54dc3fa307 Update .travis.yml 2016-10-24 12:05:47 +08:00
子龙山人 d5d306c625 Update .travis.yml 2016-10-24 11:58:50 +08:00
子龙山人 87fe0151f5 Update .travis.yml 2016-10-24 11:57:21 +08:00
pandamicro 0274b154b0 Merge pull request #360 from pandamicro/v1.3
Travis failed, update bindings
2016-10-24 03:03:54 +08:00
pandamicro 06a9b6a89e Travis failed, update bindings 2016-10-24 03:03:28 +08:00
pandamicro b0b0e7008f Merge pull request #359 from pandamicro/v1.3
Unify function name of Texture2D::releaseTexture
2016-10-24 02:49:54 +08:00
pandamicro 1ad947925b Unify function name of Texture2D::releaseTexture 2016-10-24 02:49:18 +08:00
Wang Nan 3d1f591cea Merge pull request #358 from zilongshanren/fix-label-font-color
fix label font color issue
2016-10-22 15:46:54 +08:00
zilongshanren 1a34550c01 fix label font color issue 2016-10-22 09:33:47 +08:00
子龙山人 2465b55a1e Merge pull request #357 from CocosRobot/update_cocosfiles_1477032912
[AUTO][ci skip]: updating cocos2dx_files.json
2016-10-20 23:57:58 -07:00
CocosRobot fe440cc79e [AUTO][ci skip]: updating cocos2dx_files.json 2016-10-21 06:55:13 +00:00
子龙山人 14da47da67 Update .travis.yml 2016-10-21 14:54:27 +08:00
pandamicro 0702d4ec57 Merge pull request #356 from cocos-creator/revert-354-v1.3
Revert "Update cocos2dx_files"
2016-10-21 11:36:47 +08:00
pandamicro 359e57bdd6 Revert "Update cocos2dx_files" 2016-10-21 11:36:30 +08:00
pandamicro 422e6acb7e Merge pull request #355 from natural-law/v1.3
Add libwebp for win32 release config.
2016-10-21 11:36:08 +08:00