Commit Graph

1918 Commits

Author SHA1 Message Date
CocosRobot 40ce4bc971 [ci skip][AUTO]: updating jsbinding automatically 2017-09-26 03:05:45 +00:00
James Chen 46ab06d985 Merge pull request #853 from jareguo/v1.6
minor tweak for #834
2017-09-25 22:01:15 -05:00
Jare Guo b83ce1e69e minor tweak for #834 2017-09-26 10:27:25 +08:00
Knox 5e44f1c1f1 fix EditorBox set text color error for fireball/issues/6404 (#840) 2017-09-22 03:39:41 -05:00
Wang Nan 686f6e9f90 Merge pull request #838 from knoxHuang/v1.6
fix webview bug for ios for fireball/issues/6328
2017-09-22 10:31:52 +08:00
knoxHuang de909410be fix webview bug for ios for fireball/issues/6328 2017-09-21 16:42:10 +08:00
Wang Nan ec8152f726 Merge pull request #836 from dumganhar/v1.6
Updates download-deps.py
2017-09-21 12:04:55 +08:00
James Chen 866ac36840 Updates download-deps.py 2017-09-21 12:02:02 +08:00
CocosRobot e6467c3299 [ci skip][AUTO]: updating jsbinding automatically (#835) 2017-09-20 22:30:56 -05:00
Wang Nan b6446424df Merge pull request #834 from jareguo/v1.6
try to fix crash of dragonbones
2017-09-21 11:10:51 +08:00
Jare Guo 9d8ed05932 [DragonBones] try to fix crash in AnimationState::_fadeIn 2017-09-21 11:01:31 +08:00
Jare Guo 6f5c4760ba [DragonBones] revert wrong optimization in 59905b8eb6
see https://github.com/DragonBones/DragonBonesCPP/issues/163
2017-09-21 00:27:56 +08:00
pandamicro 01004b8d5f Merge pull request #830 from pandamicro/v1.6
Fix screen resolution issue on iOS
2017-09-20 17:50:51 +08:00
pandamicro c7e63f3769 Adjust png refs in xcode project 2017-09-20 17:49:33 +08:00
pandamicro a83f52142f Fix screen resolution issue on iOS 2017-09-20 17:25:26 +08:00
pandamicro 4926b057e9 Merge pull request #828 from dumganhar/v1.6
Sync PR(https://github.com/cocos2d/cocos2d-x/pull/17921): remove "system" usage which is removed from iOS11.
2017-09-20 10:30:42 +08:00
James Chen 8a9251c91a Sync PR(https://github.com/cocos2d/cocos2d-x/pull/17921): remove "system" usage which is removed from iOS11. 2017-09-20 10:16:10 +08:00
pandamicro 10bfe7a407 Merge pull request #823 from pandamicro/v1.6
Fix JSB potential issues
2017-09-19 09:56:17 +08:00
pandamicro d54cdb6f4d Fix incorrect usage of PersistentRootedObject in jsb websocket 2017-09-19 09:55:21 +08:00
pandamicro 21ce3ba37d Avoid Spidermonkey debug mode crash in jsb::Object 2017-09-19 09:54:46 +08:00
Wang Nan 9b8a072ebb Merge pull request #816 from CocosRobot/update_cocosfiles_1505378923
[AUTO][ci skip]: updating cocos2dx_files.json
2017-09-14 17:08:04 +08:00
CocosRobot f1150aedfc [AUTO][ci skip]: updating cocos2dx_files.json 2017-09-14 08:48:44 +00:00
Wang Nan 3d0fa4c9f2 Merge pull request #815 from 2youyou2/anysdk
update external version
2017-09-14 16:44:01 +08:00
2youyouo2 14375bf6d2 update external version 2017-09-14 15:40:38 +08:00
Wang Nan 77ed295682 Merge pull request #814 from CocosRobot/update_cocosfiles_1505372495
[AUTO][ci skip]: updating cocos2dx_files.json
2017-09-14 15:14:40 +08:00
CocosRobot 2c98265033 [AUTO][ci skip]: updating cocos2dx_files.json 2017-09-14 07:01:35 +00:00
Wang Nan bbeba469a5 Merge pull request #813 from 2youyou2/anysdk
fixed anysdk folder structure
2017-09-14 14:57:10 +08:00
2youyouo2 d6b884f40e fixed anysdk folder structure 2017-09-14 14:45:49 +08:00
Nan Wang 691a0e2bca update engine version 2017-09-12 16:27:11 +08:00
Wang Nan f441aeb321 Merge pull request #812 from CocosRobot/update_cocosfiles_1505201981
[AUTO][ci skip]: updating cocos2dx_files.json
2017-09-12 15:44:38 +08:00
Wang Nan f280f8b44c Merge pull request #811 from CocosRobot/update_cocosfiles_1505201973
[AUTO][ci skip]: updating cocos2dx_files.json
2017-09-12 15:44:23 +08:00
CocosRobot 076a9d904a [AUTO][ci skip]: updating cocos2dx_files.json 2017-09-12 07:39:42 +00:00
CocosRobot 5772f0277d [AUTO][ci skip]: updating cocos2dx_files.json 2017-09-12 07:39:34 +00:00
Wang Nan 509616098b Merge pull request #808 from dumganhar/fix/activity-recreated
[android] Fixes Cocos2dxActivity is re-created which causes crash if launching app first time and re-opening from icon
2017-09-12 15:35:32 +08:00
Wang Nan 177e64295c Merge pull request #810 from 2youyou2/anysdk
add jailbreak anysdk files
2017-09-12 15:34:50 +08:00
2youyouo2 47058d7a84 update external version 2017-09-12 15:25:14 +08:00
2youyouo2 81bb1ed5e0 Merge branch 'v1.6' of github.com:cocos-creator/cocos2d-x-lite into anysdk 2017-09-12 14:35:15 +08:00
2youyouo2 9c12fcb2d9 add jailbreak anysdk files 2017-09-12 14:31:50 +08:00
pandamicro 4cc33f293e Merge pull request #809 from dumganhar/fix/sync-audio
[iOS] Default audio session mode should be set to AVAudioSessionCategoryAmbient.
2017-09-11 15:13:50 +08:00
James Chen 9030253ab4 [iOS] Default audio session mode should be set to AVAudioSessionCategoryAmbient.
And sync audio changes:
https://github.com/cocos2d/cocos2d-x/pull/18228
https://github.com/cocos2d/cocos2d-x/pull/18209
2017-09-11 12:00:51 +08:00
James Chen 642250694e [android] Fixes Cocos2dxActivity is re-created which causes crash if launching app first time and re-opening from icon 2017-09-11 11:09:29 +08:00
pandamicro d7d3a389ef Merge pull request #804 from knoxHuang/v1.6
fix  eidtorbox 'editBoxEditingReturn' events are triggered continuous…
2017-09-08 11:57:35 +08:00
knoxHuang 933a11a188 fix eidtorbox 'editBoxEditingReturn' events are triggered continuously bug for fireball/issues/6358 2017-09-07 22:17:04 +08:00
pandamicro 8cac7050a4 Merge pull request #802 from pandamicro/v1.6
Remove inappropriate logs in debugger
2017-09-07 17:49:44 +08:00
pandamicro 087f1f8c8d Remove inappropriate logs in debugger 2017-09-07 17:48:48 +08:00
Wang Nan ddec5d268f Merge pull request #798 from pandamicro/v1.6
Avoid useless function check in executeFunctionWithOwner and useless …
2017-09-06 10:58:53 +08:00
pandamicro 0b057318a4 Avoid useless function check in executeFunctionWithOwner and useless js parameter construction in websocket 2017-09-04 13:46:37 +08:00
pandamicro 14709ed7e2 Merge pull request #797 from pandamicro/v1.6
Fix JS_EncodeStringToUTF8 memory leak
2017-09-04 13:41:26 +08:00
pandamicro 97b52f38cb Fix JS_EncodeStringToUTF8 memory leak 2017-09-01 18:07:14 +08:00
Wang Nan 83cd6f465b Merge pull request #795 from 2youyou2/v1.6
fixed android-studio debug error
2017-09-01 15:11:09 +08:00