Commit Graph

4804 Commits

Author SHA1 Message Date
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
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 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
zilongshanren 1a34550c01 fix label font color issue 2016-10-22 09:33:47 +08: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 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
natural-law efdfe017de Add libwebp for win32 release config. 2016-10-21 11:27:44 +08:00
pandamicro 73db7414ed Update cocos2dx_files 2016-10-21 11:14:39 +08:00
pandamicro dc339ac39d Merge pull request #353 from pandamicro/v1.3
Fix compilation issue when COCOS_DEBUG = 2
2016-10-21 10:50:16 +08:00
pandamicro 0ef4b39235 Fix compilation issue when COCOS_DEBUG = 2 2016-10-21 10:34:00 +08:00
pandamicro 1aa0369e32 Merge pull request #352 from knoxHuang/v1.3
fix Follow bug for fireball/issues/4486
2016-10-20 17:22:40 +08:00
knoxHuang 576362d28b fix Follow bug for fireball/issues/4486 2016-10-20 17:18:55 +08:00
pandamicro b7ec01f2a2 Merge pull request #351 from pandamicro/v1.3
Fix ScriptingCore::evalString
2016-10-20 14:14:41 +08:00
Wang Nan 7ca8011eeb Merge pull request #349 from pandamicro/v1.3
Add Webp in native
2016-10-20 13:47:31 +08:00
pandamicro eedacaa57b Fix ScriptingCore::evalString 2016-10-20 11:35:14 +08:00
zilongshanren 2ceff34668 add webp library 2016-10-20 11:18:57 -07:00
Wang Nan 657707786d Merge pull request #350 from hylthink/v1.3
cancel annotation init function
2016-10-20 09:41:56 +08:00
yanli.huang 7b5ce594e5 cancel annotation init function 2016-10-19 18:46:22 +08:00
pandamicro f88c6fa3cc Support webp in native 2016-10-19 18:36:35 +08:00
pandamicro 9b9845e02c Improve ScheduleWrapper function call 2016-10-19 16:27:08 +08:00
Wang Nan 9debe22d14 Merge pull request #348 from zilongshanren/fix-android-video-total-time
add ready to play event
2016-10-17 14:58:05 +08:00
zilongshanren be642ec1af add ready to play event 2016-10-17 11:59:38 +08:00
子龙山人 c4eb9c42ec Merge pull request #347 from zilongshanren/fix-android-video-total-time
Fix android video total time
2016-10-14 03:32:31 -07:00
zilongshanren 65a677e51a improve VideoPlayer 2016-10-14 18:16:40 +08:00
zilongshanren 58be2ff238 add metaloaded and click event 2016-10-14 11:37:31 +08:00
zhangbin 14876aee45 Remove spaces. 2016-10-14 10:39:02 +08:00
zhangbin e769890ddc Add method insertChildBefore for Creator issue 4335. 2016-10-13 18:37:04 +08:00
zilongshanren 07d43683e2 add bmfont BOM header support 2016-10-13 13:43:34 +08:00
Wang Nan de89c7e001 Merge pull request #344 from hylthink/v1.3
fix update libPluginProtocol.jar 2.2.3
2016-10-12 13:53:47 +08:00
yanli.huang f2c3fda64a fix update libPluginProtocol.jar 2.2.3 2016-10-12 11:25:23 +08:00
Wang Nan db206cc654 Merge pull request #342 from natural-law/v1.3
Update submodule cocos2d-console.
2016-10-12 10:52:47 +08:00
yanli.huang 67f27618f7 update libPluginProtocol.jar 2.2.3 2016-10-12 10:45:09 +08:00