Lothario
/
axmol
mirror of https://github.com/axmolengine/axmol.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
34,353 Commits 2 Branches 31 Tags 1.1 GiB
Commit Graph

4543 Commits

Author SHA1 Message Date
songchengjiang dcfdfd3a78 LUA tests: add Sprite3DNormalMappingTest 2015-11-26 11:27:33 +08:00
songchengjiang 64f082ab7c add bumped testing model 2015-11-26 10:14:27 +08:00
zilongshanren b1490c96b6 Merge branch 'v3' into fixListViewClippingIssue 2015-11-25 18:25:40 +08:00
songchengjiang 9241797acb support normal mapping material 2015-11-25 10:45:03 +08:00
zilongshanren b36f464c09 update ccs-res submodule 2015-11-24 18:06:11 +08:00
zilongshanren 9c2130e88a fix Layout and ClippingNode nested rendering issue 2015-11-24 18:01:50 +08:00
pandamicro a6fdd9aa09 Improve js template documentation 2015-11-24 16:31:14 +08:00
zilongshanren 8d1f1a9933 Merge pull request #14457 from zilongshanren/testEditBoxScaleSize 
Fix edit box setPlaceholderFontName and scale font size issue
 2015-11-24 11:33:52 +08:00
zilongshanren 7676b1cb73 improve label layout logic 2015-11-23 17:47:30 +08:00
zilongshanren 361daf7f5f fix wrong indentation 2015-11-23 11:50:04 +08:00
François Dupayrat 12df5ae1cc Fix wrong variable use for setPlaceholderFontName 
1. fix editbox scale not affect native font size
 2015-11-23 11:49:22 +08:00
zilongshanren 689c0f4af3 Merge pull request #14327 from wohaaitinciu/editbox-win32 
Fix a fatal bug in EditBox implement for platform win32
 2015-11-23 11:35:40 +08:00
zilongshanren 7ee82f20fc fix getLetter crash issue. 
1. make vertical clamp works in non-wrap mode.

2. make the lineHeight and letterSprite scale work correct.
 2015-11-20 16:39:48 +08:00
zilongshanren 19257d6120 Add Overflow feature char map font. 
1. fix single line clamp.
 2015-11-19 18:14:46 +08:00
zilongshanren ccdb2a75f9 Add Label Overflow and wrap option. 
Squashed commit of the following:

commit 7176582def3686f78701f92ead4d0976bccd115d
Author: zilongshanren <guanghui8827@126.com>
Date:   Thu Nov 19 10:30:54 2015 +0800

    add char map font test

commit 7ea7c251ff549e4a74d5c5c3faa49893fe5defc4
Author: zilongshanren <guanghui8827@126.com>
Date:   Wed Nov 18 15:00:17 2015 +0800

    system font overflow is not supported

commit a02fe0c7f94692b95a0bfd6f194a94c4519cee3a
Author: zilongshanren <guanghui8827@126.com>
Date:   Wed Nov 18 11:04:15 2015 +0800

    add system font test

commit eb098da8b16f485c86929a9b2ba00a64068264e9
Author: zilongshanren <guanghui8827@126.com>
Date:   Tue Nov 17 10:29:35 2015 +0800

    Finish resize height mode

commit ca78ba35abdbacc23bf6f8315454ec0a356a6aca
Author: zilongshanren <guanghui8827@126.com>
Date:   Mon Nov 16 11:01:27 2015 +0800

    fix wrap issue

commit baf1a5e0dc3a08da0a13500aea5afc82017b054a
Author: zilongshanren <guanghui8827@126.com>
Date:   Sat Nov 14 08:28:57 2015 +0800

    horizontal shrink still has a issue

commit 7e8abc0990cdf299d23c8072c5c1d4aa561bf798
Author: zilongshanren <guanghui8827@126.com>
Date:   Fri Nov 13 11:42:34 2015 +0800

    finish shrink without wrap

