XiaoFeng
|
767a4afb9f
|
Fix UIPageViewVerticalTest in cpp-test can not scroll back to page 1
|
2015-10-14 09:16:34 +08:00 |
pandamicro
|
f2e3a0c071
|
Merge pull request #14104 from xiaofeng11/v3_bugfix
Bug fix
|
2015-10-12 10:14:26 +08:00 |
XiaoFeng
|
aee3244ad3
|
Fix test cocostudio test->cocostudio GUItest->MoveBy vertical direction under lua test project can not scroll back to page 1 from page 2
|
2015-10-10 17:50:48 +08:00 |
pandamicro
|
cff1a8ed50
|
Merge pull request #14103 from xiaofeng11/v3_bugfix
Bug fix
|
2015-10-10 17:20:07 +08:00 |
XiaoFeng
|
4df211fa0b
|
Fix particle test under lua test project display different in different platform
Fix cocostudio 3d test under lua test project crash bug
|
2015-10-10 14:51:14 +08:00 |
pandamicro
|
f64105b3dc
|
Merge pull request #14047 from liamcindy/v3.9
update for light3d reader
|
2015-10-10 11:43:05 +08:00 |
pandamicro
|
c2571f950c
|
Merge pull request #14003 from zilongshanren/fixWebViewCallback
fix ui::WebView callback operate OpenGL issue.
|
2015-10-10 11:32:02 +08:00 |
pandamicro
|
8b0a6a6c29
|
Merge pull request #14099 from pandamicro/v3
[ci skip]Sync with CCBoot for web
|
2015-10-10 10:16:16 +08:00 |
pandamicro
|
5ae2812bf8
|
Sync with CCBoot for web
|
2015-10-10 10:15:36 +08:00 |
pandamicro
|
bc9b59b7f7
|
Merge pull request #14096 from pandamicro/v3
[ci skip]Add opacity/color cascade test case for Scale9Sprite
|
2015-10-09 21:07:27 +08:00 |
pandamicro
|
0ea54868e2
|
Add opacity/color cascade test case for Scale9Sprite
|
2015-10-09 21:01:49 +08:00 |
pandamicro
|
87677cdbd1
|
Merge pull request #14088 from chengstory/Fix#23321
Fix Bug #23321
|
2015-10-09 15:27:56 +08:00 |
Liam
|
68f25f65c4
|
update submodule
|
2015-10-08 14:59:48 +08:00 |
zhangcheng
|
77062acfa7
|
Fix Bug #23321
|
2015-10-08 14:48:38 +08:00 |
pandamicro
|
d6bb62beee
|
Merge pull request #14083 from chengstory/Fix#23337
Fix Bug #23337
|
2015-10-08 11:54:07 +08:00 |
zhangcheng
|
4bf56e5853
|
Fix #23337
Hide menu "cocostudio 2.1", because cocostudio 1.6 Api can't load json exported from cocostudio 2.x.
|
2015-10-08 11:35:43 +08:00 |
pandamicro
|
2dbe0c1a90
|
Merge pull request #14016 from xiaofeng11/v3
Fix quickly click mouse in "41:Node:Physics -> 6:joints" in cpp-test may cause program crash
|
2015-10-08 11:12:36 +08:00 |
Dale Stammen
|
84e0d7fe7b
|
fixed another missing image asset in Win10 UWP manifest
|
2015-10-04 09:19:18 -07:00 |
Dale Stammen
|
6df43e60c0
|
fixed Windows 10 UWP app manifest by correcting image asset paths
|
2015-10-02 13:28:39 -07:00 |
Joachim Grill
|
79656ffe13
|
fixed typo, indentation
|
2015-09-29 16:50:14 +02:00 |
Joachim Grill
|
b14b251628
|
added Sprite performance test: load sprite from sprite sheet, with rectangular frame as well as with polygon outline
|
2015-09-29 15:45:48 +02:00 |
Joachim Grill
|
80ca579a01
|
added Sprite test case which loads PolygonInfo of sprite from plist file
|
2015-09-29 15:44:13 +02:00 |
Liam
|
8368762b37
|
update for light3D
|
2015-09-29 18:33:28 +08:00 |
zhangbin
|
f715a93521
|
Solve the crash of performance-tests on windows.
|
2015-09-29 15:32:51 +08:00 |
XiaoFeng
|
84347bb056
|
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3
|
2015-09-29 09:35:35 +08:00 |
XiaoFeng
|
0bdb1b099d
|
Fix particle test under performance test project memory overflow
|
2015-09-28 14:06:02 +08:00 |
pandamicro
|
0af7f29cfd
|
Merge pull request #14024 from TheCodez/fix_refptr_testcase
Fix : RefPtr test wasn't executed even in debug build
|
2015-09-27 23:16:27 +08:00 |
pandamicro
|
17c78ad3b1
|
Merge pull request #14018 from natural-law/v3
Solve the crash of performance-tests on windows.
|
2015-09-27 23:11:19 +08:00 |
Michael Kösel
|
744b7f54c9
|
Fix wrong debug check
|
2015-09-26 16:58:26 +02:00 |
pandamicro
|
91928aa23d
|
Add ComponentJS test case and fix windows platforms
|
2015-09-26 19:43:36 +08:00 |
pandamicro
|
a1bbd43f9f
|
Add component test to lua-tests and remove it from lua empty test
|
2015-09-26 19:43:36 +08:00 |
pandamicro
|
7e2b8c71a7
|
Improve lua script component
|
2015-09-26 19:43:35 +08:00 |
minggo
|
26632ec69a
|
linjia demo finish
|
2015-09-26 19:43:35 +08:00 |
minggo
|
3d1318fdf1
|
enemy can run
|
2015-09-26 19:43:35 +08:00 |
minggo
|
7326369ed2
|
pass dt to lua update
|
2015-09-26 19:43:35 +08:00 |
minggo
|
63af026769
|
can use any lua type to extend component
|
2015-09-26 19:43:35 +08:00 |
minggo
|
3f066d156a
|
lua script can access c++'s functions
|
2015-09-26 19:43:35 +08:00 |
minggo
|
85c297f53b
|
temple save
|
2015-09-26 19:43:35 +08:00 |
minggo
|
10427fb7ae
|
add lua component
|
2015-09-26 19:43:35 +08:00 |
zhangbin
|
6697cad212
|
Solve the crash of performance-tests on windows.
|
2015-09-25 18:23:13 +08:00 |
江龙
|
9eb05707fb
|
add custom spine skeletonAnimation test
|
2015-09-25 13:36:48 +08:00 |
ZhangMenghe
|
03e5573f79
|
button Opacity setting
|
2015-09-24 11:13:41 +08:00 |
pandamicro
|
149775ea10
|
Merge pull request #13962 from ZhangMenghe/v3-scrollView
[ci skip] Testcase for multiple items in scrollView
|
2015-09-24 09:35:05 +08:00 |
zilongshanren
|
bee52e378d
|
fix ui::WebView callback operate OpenGL issue.
All the OpenGL operations should be in OpenGL thread.
This PR wraps the callbacks in OpenGL thread.
|
2015-09-23 11:22:36 +08:00 |
pandamicro
|
49f6a863ea
|
Merge pull request #13966 from zilongshanren/fix-xcode7-override-issue
CCScrollView should override removeChild
|
2015-09-22 01:53:37 +08:00 |
ZhangMenghe
|
68713d2074
|
Multiple items testcase
|
2015-09-21 18:22:58 +08:00 |
pandamicro
|
cddd7dfdf6
|
Merge pull request #13965 from ZhangMenghe/v3-drawLabels
[ci skip] DrawLabel Mode testcase
|
2015-09-21 15:08:47 +08:00 |
zilongshanren
|
1c40f7b61b
|
CCScrollView should override removeChild
Fixed issue: https://github.com/cocos2d/cocos2d-x/issues/8396
|
2015-09-21 11:35:11 +08:00 |
ZhangMenghe
|
26358c9c2c
|
DrawLabel Mode testcase
|
2015-09-21 11:05:21 +08:00 |
pandamicro
|
6ab7f3804e
|
Merge pull request #13960 from TimothyZhang/jsb-writeDataToFile
Add jsb.fileUtils.writeDataToFile()
|
2015-09-21 10:48:25 +08:00 |
ZhangMenghe
|
4054686903
|
Testcase for multiple items in scrollView
|
2015-09-21 10:24:44 +08:00 |
pandamicro
|
fa9afd6c2b
|
Merge pull request #13953 from himynameschris/fix-socketio
Fix socketio to work with servers v1.0+
|
2015-09-20 23:15:27 +08:00 |
zhangting
|
bb8d9a4145
|
add testcase for writeDataToFile to jstests
|
2015-09-20 16:46:54 +08:00 |
geron-cn
|
f93cfac0f7
|
rename setAnimationEndCallFunc
|
2015-09-20 16:24:41 +08:00 |
geron-cn
|
0cfc33e4d3
|
format apis added in https://github.com/cocos2d/cocos2d-x/pull/13770
|
2015-09-20 12:34:34 +08:00 |
Chris Hannon
|
e7c2436d85
|
fixes bug in socketio extension when connecting to socketio servers v1+ (incorrect separator in v1 packet strings)
Signed-off-by: Chris Hannon <chris@channon.us>
|
2015-09-19 20:31:48 -04:00 |
pandamicro
|
6bf54a3eda
|
Merge pull request #13770 from geron-cn/v3
add Frame End Call Back and Animation Clip End Call Back
|
2015-09-19 00:24:21 +08:00 |
pandamicro
|
6b8d400517
|
Merge pull request #13804 from ZhangMenghe/v3-UItestcase
[ci skip] UItestcase modification to be friendly
|
2015-09-19 00:22:41 +08:00 |
pandamicro
|
3fc1349561
|
Merge pull request #13945 from WenhaiLin/v3-physics-testcase-fix
[ci skip]Lua-tests:Fixed physical test cases.
|
2015-09-19 00:05:26 +08:00 |
WenhaiLin
|
db102f2030
|
[ci skip]Lua-tests:Fixed physical test cases.
|
2015-09-19 00:03:21 +08:00 |
pandamicro
|
0cbc1e5f40
|
Merge pull request #13923 from WenhaiLin/v3-physics-refine
Refine components to improve physics performance
|
2015-09-18 21:56:36 +08:00 |
pandamicro
|
cc8e944050
|
Merge pull request #12220 from hanxi/v3
add UIEditBox support linux platform
|
2015-09-18 21:53:09 +08:00 |
pandamicro
|
add24ccf95
|
Merge pull request #13913 from fusijie/revert-12889-fix_clippingRectangle_bug
Revert "remove CCClippingRectangleNode transform error support."
|
2015-09-18 21:43:42 +08:00 |
hanxi
|
b1ed1a8a51
|
add UIEditBox support linux platform.
|
2015-09-18 17:11:58 +08:00 |
WenhaiLin
|
a17a702cd1
|
Refine components to improve performance
|
2015-09-18 14:34:02 +08:00 |
yangxiao
|
36d4f5564d
|
merge cocos
|
2015-09-18 14:08:33 +08:00 |
pandamicro
|
8d0d053249
|
Merge pull request #13909 from ZhangMenghe/v3-s9sprite
[ci skip] testcase for s9sprite action
|
2015-09-18 13:03:13 +08:00 |
pandamicro
|
3f5df0ccc3
|
Merge pull request #13647 from super626/motionstreak3d
Motionstreak3d
|
2015-09-18 11:59:33 +08:00 |
偶尔e网事
|
eb480fb021
|
Revert "remove CCClippingRectangleNode transform error support."
|
2015-09-18 11:31:37 +08:00 |
ZhangMenghe
|
6e4d39e909
|
s9sprite action testcase
|
2015-09-18 09:45:43 +08:00 |
yangxiao
|
6f1b04fd89
|
merge cocos
|
2015-09-18 09:37:26 +08:00 |
pandamicro
|
ded9a9e6d4
|
Merge pull request #13893 from yangws/downloader
Remove AssetsManager dependence with CRUL.
|
2015-09-17 22:18:56 +08:00 |
Vincent Yang
|
5eafc93d86
|
Remove AssetsManager dependence with CRUL.
|
2015-09-17 16:52:31 +08:00 |
pandamicro
|
1eeafed072
|
Merge pull request #13884 from yangws/v3
Fix bug: in Widget::isClippingParentContainsPoint, _hittedByCamera may be null.
|
2015-09-17 16:32:56 +08:00 |
pandamicro
|
5b99ada936
|
Merge pull request #13842 from yangws/issue_13818
Fixed #13818 : Node:Text Input test in cpp-tests touch detection is wrong
|
2015-09-17 16:23:25 +08:00 |
yangxiao
|
572ee3adb2
|
merge cocos
|
2015-09-17 14:24:01 +08:00 |
Vincent Yang
|
4b83240bed
|
Fix bug: in ui::Widget::isClippingParentContainsPoint, _hittedByCamera may be null.
|
2015-09-17 11:20:36 +08:00 |
andyque
|
1be5402050
|
Merge branch 'v3' into addiOSMultiline-support
# Conflicts:
# build/cocos2d_libs.xcodeproj/project.pbxproj
|
2015-09-16 21:49:55 +08:00 |
pandamicro
|
0479cca364
|
Merge pull request #13832 from yangws/downloader
Restructure CCDownloader implement on iOS and Android don't use libcurl.
|
2015-09-16 14:01:28 +08:00 |
Vincent Yang
|
c85dc71846
|
Fixed #13818 : Node:Text Input test in cpp-tests touch detection is wrong.
|
2015-09-16 11:07:37 +08:00 |
yangxiao
|
ea538cd9da
|
merge cocos
|
2015-09-16 10:37:24 +08:00 |
Vincent Yang
|
848fa2c0d0
|
Merge cocos2d.
|
2015-09-15 18:30:45 +08:00 |
子龙山人
|
f2bee23696
|
Merge pull request #13789 from neokim/fix-13668
Fix for #13668
|
2015-09-15 18:28:24 +08:00 |
子龙山人
|
73d2c5d1b8
|
Merge pull request #13577 from fusijie/fix_13454
Fixed sprite debug draw.
|
2015-09-15 14:24:23 +08:00 |
andyque
|
556175df1e
|
add iOS EditBox multiline support
When the inputMode is ANY, then we use TextView to input.
otherwise we use normal UITextField.
Fixed issue https://github.com/cocos2d/cocos2d-x/issues/13436
|
2015-09-15 13:52:39 +08:00 |
andyque
|
2fea4db9fc
|
fix ui::Button title location issue
|
2015-09-15 13:37:32 +08:00 |
Vincent Yang
|
ebf308d88c
|
Test case Downloader Test restructured.
|
2015-09-14 15:33:34 +08:00 |
ZhangMenghe
|
5f8351ea32
|
UItestcase modification to be friendly
|
2015-09-14 15:31:25 +08:00 |
pandamicro
|
9fbefb8eed
|
Merge pull request #13786 from dumganhar/lua-xmlhttprequest-fix
[Lua] Life control fix for XMLHttpRequest
|
2015-09-14 12:12:41 +08:00 |
pandamicro
|
d3a76bc872
|
Merge pull request #13792 from natural-law/v3
Add tools for converting the performance tests data to excel files.
|
2015-09-14 10:55:27 +08:00 |
zhangbin
|
5d47ce8f23
|
Add tools for converting the performance tests data to excel files.
|
2015-09-14 09:52:21 +08:00 |
Neo Kim
|
3fff195c20
|
Override 'jumpToSomewhere' functions in list view to recalculate inner container's size if necessary.
|
2015-09-13 22:32:22 +09:00 |
James Chen
|
10e45ee744
|
Updates XMLHttpRequestTest.lua
|
2015-09-12 19:11:32 +08:00 |
子龙山人
|
96d6221daf
|
Merge pull request #13723 from neokim/add_scroll_to_item_and_magnetic_scroll_into_listview
Add scrolling to item and magnetic scroll into ListView
|
2015-09-11 17:48:40 +08:00 |
zhangbin
|
edb964a673
|
Remove the performance related config in project.json.
|
2015-09-11 16:03:07 +08:00 |
Neo Kim
|
22b2f8b7b3
|
ListView - Change the order of test cases and fix for windows builds.
|
2015-09-11 16:00:53 +09:00 |
zhangbin
|
8e9928ad99
|
Remove performance tests from lua-tests & js-tests.
|
2015-09-11 10:53:17 +08:00 |
geron-cn
|
966e568051
|
add ActionTimeline Frame End Call Back and Animation Clip End Call Back
|
2015-09-10 18:29:09 +08:00 |
Vincent Yang
|
bd80eb6f46
|
CCDownloader-android implements Data Task Download.
|
2015-09-10 18:03:15 +08:00 |
zhangbin
|
6f06ea19ac
|
Merge branch 'v3' into performance-test
|
2015-09-10 16:06:36 +08:00 |
zhangbin
|
e3161eb127
|
Remove performance tests from cpp-tests project.
|
2015-09-10 16:01:56 +08:00 |
Vincent Yang
|
7e2fe05050
|
CCDownloader-android implements File Task Download.
|
2015-09-10 15:56:06 +08:00 |
bill.zhang
|
c82fcfa6ca
|
Add win32 support for performance-tests.
|
2015-09-10 11:45:00 +08:00 |
pandamicro
|
941cd3c9de
|
Merge pull request #13717 from jianglong0156/assetsmanagerContinue
fix the AssetsManagerEx can not continuous transmission
|
2015-09-10 11:34:03 +08:00 |
yangxiao
|
d5fab0bd38
|
merge cocos
|
2015-09-10 10:44:09 +08:00 |
zhangbin
|
7fa1976fa6
|
Optimize the output test data.
|
2015-09-09 18:29:18 +08:00 |
zhangbin
|
5b90476f65
|
Write the test result file to sdcard on Android.
|
2015-09-09 17:00:38 +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 |
zhangbin
|
f3ade30b0b
|
Add proj.android & proj.android-studio support.
|
2015-09-09 16:02:33 +08:00 |
yangxiao
|
ff85173b4b
|
remove cached material switch test demo
|
2015-09-09 11:13:17 +08:00 |
pandamicro
|
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 |
pandamicro
|
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 |
Neo Kim
|
e58c073186
|
ListView - Apply magnetic to inertia scroll.
|
2015-09-09 10:29:18 +09:00 |
Neo Kim
|
ca3ea53ffd
|
ListView - Add enum for magnetic type and test cases for magnetic scroll.
|
2015-09-09 10:29:18 +09:00 |
Neo Kim
|
d8fc04d109
|
ListView - Add 'scrollToItem' method and its test cases.
|
2015-09-09 10:29:18 +09:00 |
Neo Kim
|
2599271410
|
ListView - Add APIs which return the closest item in specific position in current view.
|
2015-09-09 10:29:17 +09: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 |
zhangbin
|
523d4420bf
|
Add Container tests.
|
2015-09-08 16:33:03 +08:00 |
zhangbin
|
5bb3f1b9c4
|
Add Math tests.
|
2015-09-08 15:49:04 +08:00 |
yangxiao
|
7f7b4f83c4
|
add outline material
|
2015-09-08 15:33:24 +08:00 |
zhangbin
|
44b916ad74
|
Add Callback tests.
|
2015-09-08 15:29:56 +08:00 |
yangxiao
|
f944750627
|
add material cache
|
2015-09-08 15:29:54 +08:00 |
zhangbin
|
a3c730e014
|
Optimize the output file format.
|
2015-09-08 14:33:38 +08:00 |
yangxiao
|
2076071e8f
|
outline test using material file
|
2015-09-08 14:13:53 +08:00 |
zhangbin
|
8bceb9c0ba
|
Add Scenario tests.
|
2015-09-08 14:06:23 +08:00 |
yangxiao
|
a74e051b56
|
fix android back to foreground
|
2015-09-08 10:53:36 +08:00 |
minggo
|
8326ed6535
|
add physics component
|
2015-09-08 09:54:01 +08:00 |
zhangbin
|
669fc10d37
|
Clean the data when the auto tests are finished.
|
2015-09-07 16:40:47 +08:00 |
zhangbin
|
0571383889
|
Add EventDispatcher tests.
|
2015-09-07 16:20:20 +08:00 |
pandamicro
|
4fb34ba190
|
Merge pull request #13703 from cocos2d/v3.8
Sync v3.8 to v3
|
2015-09-07 14:56:37 +08:00 |
yangxiao
|
c3ac446f35
|
resolve conflict
|
2015-09-07 14:45:09 +08:00 |
zhangbin
|
646190af0e
|
Add Label tests.
|
2015-09-07 13:42:24 +08:00 |
Vincent Yang
|
9b4fe5b5a1
|
Add CCDownloader-android class frame to android project.
|
2015-09-07 11:55:00 +08:00 |
Vincent Yang
|
3a078540a0
|
Modify CCDownloader-apple.mm support continuly download.
|
2015-09-07 10:08:28 +08:00 |
zhangbin
|
5ce4ddfb1d
|
Add Texture tests.
|
2015-09-06 17:39:00 +08:00 |
zhangbin
|
bd47385bbd
|
Add Sprite tests.
|
2015-09-06 16:35:13 +08:00 |
Vincent Yang
|
0afa2bdfc6
|
Modify CCDownloader-curl.cpp to support continue download.
|
2015-09-06 15:57:51 +08:00 |
Vincent Yang
|
ea580ed2ee
|
Restructure CCDownload Interface and implements with curl.
|
2015-09-02 18:26:42 +08:00 |
andyque
|
c0f40ad4a5
|
fix Android EditBox font size issue
|
2015-09-02 18:25:30 +08:00 |
songchengjiang
|
cc6e2077f4
|
replace custom shaders by material files
add Sprite3DVertexColorTest
|
2015-09-02 16:30:24 +08:00 |
zhangbin
|
cc2dd7b225
|
Add Particle3D tests.
|
2015-09-02 14:31:35 +08:00 |
zhangbin
|
c664756dbe
|
Add particle tests.
|
2015-09-02 11:21:17 +08:00 |
ZhangMenghe
|
f3190206e0
|
Remove clickAndMove testcase
|
2015-09-01 14:21:08 +08:00 |
yangxiao
|
8499400514
|
motionstreak3d test demo
|
2015-09-01 10:39:31 +08:00 |
WenhaiLin
|
a3b5becb45
|
Sync v3.8 to v3
|
2015-08-31 22:05:37 +08:00 |
zhangbin
|
013ed60c15
|
Add node children tests.
|
2015-08-31 17:40:26 +08:00 |
zhangbin
|
46427bec59
|
Write the test data with json format.
|
2015-08-31 16:57:46 +08:00 |
zhangbin
|
351dee8c22
|
Optimize the implementation of Alloc Test.
|
2015-08-31 15:08:36 +08:00 |