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 |
zhangbin
|
0e0213b121
|
Add logic for auto test the test cases.
|
2015-08-31 11:42:48 +08:00 |
Vincent Yang
|
cf664800ac
|
refine #22483 : Restructure CCDownload Interface and implements on iOS.
|
2015-08-28 16:40:11 +08:00 |
zhangbin
|
00f2e99b2c
|
Add performance tests project for iOS & Mac.
|
2015-08-28 14:54:12 +08:00 |
pandamicro
|
9d72d6a924
|
Merge pull request #13496 from ZhangMenghe/v3-notification
[ci rebuild] Notification effect enhancement
|
2015-08-28 14:10:42 +08:00 |
VisualSj
|
2d77609fb7
|
Update socket@1.3.6 and web index
|
2015-08-28 11:48:58 +08:00 |
pandamicro
|
d6045fdbea
|
Merge branch 'v3.8' of github.com:cocos2d/cocos2d-x into v3
Conflicts:
cocos/audio/winrt/Audio.cpp
cocos/platform/winrt/CCCommon.cpp
cocos/platform/winrt/CCWinRTUtils.cpp
cocos/platform/winrt/CCWinRTUtils.h
|
2015-08-27 10:40:04 +08:00 |
fusijie
|
5f527bfc1d
|
Fixed sprite debug draw.
|
2015-08-26 18:18:58 +08:00 |
江龙
|
7ce5542ffc
|
add scriptTest project manifest
|
2015-08-26 14:50:34 +08:00 |
Ricardo Quesada
|
dfed33f6f2
|
Adds `PrimitiveCommand` test
|
2015-08-25 15:07:03 -07:00 |
andyque
|
6cea66f932
|
fixed Scale9Sprite default capInset bug.
Fixed https://github.com/cocos2d/cocos2d-x/issues/13560
|
2015-08-25 23:31:34 +08:00 |
pandamicro
|
b6de58c21c
|
Merge pull request #13558 from WenhaiLin/v3.8-testcase-refine2
[cpp-tests]Refine test cases about label
|
2015-08-25 18:30:44 +08:00 |
WenhaiLin
|
d6ed3b417c
|
[cpp-tests]Refine test cases about label
|
2015-08-25 17:50:47 +08:00 |
fusijie
|
19901c43ea
|
fix spriteblur crash foreground.
|
2015-08-25 14:39:17 +08:00 |
WenhaiLin
|
a6412e431d
|
[cpp-tests]Fixed title of test cases.
|
2015-08-25 10:28:18 +08:00 |
fusijie
|
a7820c1eef
|
fix shaderTest draw twice.
|
2015-08-24 18:35:49 +08:00 |
pandamicro
|
350182c1aa
|
Refactor BackGround to Background
|
2015-08-21 10:43:59 +08:00 |
yangxiao
|
3e2001bdb1
|
Add CCCameraBackgroundBrush
including Color, Depth, SkyBox brushes
Squashed from https://github.com/cocos2d/cocos2d-x/pull/13490
|
2015-08-21 10:43:59 +08:00 |
ZhangMenghe
|
1bcc2dec37
|
Notification effect enhancement
|
2015-08-21 10:20:59 +08:00 |
pandamicro
|
f377a9bff1
|
Merge pull request #13491 from zilongshanren/v3.8
add RadioButton and RadioButtonGroup event type
|
2015-08-21 09:17:46 +08:00 |
Dale Stammen
|
d55bc653e0
|
update c++ debug info settings
|
2015-08-20 13:25:17 -07:00 |
andyque
|
15156a015a
|
add RadioButton and RadioButtonGroup event type
|
2015-08-20 22:49:42 +08:00 |
pandamicro
|
918d7ce5d6
|
Merge pull request #13480 from geron-cn/v3.8
add blendfunc Frame test case
|
2015-08-20 18:02:40 +08:00 |
子龙山人
|
f79d2c8a0a
|
Merge pull request #13483 from zilongshanren/fix-lua-ui-v3.8
[ci skip]add missing ui test in Lua
|
2015-08-20 15:28:25 +08:00 |
andyque
|
72496ae426
|
add missing ui test in Lua
|
2015-08-20 15:25:09 +08:00 |
geron-cn
|
ede4651b5e
|
add blendfunc Frame test case
|
2015-08-20 11:29:52 +08:00 |
子龙山人
|
f14c58877c
|
Merge pull request #13467 from fusijie/fix_testcase_as_compile_downloaderTest
[ci skip]fix as compile error.
|
2015-08-19 15:17:59 +08:00 |
fusijie
|
bdc22516c8
|
fix as compile error.
|
2015-08-19 15:05:18 +08:00 |
pandamicro
|
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 |
ZhangMenghe
|
e9bd14e1d7
|
Delete blur shader in js-resj
|
2015-08-19 13:41:45 +08:00 |
pandamicro
|
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 |
子龙山人
|
1f735b4f0e
|
Merge pull request #13437 from fusijie/fix_lua_testcase_setPointer_error
Fixed setVertexAttribPointer luabinding and Test case.
|
2015-08-19 11:43:18 +08:00 |
子龙山人
|
e3c88533fe
|
Merge pull request #13447 from WenhaiLin/v3.8-refine-testcases
Test cases:improve small problems.
|
2015-08-19 09:46:13 +08:00 |
Dale Stammen
|
47b72ba30e
|
Merge branch 'v3' into v3-win10
|
2015-08-18 11:07:38 -07:00 |
Dale Stammen
|
8493365be7
|
updates to pass Windows App Certification tests
|
2015-08-18 11:06:47 -07:00 |
WenhaiLin
|
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 |
WenhaiLin
|
5dd6d94c17
|
Test cases:improve small problems.
|
2015-08-18 22:19:24 +08:00 |
ZhangMenghe
|
9fbc45171e
|
Fix shader position abnormal
|
2015-08-18 17:07:08 +08:00 |
VisualSj
|
22c8163bc8
|
[js-tests][PageView] Button position error
|
2015-08-18 16:12:32 +08:00 |
fusijie
|
f671d36e31
|
Fixed lua testacase setPointer error.
|
2015-08-18 11:19:32 +08:00 |
Dale Stammen
|
9259696847
|
disable Downloader test for Win10 UWP. No CURL support yet
|
2015-08-17 18:37:54 -07:00 |
Dale Stammen
|
97ecec1d64
|
updated Win10 UWP app asset files
|
2015-08-17 18:35:42 -07:00 |
pandamicro
|
b4ec30cc47
|
Merge pull request #13416 from WenhaiLin/v3.8-beta2
cpp-tests[win32 project]:Fixed link errors in release mode.
|
2015-08-17 22:32:42 +08:00 |
pandamicro
|
40581c1c25
|
Merge pull request #13422 from VisualSJ/v3-pb-21865
[ci skip] Change ActionManager test name
|
2015-08-17 21:47:20 +08:00 |
VisualSJ
|
be93b6bf2e
|
Change ActionManager test name
|
2015-08-17 20:35:38 +08:00 |
pandamicro
|
f2edb1c8f9
|
Merge pull request #13410 from ZhangMenghe/v3-retinaEffect
[ci skip] Fix invisiable testcase of effects
|
2015-08-17 17:51:04 +08:00 |
WenhaiLin
|
ae836bd364
|
cpp-tests[win32 project]:Fixed link errors in release mode.
|
2015-08-17 17:43:36 +08:00 |
ZhangMenghe
|
eaa5643c7c
|
Fix invisiable testcase of effects
|
2015-08-17 17:26:25 +08:00 |
pandamicro
|
9db78b2bb7
|
Merge pull request #13407 from liamcindy/v3.8
fix the skybox display error from editor files
|
2015-08-17 16:57:32 +08:00 |
Liam
|
7aa36d14be
|
fix the skybox display error from editor files
|
2015-08-17 13:04:25 +08:00 |
子龙山人
|
4000cff902
|
Merge pull request #13399 from WenhaiLin/v3.8-beta2
DownloaderAsyncTest:Fixed crash cause by double-click `start download` button.
|
2015-08-17 11:28:43 +08:00 |
pandamicro
|
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 |
pandamicro
|
c0eea61109
|
Merge pull request #13375 from ZhangMenghe/v3-effectAdvance
[ci skip] Fix abnormal effects in effectsTest
|
2015-08-17 11:18:27 +08:00 |
pandamicro
|
1700230213
|
Merge pull request #13379 from ZhangMenghe/v3-rtexture
[ci skip] Modify renderTexture stencilDepth test
|
2015-08-17 10:20:22 +08:00 |
pandamicro
|
6d7c05f0b7
|
Merge pull request #13356 from VisualSJ/v3-updateIndex
[ci skip] Update js-test
|
2015-08-17 10:18:59 +08:00 |
WenhaiLin
|
aeca6ae024
|
DownloaderAsyncTest:Fixed crash cause by double-click `start download` button.
|
2015-08-17 10:16:04 +08:00 |
ZhangMenghe
|
06864479f3
|
Avoid to trigger touch event multiple times
|
2015-08-14 18:34:46 +08:00 |
ZhangMenghe
|
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 |
ZhangMenghe
|
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 |
fusijie
|
77ef03d696
|
Fixed JS-Tests TiledMap VertexZ bug.
|
2015-08-14 15:13:08 +08:00 |
pandamicro
|
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 |
Ricardo Quesada
|
7047e0fbdb
|
Merge branch 'v3' into downloader_decouple_squash
|
2015-08-13 11:07:49 -07:00 |
子龙山人
|
20729e16ae
|
Merge pull request #13349 from yangws/v3
Fix bug: timer dt time error when interval = 0.
|
2015-08-13 17:02:55 +08:00 |
VisualSj
|
f9397f39f5
|
[js-tests] Update Particle test
|
2015-08-13 15:18:42 +08:00 |
ZhangMenghe
|
4f49993fef
|
Modify effects testcases
|
2015-08-13 15:15:04 +08:00 |
Ricardo Quesada
|
d2cf4bfc79
|
Squashed commit of the following:
commit 2c810a8e931e07b06498c07db37cbf20a2bcfc92
Merge: 61788a0 082caaf
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Thu Aug 13 00:13:38 2015 -0700
Merge branch 'v3' into downloader_decouple
commit 61788a0b34188fed5367cab121817db97198bcd8
Merge: 8c1e211 5e21580
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Wed Aug 12 20:45:12 2015 -0700
Merge branch 'v3' into downloader_decouple
commit 8c1e2119a5c671c00da5ce1fb244029f2bfab09f
Merge: 2ea66af 8d73883
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Wed Aug 12 20:42:04 2015 -0700
Merge pull request #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
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Wed Aug 12 09:14:22 2015 -0700
Merge branch 'v3' into downloader_decouple
commit 8cdb0b6e4b83210b1f68b4568c74ccb36f504806
Merge: 9272765 08eeca9
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Tue Aug 11 20:11:46 2015 -0700
Merge pull request #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
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Tue Aug 11 10:39:22 2015 -0700
Merge branch 'v3' into downloader_decouple
commit 8252464020dbe86da4e5e5aa6e4e45f6997f6b9b
Merge: 5dddbb6 138df42
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Tue Aug 11 06:53:48 2015 -0700
Merge pull request #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 0cbd71f
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri Aug 7 15:49:33 2015 -0700
Merge branch 'v3' into cocos_net
commit 0bbc62ee1fbfd107a935131d5d93994e87865afa
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri Aug 7 15:46:55 2015 -0700
more tests... and works
but there is huge bug.
ProgData <vector> needs the position of DownloadUnits <unordered_map>
but <unordered_map> does not guaranty the order.
So in my next commit I"ll merge DownloadUnit with ProgressData
commit 389ed8639a1942f628773616a8e340bc66a0c1d7
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri Aug 7 13:47:07 2015 -0700
debugging info
commit af0dc45bb9c4705934ced2c1d67e5afc06b6f317
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri Aug 7 11:47:31 2015 -0700
sync and async tests working ok
commit 999fa7a7bfb28565492f47b39caef7f1a079c183
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri Aug 7 11:38:38 2015 -0700
adding tests
commit 91ee294942510718400edc0d00d3c744d00339ee
Merge: 76ab703 7f215e9
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri Aug 7 10:03:50 2015 -0700
Merge branch 'v3' into cocos_net
commit 76ab7032d3a21156f05395a021391a16649f755a
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri Aug 7 00:22:20 2015 -0700
Downloader tests
commit b65c4dad7089660bfe697c0dab3e9290d1a6d013
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Thu Aug 6 21:34:54 2015 -0700
compiles on Xcode 7
commit ec0d66340b8daf0b042d36333dff759cd424f465
Merge: 878e4b5 0d77838
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Thu Aug 6 11:02:24 2015 -0700
Merge branch 'v3' into cocos_net
commit 878e4b5d0f87bc6d5d6e507102ab15e2c24a1c8f
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Wed Aug 5 18:07:02 2015 -0700
working, yeah!
commit ad1e7637a5ac2e6bff44d35429f5556ea1cb8a4c
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Wed Aug 5 17:49:59 2015 -0700
code is more thread-safe friendly
commit 8c6baaee6b898d4b90e5d8988a174d8a33702f60
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Wed Aug 5 16:39:02 2015 -0700
fixes callbacks
commit ddab4d753106c6ff11304c1c69739c5611e3f20a
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Wed Aug 5 15:43:51 2015 -0700
cleaner code
runs callbacks in cocos2d thread only if needed
commit ef75844aaa010633e6e27ae6e69460174460d5c7
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Wed Aug 5 11:58:04 2015 -0700
removed weak_ptr<> from ProgressData
that logic of the code is added in the callbacks
commit d9c7436cbadc611592b3c80ca2a3a9edeaa00853
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Wed Aug 5 11:54:07 2015 -0700
checks whether or not the callbacks are in the cocos2d thread
commit ae6594a6f866f6b5015ba293db23343887063d2f
Merge: 4c61069 6831e24
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Wed Aug 5 10:48:34 2015 -0700
Merge branch 'v3' into cocos_net
commit 4c61069a7e0e33fa0332df700cc8df4807178caf
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Tue Aug 4 21:36:50 2015 -0700
almost there...
Downloader has std::vector<FILE*> instead of FileDescriptors
code cleaner...
commit c34d04a8218d2be5c316e0487e5ac46792bbed76
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Tue Aug 4 20:38:44 2015 -0700
passes progressData to batch
no need to alloc memory for each ProgressData
commit f7e8bbd8b85f214b919bce6118d4158dd6d26368
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Tue Aug 4 17:47:23 2015 -0700
tidier code and more optimizations
commit a486dc78aedcf9c6178e490292edd572f8a7b374
Merge: 4178327 a06421b
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Tue Aug 4 14:03:22 2015 -0700
Merge branch 'v3' into cocos_net
commit 417832705910a6ebd16a876cd98064ea16f0f45c
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Mon Aug 3 18:13:13 2015 -0700
not finished yet...
...but trying to have a common inteface with batched and non-batched
downloads
commit 1d0e4652763c2e1511ac102a62defae6c6a89220
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Mon Aug 3 16:29:39 2015 -0700
ErrorCallback compiles
starting the batching code
commit 6645a287c47dc01cbf1f2d80e9c0fdd2b16e3e18
Merge: c180425 8d836da
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Mon Aug 3 10:28:51 2015 -0700
Merge branch 'v3' into cocos_net
commit c180425d8181b8e6f53be766d8d2b94f908ae168
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri Jul 31 15:35:53 2015 -0700
More progress on migrating multiple-file downloader
to the implementation file
commit 5fa273e265963af3c0cb6338bf49dc5e1b54173b
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri Jul 31 14:00:02 2015 -0700
Dowloader moved to `cocos2d::network`
commit 14b1d0825106701b5435a266b255f09291b6486b
Merge: 13cfc8d f744383
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri Jul 31 11:13:55 2015 -0700
Merge branch 'v3' into cocos_net
commit 13cfc8de4eb4835ffb8f8d671d3d070c411b0a2e
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri Jul 31 11:11:45 2015 -0700
DownloadUnits belong to network
commit e6e17564ead1fb7f6f7df343b0627a104cd756f8
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Thu Jul 30 12:23:36 2015 -0700
adds `check for option`
commit 5cb76dfaaed42011a0c536d01b82a0a94487d6aa
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Thu Jul 30 10:37:51 2015 -0700
Downloader: using URLDownload in one case.
3 more to go. Not tested yet
commit 9b26e9cfac425635027189ccab835054b68bc83d
Merge: 20fe063 253d9c4
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Thu Jul 30 08:35:53 2015 -0700
Merge branch 'v3' into cocos_net
commit 20fe0636e36ae7f1da048545b3345f526d5b64de
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Wed Jul 29 17:36:07 2015 -0700
URLDownload: initial commit
HttpAsyncConnection -> HttpAsyncConnection-apple: follows the cocos2d
guidelines
Adds `CCIRULDownload` interface.
Adds `CCURLDownload` implementation based on libcurl. Not working yet.
`Downloader` uses `URLDownload` for some of its functions.
WIP
commit 3a5d3b83838bee53e3bbea182f3ad09d7bec32d0
Merge: e408fe0 642ccac
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Wed Jul 29 14:00:43 2015 -0700
Merge remote-tracking branch 'cocos2d/v3' into cocos_net
commit e408fe0b9303813d20bab2f7bf548f3b7af416a6
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Wed Jul 29 13:59:46 2015 -0700
Adds more files to Xcode project
...even if they are not being compiled. Much easier to add missing
functionality to the rest of the platforms
commit 11d86acebeb61348e4ccf7e6af9a2eaf1b6bb534
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Wed Jul 29 11:36:57 2015 -0700
removes unneeded headers
|
2015-08-13 00:14:10 -07:00 |
子龙山人
|
d8810abdd6
|
Merge pull request #13343 from zilongshanren/fix-template-deprecated-api
remove deprecated API in templates
|
2015-08-13 15:08:14 +08:00 |
Vincent Yang
|
295dcde2a8
|
Modify test case SchedulerPauseResumeAll and SchedulerPauseResumeAllUser.
|
2015-08-13 14:38:51 +08:00 |
andyque
|
c3abb48b98
|
remove deprecated API in templates
|
2015-08-13 13:42:47 +08:00 |
Vincent Yang
|
d333d24177
|
Fix bug: timer dt time error when interval = 0.
|
2015-08-13 12:55:07 +08:00 |
子龙山人
|
5e21580cdd
|
Merge pull request #13345 from VisualSJ/v3-updateIndex
[ci skip] update js-tests
|
2015-08-13 11:18:19 +08:00 |
VisualSj
|
dd7e00403f
|
[js-tests] that is undefined - script test
|
2015-08-13 10:56:41 +08:00 |
ZhangMenghe
|
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 |
VisualSj
|
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 |
andyque
|
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 |
fusijie
|
bed3640e6c
|
fixed retro pos.
|
2015-08-12 15:09:33 +08:00 |
pandamicro
|
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 |
子龙山人
|
f78ebf5843
|
Merge pull request #13312 from super626/animate3d
Modify CCLOG to cocos2d::log
|
2015-08-12 13:57:31 +08:00 |
andyque
|
9a83ed9b28
|
remove unneeded protocol in AppController.h.
|
2015-08-12 13:55:36 +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 |
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 |
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 |
子龙山人
|
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 |
子龙山人
|
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 |