commit c9c45bd1f304ba00a6f9a274fa5631659a075bc1
Author: zilongshanren <guanghui8827@126.com>
Date:   Fri Nov 13 10:09:46 2015 +0800

    update shrink

commit ad82010ea846679e4d1a09f5127be29ae2e6adae
Author: zilongshanren <guanghui8827@126.com>
Date:   Thu Nov 12 17:55:15 2015 +0800

    refactor shrink logic

commit effc1ee1cd9f06eaa4f46dd5c2a1401f6a285af6
Author: zilongshanren <guanghui8827@126.com>
Date:   Wed Nov 11 18:25:34 2015 +0800

    add resize overflow type

commit 194d552adc2a4ba2c439eff969b082556315e0ae
Author: zilongshanren <guanghui8827@126.com>
Date:   Wed Nov 11 11:49:51 2015 +0800

    no wrap, shrink is working.

commit e2222ef14d5392817bd727895b3c2caec5ce4faf
Author: zilongshanren <guanghui8827@126.com>
Date:   Tue Nov 10 16:16:27 2015 +0800

    add overflow type to label.

    1. optimize the testcase

commit b65e2de4bfb3cb86a0d0cfa118be891a3f9fe858
Author: zilongshanren <guanghui8827@126.com>
Date:   Mon Nov 9 17:22:34 2015 +0800

    finish bmfont wrap by char

commit f339ff0309dc9e2ca2871f03f4551d329afce5e1
Author: zilongshanren <guanghui8827@126.com>
Date:   Mon Nov 9 17:04:51 2015 +0800

    finish bmfont wrap by word

commit 4c8edc65204a1294ac81315e72f1299acbdf43c0
Author: zilongshanren <guanghui8827@126.com>
Date:   Mon Nov 9 11:29:21 2015 +0800

    add BMFont size support

commit 3282481bda9dcb0f88b41f2568f7e5c856af6d53
Author: zilongshanren <guanghui8827@126.com>
Date:   Mon Nov 9 09:58:01 2015 +0800

    add font size support for BMFONT

commit 0c8e2a0374983625507a183cb2eb53a0b1709e25
Author: zilongshanren <guanghui8827@126.com>
Date:   Fri Nov 6 16:36:27 2015 +0800

    add toggle wrap option.

    1. make hirozontal clamp working

commit 19dcd3e80a34c54b20934d08937eb270e689a7db
Author: zilongshanren <guanghui8827@126.com>
Date:   Fri Nov 6 15:12:59 2015 +0800

    tweak label layout

commit e36a40babf4817ea7e9830614ac7560f2e69c583
Author: zilongshanren <guanghui8827@126.com>
Date:   Thu Nov 5 11:11:02 2015 +0800

    finish the test skeleton

commit a144a3a5d388d15c4f37cbfc12563eccabffb8e1
Author: zilongshanren <guanghui8827@126.com>
Date:   Wed Nov 4 16:38:54 2015 +0800

    add setFontSize api to label.

    1. add new chinese-english bmfont
    2. beautify base test

commit b22551c9eb3738fbb1c38ae4a3bfd07a202dcaf0
Author: zilongshanren <guanghui8827@126.com>
Date:   Wed Nov 4 11:27:18 2015 +0800

    add label layout test skeleton
 2015-11-19 16:06:13 +08:00
Jeff Wang efeae1eae9 add a test case for pr 14327 2015-11-18 22:52:47 +08:00
zilongshanren 5d8cfa889c Merge pull request #14252 from neokim/change_pageview_to_derive_from_listview 
Change PageView to derive from ListView
 2015-11-17 12:02:10 +08:00
zilongshanren a5b7674b4d Merge pull request #14263 from zilongshanren/improve-scale9sprite-v4 
improve scale9sprite
 2015-11-17 10:48:09 +08:00
