5f8351ea32
UItestcase modification to be friendly
2015-09-14 15:31:25 +08:00
edb964a673
Remove the performance related config in project.json.
2015-09-11 16:03:07 +08:00
8e9928ad99
Remove performance tests from lua-tests & js-tests.
2015-09-11 10:53:17 +08:00
941cd3c9de
Merge pull request #13717 from jianglong0156/assetsmanagerContinue
...
fix the AssetsManagerEx can not continuous transmission
2015-09-10 11:34:03 +08:00
4509a316cc
add uniform conversion
...
relate issue:https://github.com/cocos2d/cocos2d-x/issues/13747
relate pr:https://github.com/cocos2d/bindings-generator/pull/191
2015-09-09 16:03:57 +08:00
747fab26a8
Merge pull request #13735 from jianglong0156/actionExtendReverse
...
[ci skip]add action reverse issue test case
2015-09-09 11:12:47 +08:00
ac1af6cd91
add action reverse issue test case
2015-09-09 11:09:40 +08:00
dc607a1784
Merge pull request #13726 from jianglong0156/actionExtendSquash
...
support custom action, and rewrite update function
2015-09-09 10:25:56 +08:00
badd80bf3a
support custom action, and rewrite update function
...
support custom action in js, and developer can rewrite the update function in custom action class.
useage:
// custom action sample code
var customMoveBy = cc.MoveBy.extend({
ctor:function (duration, deltaPos, deltaY) {
this._super(duration, deltaPos, deltaY);
},
update:function (dt) {
this._super(dt);
if (this.getTarget()) { // rand color
this.getTarget().setColor(cc.color(cc.rand()%255, cc.rand()%255, cc.rand()%255));
}
}
});
2015-09-09 10:08:07 +08:00
8daf026c6c
fix the AssetsManagerEx can not continuous transmission for large zip file.
...
the testcase is extension/assetsmanager
2015-09-08 16:34:02 +08:00
f3190206e0
Remove clickAndMove testcase
2015-09-01 14:21:08 +08:00
a3b5becb45
Sync v3.8 to v3
2015-08-31 22:05:37 +08:00
9d72d6a924
Merge pull request #13496 from ZhangMenghe/v3-notification
...
[ci rebuild] Notification effect enhancement
2015-08-28 14:10:42 +08:00
2d77609fb7
Update socket@1.3.6 and web index
2015-08-28 11:48:58 +08:00
1bcc2dec37
Notification effect enhancement
2015-08-21 10:20:59 +08:00
d55bc653e0
update c++ debug info settings
2015-08-20 13:25:17 -07:00
08fcf7e35b
Merge pull request #13463 from ZhangMenghe/v3.8-materialSys
...
[ci skip] Delete blur shader in js-resj
2015-08-19 13:49:31 +08:00
e9bd14e1d7
Delete blur shader in js-resj
2015-08-19 13:41:45 +08:00
31bc04a301
Merge pull request #13455 from MSOpenTech/v3-win10
...
Windows 10 UWP and WP8.1 app certification fixes
2015-08-19 13:36:29 +08:00
47b72ba30e
Merge branch 'v3' into v3-win10
2015-08-18 11:07:38 -07:00
8493365be7
updates to pass Windows App Certification tests
2015-08-18 11:06:47 -07:00
5cdfdf8497
[ci skip][Android Studio Projects]Update Gradle Plugin from 1.2.3 to 1.3.0
2015-08-18 22:37:00 +08:00
9fbc45171e
Fix shader position abnormal
2015-08-18 17:07:08 +08:00
22c8163bc8
[js-tests][PageView] Button position error
2015-08-18 16:12:32 +08:00
40581c1c25
Merge pull request #13422 from VisualSJ/v3-pb-21865
...
[ci skip] Change ActionManager test name
2015-08-17 21:47:20 +08:00
be93b6bf2e
Change ActionManager test name
2015-08-17 20:35:38 +08:00
eaa5643c7c
Fix invisiable testcase of effects
2015-08-17 17:26:25 +08:00
3f160ddbb1
Merge pull request #13382 from ZhangMenghe/v3-physics3d
...
[ci skip] Avoid to trigger touch event multiple times
2015-08-17 11:21:51 +08:00
c0eea61109
Merge pull request #13375 from ZhangMenghe/v3-effectAdvance
...
[ci skip] Fix abnormal effects in effectsTest
2015-08-17 11:18:27 +08:00
1700230213
Merge pull request #13379 from ZhangMenghe/v3-rtexture
...
[ci skip] Modify renderTexture stencilDepth test
2015-08-17 10:20:22 +08:00
6d7c05f0b7
Merge pull request #13356 from VisualSJ/v3-updateIndex
...
[ci skip] Update js-test
2015-08-17 10:18:59 +08:00
06864479f3
Avoid to trigger touch event multiple times
2015-08-14 18:34:46 +08:00
61ef51849c
Modify renderTexture stencilDepth test
2015-08-14 17:53:48 +08:00
a4a26ccdbe
Merge pull request #13357 from ZhangMenghe/v3-effectsTestcase
...
[ci skip] Modify effects testcases
2015-08-14 17:02:02 +08:00
45f6c16d72
Fix abnormal effects in effectsTest
2015-08-14 15:58:31 +08:00
d13f4df356
Merge pull request #13372 from fusijie/fix_tiledmap_vertexZ
...
[ci skip]Fixed JS-Tests TiledMap VertexZ bug.
2015-08-14 15:31:11 +08:00
77ef03d696
Fixed JS-Tests TiledMap VertexZ bug.
2015-08-14 15:13:08 +08:00
dfabf8a5a0
Merge pull request #13347 from ZhangMenghe/v3-rtexture
...
[ci skip] Rewrite testcase for stencil depth mask
2015-08-14 12:23:11 +08:00
f9397f39f5
[js-tests] Update Particle test
2015-08-13 15:18:42 +08:00
4f49993fef
Modify effects testcases
2015-08-13 15:15:04 +08:00
d2cf4bfc79
Squashed commit of the following:
...
commit 2c810a8e931e07b06498c07db37cbf20a2bcfc92
Merge: 61788a0 082caaf5e21580#6 from minggo/downloader_decouple
fix js binding error
commit 8d7388302ff1d8da575b277e47a3f8ceb1017e98
Author: minggo <ming@cocos2d-x.org>
Date: Thu Aug 13 11:09:58 2015 +0800
fix js binding error
commit 2ea66af7684f5ec8a20067b1a49347920dbbbb40
Merge: 8cdb0b6 bc964e8#5 from minggo/downloader_decouple
fix lua-binding error
commit 08eeca9d99b5160c48bac1bfecf03b459d05ed15
Author: minggo <ming@cocos2d-x.org>
Date: Wed Aug 12 10:34:05 2015 +0800
fix lua-binding error
commit 927276589d57432477f8ffc033e19a21a215b246
Merge: 8252464 6f4ed8a#4 from minggo/downloader_decouple
fix linking error in lua-tests on Android
commit 138df42a3acfdcfae29eeab1b03ef5dd062f0145
Author: minggo <ming@cocos2d-x.org>
Date: Tue Aug 11 16:23:53 2015 +0800
fix link error in lua-tests
commit 5dddbb61a1bcda96aa93bfcbe78f42c639eb6247
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri Aug 7 23:22:50 2015 -0700
works for real on win32
commit ddadaf82231b60c8e343718561c0d78657afe7c2
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri Aug 7 22:26:59 2015 -0700
compiles on win32
commit 733f1d4c2e4f8382ff19f1793f7f09950774fe78
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri Aug 7 21:57:49 2015 -0700
compiles on iOS!!
commit f706f97962eb393bf7dfec79739ff8dfdec103d5
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri Aug 7 21:27:03 2015 -0700
compiles and runs Ok on windows.
Tested all downloadertests + assetmanagertest
commit 5e333f4407952d9c2e71e18cb9393d8b6cd170b4
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri Aug 7 20:24:28 2015 -0700
updates windows projects
commit e77fd8a278594fefc24ff13cbee038508429294d
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri Aug 7 19:56:10 2015 -0700
compiles on Android
commit 5f515e3519a0688d11476ea6ef235007e8378c96
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri Aug 7 18:34:33 2015 -0700
trying to fix a compile issue on iOS
WIP
commit b144ea67dfe7a06e7bfb515adf16f536ba2ead98
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri Aug 7 18:25:11 2015 -0700
make bug fixes
adds public `getHeader`
commit a228799ba74eb8642c43d215a802f811a576a4aa
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri Aug 7 17:42:19 2015 -0700
some linux fixes
commit 2cab23d87acc138823ebe9dcec9d42f827690d99
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri Aug 7 16:58:53 2015 -0700
Squashed commit of the following:
commit 86227e9138c1fb523bd28186d355de65cc64c588
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri Aug 7 16:55:17 2015 -0700
works %100
and uses less memory than before
commit a9cafa6f2fe7847e279934d2c162287680760dda
Merge: 0bbc62e 0cbd71f7f215e90d778386831e24a06421b8d836daf744383253d9c4642ccac
2015-08-13 00:14:10 -07:00
5e21580cdd
Merge pull request #13345 from VisualSJ/v3-updateIndex
...
[ci skip] update js-tests
2015-08-13 11:18:19 +08:00
dd7e00403f
[js-tests] that is undefined - script test
2015-08-13 10:56:41 +08:00
7ffde1cdf8
Rewrite testcase for stencil depth mask
2015-08-13 10:45:45 +08:00
a4a1a62886
Merge pull request #13328 from zilongshanren/fix-ios-Appcontroller
...
remove unneeded protocol in AppController.h.
2015-08-13 10:35:00 +08:00
1458e06492
[js-tests] Optimization Cocosbuilder test
2015-08-13 10:03:10 +08:00
38b1da2c06
Merge pull request #13315 from ZhangMenghe/v3-touchInter
...
[ci skip]Add testcase to issue3053
2015-08-12 18:20:23 +08:00
986cce2872
Merge pull request #13316 from ZhangMenghe/v3-cameraOrbit
...
[ci skip] Fix camera orbit testcase
2015-08-12 18:19:09 +08:00
82f597ce98
Merge branch 'v3.7.1' into v3
...
# Conflicts:
# cocos/scripting/lua-bindings/auto/api/CheckBox.lua
# cocos/ui/UICheckBox.cpp
# cocos/ui/UICheckBox.h
2015-08-12 17:59:50 +08:00
bed3640e6c
fixed retro pos.
2015-08-12 15:09:33 +08:00
58b8da9ccb
Merge pull request #13293 from jianglong0156/fixJstestsReleaseError
...
fix js-tests can't use cocos run -p web -m release
2015-08-12 14:24:15 +08:00
9a83ed9b28
remove unneeded protocol in AppController.h.
2015-08-12 13:55:36 +08:00
fc5e2233e9
textfield not create, don't need open ime.
2015-08-12 11:22:36 +08:00
fc7dc66c05
Change to non-background
2015-08-12 10:09:11 +08:00
417652cbbd
Fix camera orbit testcase
2015-08-11 15:13:11 +08:00
abb5aff9ed
Add testcase to issue3053
2015-08-11 14:06:00 +08:00
89949248de
sort the testcase by title.
2015-08-11 11:22:01 +08:00
8a8515e998
fix the menu label size error
2015-08-11 11:21:19 +08:00
32223348cb
fix vigrate resource error, and hide the vibrateTest in web
2015-08-10 17:27:28 +08:00
e3f09d03b1
Merge branch 'v3' into fixJstestsReleaseError
2015-08-10 16:01:27 +08:00
9a46b3b3b1
fix js-tests can't use cocos run -p web -m release
2015-08-10 15:10:54 +08:00
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
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
7f215e97ff
Merge pull request #13275 from jianglong0156/fixWebinitError
...
[ci skip]fix error tips in web
2015-08-07 20:26:39 +08:00
99a52a34cb
fix error tips in web
2015-08-07 18:29:45 +08:00
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
c794523613
Merge pull request #13260 from ZhangMenghe/v3-tileMap
...
TileMap Testcase abnormal
2015-08-07 11:52:28 +08:00
7753a07359
TileMap Testcase abnormal
2015-08-07 11:20:17 +08:00
d182c37f29
Merge pull request #13257 from ZhangMenghe/v3-UItestcase
...
UIScene testcase modification
2015-08-07 09:47:42 +08:00
0ddd4e4a5b
UIScene testcase modification
2015-08-07 09:30:22 +08:00
ca82f41c1b
Add loader tests
2015-08-06 19:03:26 +08:00
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
ad4c349800
Merge pull request #13245 from ZhangMenghe/v3-1586bugfix
...
Fix offset on retina screen in shaderTest
2015-08-06 17:27:47 +08:00
91ae9e07b6
Fix offset on retina screen in shaderTest
2015-08-06 15:14:13 +08:00
482b8f3583
fix the close button function in main list frame
2015-08-06 14:14:52 +08:00
6831e24deb
Merge pull request #13198 from ZhangMenghe/v3-UItestcase
...
[ci skip]Modify UItestcase structure
2015-08-05 19:06:11 +08:00
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
88cb3ab711
textField cc.vertext to cc.p
2015-08-05 11:59:36 +08:00
8cdcade07a
Merge pull request #13186 from jianglong0156/addEmotionTest
...
fix getStringUTFChars bug
2015-08-05 10:19:19 +08:00
f01f21d06f
Modify UItestcase structure
2015-08-04 17:13:17 +08:00
ee7e7d237f
improve the test case
2015-08-04 11:40:10 +08:00
36e8e9740a
improve the test case
2015-08-04 11:30:55 +08:00
479676cbd8
[js-tests] add Change skin tests
2015-08-03 18:10:31 +08:00
80a207ae43
Merge pull request #13172 from jianglong0156/addEmotionTest
...
add emotion bug test current nothing will show
2015-08-03 16:36:47 +08:00
f9b6d6b670
add emotion bug test
2015-08-03 16:09:45 +08:00
9393daaf8f
Add test for PhysicsSprite bug#11618
2015-08-03 11:07:27 +08:00
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
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
bcec599993
Merge branch 'v3' into constructedWith3D_3#12404
2015-08-01 15:38:26 +08:00
d52a5da1d8
Merge pull request #13114 from jianglong0156/constructedWith3D_2#12404
...
Constructed with3d
2015-08-01 10:09:08 +08:00
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
875d01573a
[Android Studio Projects]Update Gradle from 2.2.1 to 2.4
2015-07-31 21:20:42 +08:00
80e812e5a0
add Physics3DShape support constructor
2015-07-31 18:17:35 +08:00
04b05776a6
[JS-TESTS] Div should be black
2015-07-31 17:16:57 +08:00
3fa016a280
Fix win32 project and add winrt support
2015-07-30 23:39:52 +08:00
113233b8df
add Camera support constructor
2015-07-30 18:00:51 +08:00
b016b642ce
add Terrain support constructor
2015-07-30 17:17:57 +08:00
8d8c7fe14b
Complete AudioEngineTest
2015-07-30 17:14:08 +08:00
0f9483a0e3
add SpotLight support constructor
2015-07-30 15:21:35 +08:00
8d3ceb7ac2
add PointLight support constructor
2015-07-30 15:11:37 +08:00
f53ba42b3b
Fix test issues and Add audio engine to js templates
2015-07-29 21:22:44 +08:00
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
347854e8d3
Add Audio Control test case
2015-07-29 20:48:11 +08:00
e30d84bca0
Solve the error in .cocos-project.json of js-tests.
2015-07-29 17:10:19 +08:00
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
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
6fe880bee5
Remove unused config in android project of js-tests.
2015-07-29 15:35:59 +08:00
cc63ff5c03
Fix indent
2015-07-28 18:37:57 +08:00
6c16a4b990
Add test cases for extended classes in JSB
2015-07-28 18:25:11 +08:00
d5a6522a37
Merge branch 'v3' into constructedWith3D#12404
2015-07-28 09:59:35 +08:00
b9968a9dca
Merge pull request #13038 from ZhangMenghe/shaderTestCase
...
Fix OpenGL testcase 'center' uniform error
2015-07-28 09:34:09 +08:00
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
9c6b5730d0
add Physics3DPointToPointConstraint support new
2015-07-27 16:02:13 +08:00
a96ea2342a
Update OpenGLTest.js
2015-07-27 15:53:48 +08:00
232f738bf7
Fix OpenGL testcase 'center' uniform error
2015-07-27 15:08:07 +08:00
1be5981d6a
add Physics3DComponent support new
2015-07-27 14:26:50 +08:00
d51f0b1f05
add animate support new
2015-07-27 10:51:53 +08:00
e25c4f88ae
add animation3d support new to create
2015-07-27 10:31:35 +08:00
c16cab7e53
Merge pull request #13015 from VisualSJ/v3.7.1-12940
...
[ci skip] Moveing ActionTimeline tests
2015-07-25 14:44:10 +08:00
a0bf2c782f
Moveing ActionTimeline tests
2015-07-25 14:37:56 +08:00
c49053fce4
Moveing ActionTimeline tests
2015-07-25 14:37:44 +08:00
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
c14ca98203
set file name to label.change the file dir
2015-07-25 14:04:41 +08:00
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
09550ff742
Issue #12997 : Add JS test case (ccs.BoneNode)
2015-07-24 15:57:36 +08:00
64d247d91b
Issue #12997 : Add JS test case (ccs.BoneNode)
2015-07-24 15:45:19 +08:00
e4a8aeee45
Fixed #12962 : Scene can't have std::vector member.
2015-07-24 11:16:45 +08:00
5f57fa942f
Merge pull request #12802 from ZhangMenghe/pageTurnDown
...
Page turn down
2015-07-23 18:10:53 +08:00
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
3addf38134
Fixed #12906 : Can't add custom member to cocos2d::Scene subclass.
2015-07-22 12:01:34 +08:00
b6c566d87e
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into setClearColor
2015-07-22 11:40:30 +08:00
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
c260783fd0
[JS] Revert const to var to avoid issues on web compilation
2015-07-21 18:23:57 +08:00
2e72179b91
Remove a space
2015-07-21 15:22:03 +08:00
94aa382669
Add testCase for setClearColor
2015-07-21 15:18:19 +08:00
61e36463cc
Modify a space
2015-07-21 14:00:59 +08:00
3c2d68e25c
Modify the testcase with coding standards
2015-07-21 13:48:08 +08:00
d478c5f8a8
Merge pull request #12923 from ZhangMenghe/ModifytestCase
...
Modify testCase for UITextFieldTest
2015-07-21 12:53:26 +08:00
14c1862f7e
Modify testCase for UITextFieldTest
2015-07-20 18:01:41 +08:00
7f0167785d
add back label
2015-07-17 13:46:00 +08:00
c844a77786
add fileUtils writeString,writeValueMap,writeValueVector
2015-07-17 12:04:47 +08:00
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
efffea5b91
Fixed #12834 Invoke cleanup function when override in JS
2015-07-14 15:35:29 +08:00
aca7914d86
Modify testcase for page Turndown
2015-07-13 13:44:58 +08:00
3396da508f
pageTurnDown in WebGL testCase
2015-07-13 12:45:07 +08:00
9e9625feca
add bool parm in android
2015-07-01 10:57:43 +08:00
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
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
fd54b9941d
resolve the titlemap testcase conflict with the 3d testcase.
2015-06-29 16:34:54 +08:00
ef51fc46ed
add videoplayer state, modify play label
2015-06-26 10:44:43 +08:00
6eca03fdd2
Merged changes from "Vibrate support in v4" into v3 branch.
2015-06-26 01:02:44 +02:00
c9c212d0e1
Solve the error when run tests projects with `cocos run`.
2015-06-24 15:33:13 +08:00
fb852046e1
Merge pull request #12508 from jianglong0156/AccelerometerCrash
...
reduce the accelerometer log num, avoid log too much in vs
2015-06-24 13:45:53 +08:00
9b31e8ed16
reduce the accelerometer log num, avoid log too much in vs
2015-06-24 12:03:16 +08:00
f3eb455669
hide facebook testcase
2015-06-23 22:14:27 +08:00
32accbf21b
Merge pull request #12488 from WenhaiLin/v3-37-androidApplicationFix
...
Fixed Application may be created more than once on Android.
2015-06-23 19:43:39 +08:00
0b26f966b5
Merge pull request #12497 from VisualSJ/v3-aa
...
[ci skip]add info into BlendFunc tests on canvas and tests data problem
2015-06-23 19:43:08 +08:00
5472928aaa
add info into BlendFunc tests on canvas and tests data problem
2015-06-23 18:54:18 +08:00
f95245312a
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3-37alpha0
2015-06-23 17:08:25 +08:00
ce508bab87
Merge pull request #12487 from pandamicro/v3
...
Fix TransitionTest issue that depth test haven't been disabled after transition
2015-06-23 16:59:08 +08:00
cbb073e905
Fixed Application may be created more than once on Android.
2015-06-23 16:58:38 +08:00
cd1233f801
Fix TransitionTest issue that depth test haven't been disabled after transition
2015-06-23 16:58:15 +08:00
b1e24ee8f2
Merge pull request #12455 from natural-law/v3
...
Solve the error when build tests projects with cocos command on win32.
2015-06-22 13:04:17 +08:00
85fe9e8816
Solve the error when build tests projects with cocos command on win32.
2015-06-19 18:32:32 +08:00
ca989e2aed
Fix physics3d js test issue
2015-06-19 10:35:45 +08:00
c6d4f283bb
Fix compilation issue in navmesh conversion
2015-06-19 08:11:45 +08:00
91bc19fb29
Merge branch 'v3_origin' into navmesh
...
Conflicts:
tests/js-tests/src/Physics3DTest/Physics3DTest.js
2015-06-18 23:50:19 +08:00
b757837239
Move NavMesh to jsb namespace
2015-06-18 22:57:41 +08:00
a4ecfdb7e2
Build engine with LOCAL_ARM_MODE=arm when building JS projects for android.
2015-06-18 22:00:57 +08:00
3da67d3358
change the seek to time
2015-06-18 22:00:55 +08:00
a98b493151
Update UIS9NinePatchTest for jsb
2015-06-18 22:00:55 +08:00
cbfa92d3fd
Add a new line.
2015-06-18 22:00:55 +08:00
496ce50ff5
issue #12414:Add UIS9NinePatchTest for js
2015-06-18 22:00:55 +08:00
77c3e9bdde
issue #12414:Add UIS9NinePatchTest for Lua and js
2015-06-18 22:00:54 +08:00
0a526875a8
Fixed a bug that xhr cross-domain error
2015-06-18 22:00:54 +08:00
82c09e8d0c
Fixed a bug that xhr cross-domain error
2015-06-18 22:00:54 +08:00
cd7252014a
Merge pull request #12432 from pandamicro/v3
...
Change physics3d api to jsb namespace
2015-06-18 21:53:39 +08:00
10a8adad53
Change physics3d api to jsb namespace
2015-06-18 20:39:40 +08:00
491d89baec
Merge pull request #12429 from natural-law/v3
...
Build engine with LOCAL_ARM_MODE=arm when building JS projects for android.
2015-06-18 20:28:52 +08:00
4fe1542d17
add navmesh tests
2015-06-18 19:22:27 +08:00
d288b13957
Build engine with LOCAL_ARM_MODE=arm when building JS projects for android.
2015-06-18 17:22:30 +08:00
aa566a3722
Merge pull request #12424 from pandamicro/physics3d
...
Fix Physics3D test and js bindings
2015-06-18 16:09:49 +08:00
85c40b6580
Merge pull request #8 from pandamicro/physics3d
...
Physics3d
2015-06-18 14:54:32 +08:00
811173ea3b
Fix Physics3D test and js bindings
2015-06-18 14:33:16 +08:00
9dc52ba72f
Merge pull request #12403 from VisualSJ/v3-aa
...
[ci skip]Fixed some bug
2015-06-18 12:31:27 +08:00
000be8316b
Merge pull request #12415 from samuele3hu/v3_7_ui
...
[ci skip]issue #12414:Add UIS9NinePatchTest for Lua and js
2015-06-18 12:30:28 +08:00
44c37c676e
change the seek to time
2015-06-18 11:54:25 +08:00
7f21731bb1
Update UIS9NinePatchTest for jsb
2015-06-18 10:08:13 +08:00
31ce264c6a
Add a new line.
2015-06-18 09:44:47 +08:00
8c01d94945
issue #12414:Add UIS9NinePatchTest for js
2015-06-18 09:43:05 +08:00
31aae38fac
issue #12414:Add UIS9NinePatchTest for Lua and js
2015-06-18 09:41:16 +08:00
400b2d7663
Fixed a bug that xhr cross-domain error
2015-06-18 09:23:15 +08:00
3ffc0e6be6
Merge branch 'v3_navigation' of https://github.com/samuele3hu/cocos2d-x into physics3d
2015-06-18 09:20:37 +08:00
3975d44d3b
Chain NavMeshTest
2015-06-18 00:58:03 +08:00
bcf9659408
Merge branch 'v3' into navmesh
2015-06-18 00:36:37 +08:00
5b23e8b381
Fix resource issue
2015-06-18 00:24:01 +08:00
85e8a407b1
Merge branch 'navmesh' of https://github.com/jianglong0156/cocos2d-x into v3
...
# Conflicts:
# tests/js-tests/project/Classes/AppDelegate.cpp
# tools/tojs/genbindings.py
2015-06-17 19:58:24 +08:00
683812d817
Update Physics3D test for js.
2015-06-17 18:50:55 +08:00
b265033a41
add testcase and manual bindings
2015-06-17 18:38:18 +08:00
897b5fd0e9
add navmesh test project file and binding file
2015-06-17 18:37:19 +08:00
010cb23ead
Fixed a bug that xhr cross-domain error
2015-06-17 17:10:31 +08:00
ddc820eb42
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3
2015-06-17 15:33:34 +08:00
fd508a0198
Merge pull request #12381 from VisualSJ/v3-aa
...
[ci skip]Fix some simple bug
2015-06-17 15:11:08 +08:00
0a223adf7c
After exiting should restore settings
2015-06-17 14:43:41 +08:00
dc33a8d66e
Merge pull request #12243 from Wu-Hao/fix_spritepolygon2
...
Fix spritepolygon
2015-06-17 14:40:30 +08:00
fba76b11cd
Fixed path bug
2015-06-17 14:07:07 +08:00
3a076b6508
Merge pull request #12387 from samuele3hu/v3_navigation
...
[ci skip]Update the Physics3DTest for js and Lua by synchronizing the API.
2015-06-17 14:01:21 +08:00
9c550e0a11
Update the Physics3DTest for js and Lua by synchronizing the API.
2015-06-17 13:58:05 +08:00
3c5ab4f518
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into fix_spritepolygon2
...
# Conflicts:
# cocos/2d/libcocos2d_8_1/libcocos2d_8_1/libcocos2d_8_1.Shared/libcocos2d_8_1.Shared.vcxitems.filters
2015-06-17 13:04:24 +08:00
6669f1df5e
Fixed widgetFromJsonFile bug( #20035 )
2015-06-17 11:49:27 +08:00
d855066472
Fixed a bug that control's default resource error #20037
2015-06-17 11:19:06 +08:00
164fb3a058
If json have the back button, then use this button
2015-06-17 11:16:44 +08:00
ab34c1de89
Change the path(UIVideoPlayerTest.js)
2015-06-16 17:30:48 +08:00
d51fd2397c
Fix js test ES6 usage issue
2015-06-16 15:01:52 +08:00
74f4d29fa9
added missing librecast
2015-06-15 20:06:54 -07:00
ccd15b3da7
Merge branch 'fix_spritepolygon2' of https://github.com/Wu-Hao/cocos2d-x into spritepolygon
2015-06-16 00:56:58 +08:00
4f8bd25a83
Add js test cases for sprite polygon
2015-06-16 00:56:08 +08:00
27d0f51e9b
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into fix_spritepolygon
...
Conflicts:
build/cocos2d_libs.xcodeproj/project.pbxproj
build/cocos2d_tests.xcodeproj/project.pbxproj
cocos/2d/libcocos2d.vcxproj.filters
tools/cocos2d-console
web
2015-06-15 16:13:36 +08:00
b4ca8c1489
Merge pull request #15 from pandamicro/spritepolygon
...
Add SpritePolygon JSB bindingsJSB bindings
2015-06-15 15:47:02 +08:00
cd7f39d823
Merge branch 'fix_spritepolygon2' of https://github.com/Wu-Hao/cocos2d-x into spritepolygon
2015-06-15 13:22:38 +08:00
34954c2600
Add PolygonSprite Test1
2015-06-15 13:21:49 +08:00
852b9b42b9
Remove jsb_cocos2dx_experimental_manual
2015-06-15 10:46:57 +08:00
5ff0825468
modify android res copy
2015-06-15 09:55:10 +08:00
393ad49481
add win32 project resource copy
2015-06-15 09:55:05 +08:00
6310f74533
modify resource to res/resjs
2015-06-15 09:54:00 +08:00
f9df298401
modify copy resource to res/resjs
2015-06-15 09:53:53 +08:00
f9057b3f32
Merge pull request #12284 from pandamicro/v3
...
Fix template android compilation issue on physics3d
2015-06-12 21:10:40 +08:00
f3765a4c5f
Fix physics 3d macro include issue
2015-06-12 15:58:43 +08:00
e9d648f151
Fix physics 3d macro include issue
2015-06-12 15:41:46 +08:00
c3aba0392d
Update auto conversion for sprite polygon
2015-06-12 13:00:49 +08:00
1a9056cf14
Merge pull request #12300 from jianglong0156/textFieldShowString
...
[ci skip]add textfield show textString
2015-06-11 19:33:21 +08:00
f97955682a
add pr#2928 test case, load same remote img. can callback the function
2015-06-11 11:11:51 +08:00
96ce3ec22c
add textfield show textString
2015-06-10 16:15:09 +08:00
fa71a6e352
Merge pull request #12204 from jianglong0156/issue1756
...
default support curl gzip. and add the gzip test in xmlhttprequest Issue1756
2015-06-05 13:17:53 +08:00
33beab2d81
add gzip test
2015-06-05 11:40:29 +08:00
ba1191f98f
Merge pull request #12132 from pandamicro/v3_origin
...
cocos2d/cocos2d-js#1658 : Fix js_load_remote_image issue with multithread
2015-06-04 17:51:11 +08:00
808de7b475
removed e option from xcopy
2015-06-03 09:54:43 -07:00
18ce48dc2a
/NODEFAULTLIB:MSVCRT to fix linker warning
2015-06-03 09:26:15 -07:00
6eddf97416
fix the platform judge error
2015-06-02 17:29:36 +08:00
4abaa51e12
webview and videoplayer only play in android, ios and web
2015-06-02 15:06:44 +08:00
c46fea1f7a
Merge branch 'v3' into videoplayer
2015-06-02 11:26:48 +08:00
97d0265e32
gzip test
2015-06-02 10:23:30 +08:00
4c6f67fd7e
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3
...
Conflicts:
tools/bindings-generator
web
2015-06-02 10:12:22 +08:00
fdec552ed7
Fix cocos2d/cocos2d-js#1658 : Fix js_load_remote_image issue with multithread and improve Downloader
2015-06-02 10:08:13 +08:00
b39006432f
Merge pull request #12091 from joshuastray/properties
...
[ci skip]fix material test
2015-05-29 14:22:36 +08:00
9cf5c1b636
fix material test
2015-05-29 13:54:29 +08:00
8b52563a8a
add videoplayer config ini and fix the url bug
2015-05-29 11:10:39 +08:00
9a62d06091
add video player test and auto bindings
2015-05-28 18:10:07 +08:00
ZhangMenghe