Commit Graph

31980 Commits

Author SHA1 Message Date
子龙山人 675d5efb39 Merge pull request #13151 from flashjay/patch-2
Update AppController.h
2015-08-12 13:43:39 +08:00
子龙山人 25d4f9fccc Merge pull request #13326 from yangws/bug_22060
fix bug: #22060 cpp-tests Scheduler -> Pause/Resume All User test cas…
2015-08-12 13:34:32 +08:00
pandamicro 6f010f5316 Update release docs for v3.7.1 2015-08-12 13:02:35 +08:00
Vincent Yang 9159b21c9a fix bug: #22060 cpp-tests Scheduler -> Pause/Resume All User test case not correct. 2015-08-12 11:37:15 +08:00
子龙山人 0f99e09adb Merge pull request #13325 from jianglong0156/fixTextField
textfield not create, don't need open ime.
2015-08-12 11:26:31 +08:00
jianglong0156 fc5e2233e9 textfield not create, don't need open ime. 2015-08-12 11:22:36 +08:00
andyque 763976d50c fix ui::TextField status error.
1. Refactoring Cocos2dxEditText to reuse Cocos2dxEditBox.

2. Reorder the event handling in ui::TextField.
2015-08-12 11:05:07 +08:00
pandamicro 3d65700400 Merge pull request #13295 from fusijie/refine_testcase_retro_pos
fix retro effect pos bug.
2015-08-12 10:45:14 +08:00
pandamicro dfc17edb27 Merge pull request #13291 from dabingnn/v3_FixShaderTestCrash
fix shader test crash on android device
2015-08-12 10:40:14 +08:00
pandamicro dbd0b6dd86 Merge pull request #13272 from yangws/bug_21800
fixed bug #21800 [CppTest]Node: Scene3D when player outof terrain app…
2015-08-12 10:25:30 +08:00
ZhangMenghe fc7dc66c05 Change to non-background 2015-08-12 10:09:11 +08:00
pandamicro 6f4ed8a67b Merge pull request #13317 from CocosRobot/update_lua_bindings_1439279877
[ci skip][AUTO]: updating luabinding & jsbinding automatically
2015-08-11 22:06:57 +08:00
Wenhai Lin b46000287e AudioEngine:Fixed crash cause by multiple threads access into a shared unsynchronized data.[iOS/Mac] 2015-08-11 18:11:59 +08:00
CocosRobot ef41cb27ca [ci skip][AUTO]: updating luabinding & jsbinding automatically 2015-08-11 08:02:58 +00:00
子龙山人 5fb0135bc2 Merge pull request #13297 from yangws/bug_21861
Fix bug: #21861 cpp-tests->Node:Sprite->Testing Sprite BatchNode's ef…
2015-08-11 15:55:26 +08:00
子龙山人 f3f67a10f9 Merge pull request #13232 from perminovVS/v3-dev-get-file-extension
Add getFileExtension to FileUtils
2015-08-11 15:54:55 +08:00
子龙山人 65c4261cc6 Merge pull request #13301 from yangws/bug_21906
fix bug: #21906 Pause/Resume 's result not correct.
2015-08-11 15:54:02 +08:00
ZhangMenghe 417652cbbd Fix camera orbit testcase 2015-08-11 15:13:11 +08:00
子龙山人 9174017ae8 Merge pull request #13313 from zilongshanren/fix-editbox-soft-keyboard-backissue
Fix EditBox turning black when soft keyboard hide.
2015-08-11 14:39:26 +08:00
子龙山人 aba3d40a52 Merge pull request #13309 from jianglong0156/improvetestcase
[ci skip]Improve test case
2015-08-11 14:38:58 +08:00
Vincent Yang bb0a7a8533 fix bug: #21906 Pause/Resume 's result not correct. 2015-08-11 14:28:52 +08:00
Vincent Yang 47ecb246b8 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into bug_21906 2015-08-11 14:24:02 +08:00
ZhangMenghe abb5aff9ed Add testcase to issue3053 2015-08-11 14:06:00 +08:00
yangxiao 7b04dbca88 modify CCLOG to cocos2d::log 2015-08-11 11:54:08 +08:00
andyque b2bf8469f0 Fix EditBox turning black when soft keyboard hide.
I disable a optimization when users start to type, the resize layout's
doLayout event should be stoped.