Neo Kim 603d788fbf PageView - Fix that page indicator was not working well in vertical page view. 2015-11-15 22:49:42 +09:00
fnz d86d32fb09 constexpr for signature, garbage collection and compile-time error for unsupported argument types 2015-11-10 23:39:16 +03:00
Neo Kim 9cbbd283c7 PageView - Deprecate the APIs related to custom scroll threshold. 2015-11-10 21:35:01 +09:00
Бесшапошников Никита 89798d949b [js-tests] Test case for Scale9Sprite fade actions with cascade opacity enabled 
Test case for https://github.com/cocos2d/cocos2d-html5/pull/3181
 2015-11-10 15:13:05 +03:00
fnz 23118cb587 fix missing include 2015-11-08 01:26:15 +03:00
fnz ef89025d4b fix missing include 2015-11-08 00:25:02 +03:00
fnz 80e8b58b53 easy jni 2015-11-07 23:57:05 +03:00
XiaoFeng 668558b99f Fix when leave "ComponentTest" scene, background music still go on playing in lua-test under Android system 2015-11-06 11:38:41 +08:00
pandamicro a74c8ccded Merge pull request #14292 from xiaofeng11/v3 
Fix "BillBoard Test->Rotation Test" won't resume after switch back from background.
 2015-11-03 17:46:34 +08:00
pandamicro 6010879ecf Merge pull request #14305 from pandamicro/v3 
[ci skip] Fix SocketIO test on iOS 9
 2015-11-03 17:27:21 +08:00
pandamicro 6a454d3eba Fix SocketIO test on iOS 9 2015-11-03 17:26:37 +08:00
zhangcheng 39f68e9885 Update ccs-res submodule to the latest. 2015-11-03 13:08:56 +08:00
XiaoFeng 8e6e46d596 Fix "BillBoard Test->Rotation Test" won't resume after switch back from background. 2015-11-02 14:50:45 +08:00
XiaoFeng 0c8aed8a1a Remove redundancy code 2015-11-02 13:40:08 +08:00
pandamicro 0d6bf3263b Improve js templates with noCache and cc.view.setRealPixelResolution docs 2015-11-01 18:33:05 +08:00
zilongshanren 3e2094981f add scale9sprite rendering type test 2015-10-30 14:01:01 +08:00
zilongshanren f84c2de1e2 add sprite and scale9sprite batch test 2015-10-30 09:58:02 +08:00
zilongshanren 1417534194 add rendering type to scale9sprite 2015-10-29 23:13:36 +08:00
pandamicro b66fa04c21 Merge pull request #14255 from xiaofeng11/v3_23634 
Fix "UItest->UicheckBox" display status, make it same as C++ version
 2015-10-28 18:32:49 +08:00
XiaoFeng 53d2874507 Fix "UItest->UicheckBox" display status, make it same as C++ version 2015-10-28 17:38:17 +08:00
Neo Kim 543fff63fb PageView - Add indicators to some test cases 2015-10-28 17:23:08 +09:00
Neo Kim abc309edb2 PageView - Replace the deprecated APIs with new ones. 2015-10-28 16:57:54 +09:00
Neo Kim b9a4449494 PageView - Add `handleReleaseLogic()` for page view. 2015-10-28 16:56:35 +09:00
Neo Kim 97acf52cc8 PageView - Replace the legacy methods of `PageView` with the ones of `ListView`. 2015-10-28 16:56:34 +09:00
Neo Kim e567259826 PageView - Change `PageView` to derive from `ListView` and use `ScrollView::Direction` instead of `PageView::Direction`. 2015-10-28 16:56:34 +09:00
Neo Kim a09f2af14c PageView - Trivial change on test code 2015-10-28 16:56:34 +09:00
pandamicro 15e400fb2e Merge pull request #14248 from xiaofeng11/v3_23634 
Fix "PhysicsTest->Fixed Update Test" under lua-test perform in wrong status.
 2015-10-28 15:49:52 +08:00
