andyque
9a83ed9b28
remove unneeded protocol in AppController.h.
2015-08-12 13:55:36 +08:00
jianglong0156
fc5e2233e9
textfield not create, don't need open ime.
2015-08-12 11:22:36 +08:00
ZhangMenghe
fc7dc66c05
Change to non-background
2015-08-12 10:09:11 +08:00
ZhangMenghe
417652cbbd
Fix camera orbit testcase
2015-08-11 15:13:11 +08:00
ZhangMenghe
abb5aff9ed
Add testcase to issue3053
2015-08-11 14:06:00 +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
jianglong0156
32223348cb
fix vigrate resource error, and hide the vibrateTest in web
2015-08-10 17:27:28 +08:00
jianglong0156
e3f09d03b1
Merge branch 'v3' into fixJstestsReleaseError
2015-08-10 16:01:27 +08:00
jianglong0156
9a46b3b3b1
fix js-tests can't use cocos run -p web -m release
2015-08-10 15:10:54 +08:00
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
子龙山人
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
7f215e97ff
Merge pull request #13275 from jianglong0156/fixWebinitError
...
[ci skip]fix error tips in web
2015-08-07 20:26:39 +08:00
jianglong0156
99a52a34cb
fix error tips in web
2015-08-07 18:29:45 +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
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
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
VisualSj
ca82f41c1b
Add loader tests
2015-08-06 19:03:26 +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
jianglong0156
482b8f3583
fix the close button function in main list frame
2015-08-06 14:14:52 +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
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
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
VisualSj
479676cbd8
[js-tests] add Change skin tests
2015-08-03 18:10:31 +08:00
pandamicro
80a207ae43
Merge pull request #13172 from jianglong0156/addEmotionTest
...
add emotion bug test current nothing will show
2015-08-03 16:36:47 +08:00
jianglong0156
f9b6d6b670
add emotion bug test
2015-08-03 16:09:45 +08:00
pandamicro
9393daaf8f
Add test for PhysicsSprite bug#11618
2015-08-03 11:07:27 +08:00
pandamicro
3c2e66e425
Merge branch 'v3.7.1' of https://github.com/cocos2d/cocos2d-x into v3
...
# Conflicts:
# .travis.yml
# build/cocos2d_js_tests.xcodeproj/project.pbxproj
# build/cocos2d_tests.xcodeproj/project.pbxproj
# cocos/2d/CCFont.h
# cocos/2d/CCFontAtlas.cpp
# cocos/2d/CCFontAtlas.h
# cocos/2d/CCFontFreeType.cpp
# cocos/2d/CCFontFreeType.h
# cocos/2d/libcocos2d_8_1/libcocos2d_8_1/libcocos2d_8_1.Windows/libcocos2d_8_1.Windows.vcxproj
# cocos/2d/libcocos2d_8_1/libcocos2d_8_1/libcocos2d_8_1.WindowsPhone/libcocos2d_8_1.WindowsPhone.vcxproj
# cocos/2d/libcocos2d_win10/libcocos2d.vcxproj
# cocos/cocos2d.cpp
# cocos/platform/android/jni/Java_org_cocos2dx_lib_Cocos2dxHelper.cpp
# cocos/scripting/js-bindings/auto/jsb_cocos2dx_studio_auto.cpp
# templates/cpp-template-default/proj.ios_mac/HelloCpp.xcodeproj/project.pbxproj
# templates/js-template-default/frameworks/runtime-src/proj.ios_mac/HelloJavascript.xcodeproj/project.pbxproj
# templates/js-template-runtime/frameworks/runtime-src/proj.ios_mac/HelloJavascript.xcodeproj/project.pbxproj
# templates/lua-template-default/frameworks/runtime-src/proj.ios_mac/HelloLua.xcodeproj/project.pbxproj
# tests/cpp-tests/Classes/LabelTest/LabelTestNew.cpp
# tests/cpp-tests/Classes/LabelTest/LabelTestNew.h
# tools/bindings-generator
# tools/simulator/frameworks/runtime-src/proj.ios_mac/simulator.xcodeproj/project.pbxproj
# tools/travis-scripts/generate-bindings.sh
# tools/travis-scripts/generate-cocosfiles.sh
# tools/travis-scripts/travis_mac.yml
2015-08-02 22:28:27 +08:00
jianglong0156
69040ef472
add Physics3DHingeConstraint support constructor
...
add Physics3DSliderConstraint support constructor
add Physics3DConeTwistConstraint support constructor
add Physics3D6DofConstraint support constructor
add PhysicsSprite3D support constructor
2015-08-01 16:18:00 +08:00
jianglong0156
bcec599993
Merge branch 'v3' into constructedWith3D_3#12404
2015-08-01 15:38:26 +08:00
pandamicro
d52a5da1d8
Merge pull request #13114 from jianglong0156/constructedWith3D_2#12404
...
Constructed with3d
2015-08-01 10:09:08 +08:00
pandamicro
93c40d01c5
Merge pull request #13144 from WenhaiLin/v3.8-gradle-update
...
[Android Studio Projects]Update Gradle from 2.2.1 to 2.4
2015-08-01 09:59:54 +08:00
WenhaiLin
875d01573a
[Android Studio Projects]Update Gradle from 2.2.1 to 2.4
2015-07-31 21:20:42 +08:00
jianglong0156
80e812e5a0
add Physics3DShape support constructor
2015-07-31 18:17:35 +08:00
VisualSj
04b05776a6
[JS-TESTS] Div should be black
2015-07-31 17:16:57 +08:00
pandamicro
3fa016a280
Fix win32 project and add winrt support
2015-07-30 23:39:52 +08:00
jianglong0156
113233b8df
add Camera support constructor
2015-07-30 18:00:51 +08:00
jianglong0156
b016b642ce
add Terrain support constructor
2015-07-30 17:17:57 +08:00
pandamicro
8d8c7fe14b
Complete AudioEngineTest
2015-07-30 17:14:08 +08:00
jianglong0156
0f9483a0e3
add SpotLight support constructor
2015-07-30 15:21:35 +08:00
jianglong0156
8d3ceb7ac2
add PointLight support constructor
2015-07-30 15:11:37 +08:00
pandamicro
f53ba42b3b
Fix test issues and Add audio engine to js templates
2015-07-29 21:22:44 +08:00
pandamicro
9972bfb98c
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into audioengine
...
# Conflicts:
# tests/js-tests/src/NativeTest/NativeTest.js
2015-07-29 21:01:56 +08:00
pandamicro
347854e8d3
Add Audio Control test case
2015-07-29 20:48:11 +08:00
zhangbin
e30d84bca0
Solve the error in .cocos-project.json of js-tests.
2015-07-29 17:10:19 +08:00
pandamicro
36b7ba5b75
Merge pull request #13081 from natural-law/v3
...
Remove unused config in android project of js-tests.
2015-07-29 17:00:26 +08:00
pandamicro
16b03f0ebe
Merge pull request #13065 from pandamicro/widget_onEnter
...
Ensure C++ classes onEnter, onExit can be safely override in JS
2015-07-29 15:36:12 +08:00
zhangbin
6fe880bee5
Remove unused config in android project of js-tests.
2015-07-29 15:35:59 +08:00
pandamicro
cc63ff5c03
Fix indent
2015-07-28 18:37:57 +08:00
pandamicro
6c16a4b990
Add test cases for extended classes in JSB
2015-07-28 18:25:11 +08:00
jianglong0156
d5a6522a37
Merge branch 'v3' into constructedWith3D#12404
2015-07-28 09:59:35 +08:00
pandamicro
b9968a9dca
Merge pull request #13038 from ZhangMenghe/shaderTestCase
...
Fix OpenGL testcase 'center' uniform error
2015-07-28 09:34:09 +08:00
jianglong0156
cb2b427eed
add Physics3DRigidBodyDes support new , add new file jsb_cocos2dx_3d_conversions.h and jsb_cocos2dx_3d_conversions.cpp
2015-07-27 18:19:10 +08:00
jianglong0156
9c6b5730d0
add Physics3DPointToPointConstraint support new
2015-07-27 16:02:13 +08:00
Zhang Menghe
a96ea2342a
Update OpenGLTest.js
2015-07-27 15:53:48 +08:00
ZhangMenghe
232f738bf7
Fix OpenGL testcase 'center' uniform error
2015-07-27 15:08:07 +08:00
jianglong0156
1be5981d6a
add Physics3DComponent support new
2015-07-27 14:26:50 +08:00
jianglong0156
d51f0b1f05
add animate support new
2015-07-27 10:51:53 +08:00
jianglong0156
e25c4f88ae
add animation3d support new to create
2015-07-27 10:31:35 +08:00
pandamicro
c16cab7e53
Merge pull request #13015 from VisualSJ/v3.7.1-12940
...
[ci skip] Moveing ActionTimeline tests
2015-07-25 14:44:10 +08:00
VisualSj
a0bf2c782f
Moveing ActionTimeline tests
2015-07-25 14:37:56 +08:00
VisualSj
c49053fce4
Moveing ActionTimeline tests
2015-07-25 14:37:44 +08:00
pandamicro
9615545e11
Merge pull request #12890 from jianglong0156/FileUtilsJSB
...
[ci skip]add fileUtils writeString,writeValueMap,writeValueVector in jsb
2015-07-25 14:16:14 +08:00
jianglong0156
c14ca98203
set file name to label.change the file dir
2015-07-25 14:04:41 +08:00
pandamicro
fa46a0abb4
Merge pull request #12992 from yangws/v3.7.1
...
Fixed #12962 : Scene can't have std::vector member.
2015-07-25 09:52:00 +08:00
VisualSj
09550ff742
Issue #12997 : Add JS test case (ccs.BoneNode)
2015-07-24 15:57:36 +08:00
VisualSj
64d247d91b
Issue #12997 : Add JS test case (ccs.BoneNode)
2015-07-24 15:45:19 +08:00
Vincent Yang
e4a8aeee45
Fixed #12962 : Scene can't have std::vector member.
2015-07-24 11:16:45 +08:00
pandamicro
5f57fa942f
Merge pull request #12802 from ZhangMenghe/pageTurnDown
...
Page turn down
2015-07-23 18:10:53 +08:00
pandamicro
6029ca3edd
Merge pull request #12949 from yangws/issue_12906
...
Fixed #12906 : Can't add custom member to cocos2d::Scene subclass.
2015-07-22 16:17:14 +08:00
Vincent Yang
3addf38134
Fixed #12906 : Can't add custom member to cocos2d::Scene subclass.
2015-07-22 12:01:34 +08:00
ZhangMenghe
b6c566d87e
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into setClearColor
2015-07-22 11:40:30 +08:00
pandamicro
f0962669a9
Merge pull request #12946 from pandamicro/v3
...
[ci skip] Gen bindings for v3.7.1 branch
2015-07-22 10:45:23 +08:00
pandamicro
c260783fd0
[JS] Revert const to var to avoid issues on web compilation
2015-07-21 18:23:57 +08:00
ZhangMenghe
2e72179b91
Remove a space
2015-07-21 15:22:03 +08:00
ZhangMenghe
94aa382669
Add testCase for setClearColor
2015-07-21 15:18:19 +08:00
ZhangMenghe
61e36463cc
Modify a space
2015-07-21 14:00:59 +08:00
ZhangMenghe
3c2d68e25c
Modify the testcase with coding standards
2015-07-21 13:48:08 +08:00
pandamicro
d478c5f8a8
Merge pull request #12923 from ZhangMenghe/ModifytestCase
...
Modify testCase for UITextFieldTest
2015-07-21 12:53:26 +08:00
ZhangMenghe
14c1862f7e
Modify testCase for UITextFieldTest
2015-07-20 18:01:41 +08:00
jianglong0156
7f0167785d
add back label
2015-07-17 13:46:00 +08:00
jianglong0156
c844a77786
add fileUtils writeString,writeValueMap,writeValueVector
2015-07-17 12:04:47 +08:00
pandamicro
436564f922
Merge branch 'v3.7-release' of https://github.com/cocos2d/cocos2d-x into v3
...
Conflicts:
docs/RELEASE_NOTES.md
web
2015-07-15 14:39:40 +08:00
pandamicro
efffea5b91
Fixed #12834 Invoke cleanup function when override in JS
2015-07-14 15:35:29 +08:00
ZhangMenghe
aca7914d86
Modify testcase for page Turndown
2015-07-13 13:44:58 +08:00
ZhangMenghe
3396da508f
pageTurnDown in WebGL testCase
2015-07-13 12:45:07 +08:00
jianglong0156
9e9625feca
add bool parm in android
2015-07-01 10:57:43 +08:00
jianglong0156
2ef2016c39
add call reflection with bool test case
2015-07-01 10:41:24 +08:00
子龙山人
29cccf631e
Merge pull request #12550 from kompjoefriek/v3-vibrate
...
Vibrate support in v3
2015-06-30 10:28:59 +08:00
pandamicro
08bdf84183
Merge pull request #12584 from jianglong0156/tilemapTestCaseConflict
...
resolve the conflict that the 3d testcase show error after click the the titlemap testcase
2015-06-29 17:07:13 +08:00
jianglong0156
fd54b9941d
resolve the titlemap testcase conflict with the 3d testcase.
2015-06-29 16:34:54 +08:00