But it has bugs. If we could find reliable soft keyboard show/hide
event detection method, we could enable this optimization again.
2015-08-11 11:42:37 +08:00
jianglong0156 89949248de sort the testcase by title. 2015-08-11 11:22:01 +08:00
jianglong0156 8a8515e998 fix the menu label size error 2015-08-11 11:21:19 +08:00
子龙山人 271ab08b59 Merge pull request #13306 from WenhaiLin/v3.8-label-letter-flipped
Label:Fixed letter can be flipped.
2015-08-11 11:05:12 +08:00
子龙山人 f1c252a1a8 Merge pull request #13302 from WenhaiLin/v3.8-CocosBuilderTest-crash
CppTests-->Extension-->CocosBuilderTest:Fixed crash on Android 5.0.x.
2015-08-11 11:04:54 +08:00
fusijie aa1b1831e9 fix cocostudio skin setfliped. 2015-08-11 10:34:22 +08:00
子龙山人 c5477abaf0 Merge pull request #13305 from CocosRobot/update_lua_bindings_1439258043
[ci skip][AUTO]: updating luabinding & jsbinding automatically
2015-08-11 10:07:02 +08:00
WenhaiLin eeb4a38715 Label:Fixed letter can be flipped. 2015-08-11 10:06:14 +08:00
CocosRobot aa6ac72405 [ci skip][AUTO]: updating luabinding & jsbinding automatically 2015-08-11 01:58:29 +00:00
子龙山人 1f14b5895e Merge pull request #13303 from pandamicro/v3.7.1
Fix issue described in #13284 by reorder state setting and event dispatching
2015-08-11 09:51:06 +08:00
子龙山人 c65f09f63e Merge pull request #13296 from WenhaiLin/v3.8-label-crash-mac
Label:Fixed crash cause by access an invalid address
2015-08-11 07:30:38 +08:00
WenhaiLin 2deeee70d2 CppTests-->Extension-->CocosBuilderTest:Fixed crash on Android 5.0.x. 2015-08-10 22:41:18 +08:00
pandamicro 06f57600d4 Merge pull request #13294 from dabingnn/v3_fixMaterialParsingTestWP8.1
V3 fix material parsing test wp8.1
2015-08-10 22:30:43 +08:00
pandamicro 6bcea5baee Fix issue described in #13284 by reorder state setting and event dispatching
The real reason of #13284 is that the `_selected` state is set after touch events dispatching.
So I decided to override `onTouchEnded` function to set the `_selected` state.
2015-08-10 22:27:59 +08:00
pandamicro 986fd1d086 Merge pull request #13300 from jianglong0156/fixprojectTarget
modify js-test mac device target 10.10 to 10.7
2015-08-10 20:48:25 +08:00
pandamicro 97dbcd3c3b Merge pull request #13298 from jianglong0156/fixVibrateBugInWeb
fix vigrate resource error, and hide the vibrateTest in web
2015-08-10 20:46:50 +08:00
Vincent Yang d0a5c02399 fix bug: #21906 Pause/Resume 's result not correct. 2015-08-10 17:58:49 +08:00
jianglong0156 5c365f6599 modify js-test mac device target 10.10 to 10.7 2015-08-10 17:39:13 +08:00
jianglong0156 32223348cb fix vigrate resource error, and hide the vibrateTest in web 2015-08-10 17:27:28 +08:00
Vincent Yang 0d1dfbc440 Fix bug: #21861 cpp-tests->Node:Sprite->Testing Sprite BatchNode's effect not correct. 2015-08-10 17:07:46 +08:00
Wenhai Lin 2983aed0a9 Label:Fixed crash cause by access an invalid address 2015-08-10 16:50:59 +08:00
Huabing.Xu d848da0e7d change max parsing count to 5000 2015-08-10 16:41:16 +08:00
fusijie 4965a9a11c fix retro effect pos bug. 2015-08-10 16:32:24 +08:00
Huabing.Xu ea9d6e7997 refine test case to be more testing friendly 2015-08-10 16:12:15 +08:00
jianglong0156 e3f09d03b1 Merge branch 'v3' into fixJstestsReleaseError 2015-08-10 16:01:27 +08:00
Huabing.Xu b7c624805e fix material parsing crash on WP8.1 because memory exhausted 2015-08-10 15:51:26 +08:00