XiaoFeng 80b2def648 Fix "PhysicsTest->Fixed Update Test" under lua-test perform in wrong status. 2015-10-28 14:12:24 +08:00
pandamicro 5a963c66cd Merge pull request #14240 from neokim/android_test_app_landscape_reversible 
Change the android test app to be landscape reversible.
 2015-10-28 13:03:33 +08:00
XiaoFeng c55f030218 Fix "Test change animation intenal" under js test can not change back to 60fps 2015-10-28 11:18:12 +08:00
Neo Kim 11b46a7b04 Change the android test app to be landscape reversible. 2015-10-27 20:43:56 +09:00
pandamicro aa9f0d5bd5 Merge pull request #14049 from CodeAndWeb/v3-sprite-polygoninfo-from-plist 
Extending SpriteFrameCache to read PolygonInfo from atlas plist file
 2015-10-27 17:28:22 +08:00
pandamicro 175f4c02ad Merge pull request #14197 from xiaofeng11/v3_xf 
Fix CCDownloader-curl will crash in js-test & Fix broken image link in TextureCacheTest.js
 2015-10-22 14:45:20 +08:00
pandamicro 43c19fd1e7 Merge pull request #14205 from pandamicro/v3 
Fix Scheduler API inconsistency
 2015-10-21 22:11:16 +08:00
pandamicro 9eeda122e9 Fix Scheduler API inconsistency 2015-10-21 22:10:48 +08:00
Dale Stammen 3f359381dc moved file to correct folder in vcxproj 2015-10-20 10:07:30 -07:00
Dale Stammen f9d8907697 updated winrt temporary app certificates expiration dates 2015-10-20 07:39:42 -07:00
XiaoFeng 3d626940af Roll back debug commented code 2015-10-20 17:23:31 +08:00
XiaoFeng 7e54a91ee6 Fix CCDownloader-curl will crash in js-test 
Fix broken image link in TextureCacheTest.js
 2015-10-20 16:28:03 +08:00
pandamicro 3bf0d0fe44 Merge pull request #14168 from MSOpenTech/v3-win10-fix 
V3: fixed msbuild by removing incorrect AppxBundle properties from project
 2015-10-19 08:22:24 +08:00
pandamicro cde67d1261 Merge pull request #14162 from mogemimi/fix-warnings 
Fix warnings on Xcode 7
 2015-10-18 22:56:12 +08:00
pandamicro c365fc5883 Merge pull request #14180 from pandamicro/v3 
Fix issue for web engine upgrade
 2015-10-18 22:48:16 +08:00
pandamicro 11890d6c4b Fix issue for web engine upgrade 2015-10-18 00:19:02 +08:00
Dale Stammen e2730a3d92 fixed msbuild by removing incorrect AppxBundle properties from project 2015-10-16 09:25:24 -07:00
mogemimi 73c0ce1a9a Replace String::createWithFormat() with StringUtils::format() 2015-10-16 15:02:14 +09:00
mogemimi 4600c41f9b Add override keywords 2015-10-16 15:01:10 +09:00
pandamicro efeb6a44fb Merge pull request #14143 from MSOpenTech/v3-win10-curl 
V3 win10 curl
 2015-10-16 13:35:48 +08:00
pandamicro e789ab97be Merge pull request #14139 from super626/v3 
fix obb performance test
 2015-10-15 16:00:51 +08:00
Dale Stammen 3e3e47de10 added Win10 UWP curl support 2015-10-14 16:47:52 -07:00
pandamicro 1c085c96f1 Merge pull request #14136 from songchengjiang/cocos2d-v3-bugfix 
fix lua Scene3DTest "back" button not working issue
 2015-10-14 14:01:58 +08:00
yangxiao 85f40de424 fix obb performance test 2015-10-14 13:43:02 +08:00
songchengjiang 29c5ca6ea9 fix the #23309 bug 2015-10-14 11:23:11 +08:00
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
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