pandamicro
940b53e271
Merge pull request #13292 from natural-law/v3
...
[ci skip] Add copy resources config of js-tests for web platform.
2015-08-10 15:09:33 +08:00
zhangbin
f91908d651
Add copy resources config of js-tests for web platform.
2015-08-10 12:00:53 +08:00
pandamicro
acc5754f5e
Merge pull request #13269 from WenhaiLin/v3.8-audioengine-addtestcase
...
Add test case for issue 11143.
2015-08-10 11:39:53 +08:00
子龙山人
f6569f24f4
Merge pull request #13273 from zilongshanren/android-editbox-reimplement-fix
...
Re-implement Editbox on Android platform.
2015-08-09 10:25:19 +08:00
pandamicro
e825160750
Merge pull request #13266 from super626/fixtest
...
Fix Sprite3D test background to foreground bug
2015-08-08 19:44:41 +08:00
pandamicro
395b6cb91f
Merge pull request #13263 from super626/v3
...
avoid to trigger touch event multiple times
2015-08-08 17:58:41 +08:00
pandamicro
6644b06643
Merge pull request #13271 from WenhaiLin/v3.8-minorproblem-fix
...
Fixed minor problems in test cases.
2015-08-08 12:04:30 +08:00
肖峰
4575587cf7
Fix cocostudio 3d test crash on mobile platform
2015-08-08 11:57:40 +08:00
WenhaiLin
772dab2002
Fixed minor problems in test cases.
2015-08-07 23:08:49 +08:00
pandamicro
7f215e97ff
Merge pull request #13275 from jianglong0156/fixWebinitError
...
[ci skip]fix error tips in web
2015-08-07 20:26:39 +08:00
pandamicro
4fe7c6de2a
Revert "remove unused code"
2015-08-07 20:21:24 +08:00
pandamicro
5293dcb5bb
Merge pull request #13274 from super626/animate3d
...
remove unused code
2015-08-07 20:05:14 +08:00
jianglong0156
99a52a34cb
fix error tips in web
2015-08-07 18:29:45 +08:00
yangxiao
d74245bfa9
remove unused code
2015-08-07 18:03:50 +08:00
andyque
a35e89225e
Re-implement Editbox on Android platform.
...
This PR also fixed issue:
https://github.com/cocos2d/cocos2d-x/issues/9572
For the new EditBox:
1. Added a ResizeLayout for updating layout when soft keyboard is shown.
This is because some Android devices won't refresh the view and when
the view is panned, the native EditText will turn black. This is really
a hack, but it works for many Android devices from 2.3 to 5.0.
When keyboard is beginning to show, the ResizeLayout's doLayout
method will be called 24 frames per second. Once the keyboard is closed,
or the user begins to input, the doLayout method will be disabled.
2. EditText is working in a different UI thread, so all the data
are passed to GL thread via callbacks in UI thead.
3. It also overrides onKeyDown method in Cocos2dxEditBox.
When the EditText got the focus, users could press back key to exit
the game. This behavior is not allowed. We give developer the choice to
handle back key event manually.
2015-08-07 17:27:15 +08:00
WenhaiLin
5c33f2f6ed
Add test case for issue 11143.
2015-08-07 16:50:54 +08:00
yangxiao
544c96385a
fix background to foreground
2015-08-07 16:16:43 +08:00
yangxiao
d744554a4b
avoid to trigger touch event multiple times
2015-08-07 15:09:01 +08:00
pandamicro
c794523613
Merge pull request #13260 from ZhangMenghe/v3-tileMap
...
TileMap Testcase abnormal
2015-08-07 11:52:28 +08:00
ZhangMenghe
7753a07359
TileMap Testcase abnormal
2015-08-07 11:20:17 +08:00
子龙山人
782c9588a4
Merge pull request #13253 from zilongshanren/fix-touch-intercept-issue
...
Fix improper touch intercept event propagation.
2015-08-07 10:28:51 +08:00
pandamicro
d182c37f29
Merge pull request #13257 from ZhangMenghe/v3-UItestcase
...
UIScene testcase modification
2015-08-07 09:47:42 +08:00
ZhangMenghe
0ddd4e4a5b
UIScene testcase modification
2015-08-07 09:30:22 +08:00
andyque
211dde38e9
Fix improper touch intercept event propagation.
...
When the container widget is disabled, it shouldn't intercept touch.
https://github.com/cocos2d/cocos2d-x/issues/8316
2015-08-06 22:50:53 +08:00
pandamicro
7a758bb961
Merge pull request #13243 from jianglong0156/fixExitButton
...
[ci skip]fix the close button function in main list frame
2015-08-06 17:33:47 +08:00
pandamicro
ad4c349800
Merge pull request #13245 from ZhangMenghe/v3-1586bugfix
...
Fix offset on retina screen in shaderTest
2015-08-06 17:27:47 +08:00
ZhangMenghe
91ae9e07b6
Fix offset on retina screen in shaderTest
2015-08-06 15:14:13 +08:00
子龙山人
a0a34deb78
Merge pull request #13242 from WenhaiLin/v3.8-cpptests-freeze
...
CppTests: Avoid freeze when the program crashed on Android.
2015-08-06 15:03:30 +08:00
jianglong0156
482b8f3583
fix the close button function in main list frame
2015-08-06 14:14:52 +08:00
WenhaiLin
ffda8ace82
CppTests: Avoid freeze when the program crashed on Android.
2015-08-06 13:50:15 +08:00
子龙山人
41afa9695c
Merge pull request #13230 from WenhaiLin/v3.8-label-space-lost
...
Spaces should not be lost if label created with Fingerpop.ttf
2015-08-06 11:01:35 +08:00
WenhaiLin
e81d5af12d
Spaces should not be lost if label created with Fingerpop.ttf
2015-08-05 23:46:41 +08:00
pandamicro
6831e24deb
Merge pull request #13198 from ZhangMenghe/v3-UItestcase
...
[ci skip]Modify UItestcase structure
2015-08-05 19:06:11 +08:00
子龙山人
05e88ad279
Merge pull request #13211 from fusijie/v3
...
[ci skip]fixed title.
2015-08-05 16:59:37 +08:00
子龙山人
5aaf9aa1ef
Merge pull request #13210 from WenhaiLin/v3.8-FontAtlasCache-crash-fix
...
Fixed FontAtlasCache::purgeCachedData might cause crash.
2015-08-05 16:57:57 +08:00
pandamicro
5faf7a9d76
Merge pull request #13209 from ZhangMenghe/v3-textfield
...
[ci skip]textField cc.vertext to cc.p
2015-08-05 15:48:16 +08:00
fusijie
6072cf9a9d
[ci skip]fixed title.
2015-08-05 15:47:59 +08:00
WenhaiLin
2c220092e6
Fixed FontAtlasCache::purgeCachedData might cause crash.
2015-08-05 14:12:02 +08:00
ZhangMenghe
88cb3ab711
textField cc.vertext to cc.p
2015-08-05 11:59:36 +08:00
pandamicro
8cdcade07a
Merge pull request #13186 from jianglong0156/addEmotionTest
...
fix getStringUTFChars bug
2015-08-05 10:19:19 +08:00
ZhangMenghe
f01f21d06f
Modify UItestcase structure
2015-08-04 17:13:17 +08:00
jianglong0156
ee7e7d237f
improve the test case
2015-08-04 11:40:10 +08:00
jianglong0156
36e8e9740a
improve the test case
2015-08-04 11:30:55 +08:00
pandamicro
8d836dade6
Merge pull request #13181 from pandamicro/v3
...
Sync Cocos2d-x v3.7.1
2015-08-03 22:12:05 +08:00
pandamicro
25cb0d2896
Merge branch 'v3.7.1' of https://github.com/cocos2d/cocos2d-x into v3
...
# Conflicts:
# web
2015-08-03 19:47:56 +08:00
pandamicro
6d3a00ad67
Merge pull request #13173 from geron-cn/3.7.1
...
fix bug: crash when use bone after erase it form Vector.
2015-08-03 19:45:54 +08:00
pandamicro
6a2440d6f1
Merge pull request #13176 from VisualSJ/v3-boneTest
...
[ci skip][js-tests] add Change skin tests
2015-08-03 18:13:08 +08:00
VisualSj
479676cbd8
[js-tests] add Change skin tests
2015-08-03 18:10:31 +08:00
pandamicro
4b7b85f113
Merge pull request #12889 from fusijie/fix_clippingRectangle_bug
...
remove CCClippingRectangleNode transform error support.
2015-08-03 18:01:01 +08:00
geron-cn
d00e54ad8a
remove comment in test case
2015-08-03 16:55:55 +08:00