Commit Graph

464 Commits

Author SHA1 Message Date
肖峰 bb832f8d60 Add 3d touch support to iOS 9.0 or higher version on iPhone6s or later device 2015-12-01 13:02:53 +08:00
pandamicro 955ddaafb7 Use rooted object for js_proxy new and get (missed) 2015-11-27 10:20:04 +08:00
pandamicro d23ffe4fc7 Fix some issue of js_type_class usage 2015-11-27 10:16:11 +08:00
pandamicro ae2b75c8be Fix issues causing by temporary RootedObject passed as function parameters 2015-11-27 01:35:06 +08:00
pandamicro a6fdd9aa09 Improve js template documentation 2015-11-24 16:31:14 +08: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
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 6a454d3eba Fix SocketIO test on iOS 9 2015-11-03 17:26:37 +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
pandamicro 0d6bf3263b Improve js templates with noCache and cc.view.setRealPixelResolution docs 2015-11-01 18:33:05 +08:00
XiaoFeng 53d2874507 Fix "UItest->UicheckBox" display status, make it same as C++ version 2015-10-28 17:38:17 +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
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 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 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
mogemimi 4600c41f9b Add override keywords 2015-10-16 15:01:10 +09: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
zhangcheng 77062acfa7 Fix Bug #23321 2015-10-08 14:48:38 +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 91928aa23d Add ComponentJS test case and fix windows platforms 2015-09-26 19:43:36 +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
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
ZhangMenghe 26358c9c2c DrawLabel Mode testcase 2015-09-21 11:05:21 +08:00
ZhangMenghe 4054686903 Testcase for multiple items in scrollView 2015-09-21 10:24:44 +08:00
zhangting bb8d9a4145 add testcase for writeDataToFile to jstests 2015-09-20 16:46:54 +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
ZhangMenghe 6e4d39e909 s9sprite action testcase 2015-09-18 09:45:43 +08:00
ZhangMenghe 5f8351ea32 UItestcase modification to be friendly 2015-09-14 15:31:25 +08:00
zhangbin edb964a673 Remove the performance related config in project.json. 2015-09-11 16:03:07 +08:00
zhangbin 8e9928ad99 Remove performance tests from lua-tests & js-tests. 2015-09-11 10:53:17 +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
江龙 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
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
江龙 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
ZhangMenghe f3190206e0 Remove clickAndMove testcase 2015-09-01 14:21:08 +08:00
WenhaiLin a3b5becb45 Sync v3.8 to v3 2015-08-31 22:05:37 +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
ZhangMenghe 1bcc2dec37 Notification effect enhancement 2015-08-21 10:20:59 +08:00
Dale Stammen d55bc653e0 update c++ debug info settings 2015-08-20 13:25:17 -07: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
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
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
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
ZhangMenghe eaa5643c7c Fix invisiable testcase of effects 2015-08-17 17:26:25 +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
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
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
子龙山人 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
andyque 9a83ed9b28 remove unneeded protocol in AppController.h. 2015-08-12 13:55:36 +08:00
jianglong0156 fc5e2233e9 textfield not create, don't need open ime. 2015-08-12 11:22:36 +08:00
ZhangMenghe fc7dc66c05 Change to non-background 2015-08-12 10:09:11 +08:00
ZhangMenghe 417652cbbd Fix camera orbit testcase 2015-08-11 15:13:11 +08:00
ZhangMenghe abb5aff9ed Add testcase to issue3053 2015-08-11 14:06:00 +08:00
jianglong0156 89949248de sort the testcase by title. 2015-08-11 11:22:01 +08:00
jianglong0156 8a8515e998 fix the menu label size error 2015-08-11 11:21:19 +08:00
jianglong0156 32223348cb fix vigrate resource error, and hide the vibrateTest in web 2015-08-10 17:27:28 +08:00
jianglong0156 e3f09d03b1 Merge branch 'v3' into fixJstestsReleaseError 2015-08-10 16:01:27 +08:00
jianglong0156 9a46b3b3b1 fix js-tests can't use cocos run -p web -m release 2015-08-10 15:10:54 +08:00
pandamicro 940b53e271 Merge pull request #13292 from natural-law/v3
[ci skip] Add copy resources config of js-tests for web platform.
2015-08-10 15:09:33 +08:00
zhangbin f91908d651 Add copy resources config of js-tests for web platform. 2015-08-10 12:00:53 +08:00
子龙山人 f6569f24f4 Merge pull request #13273 from zilongshanren/android-editbox-reimplement-fix
Re-implement Editbox on Android platform.
2015-08-09 10:25:19 +08:00
pandamicro 7f215e97ff Merge pull request #13275 from jianglong0156/fixWebinitError
[ci skip]fix error tips in web
2015-08-07 20:26:39 +08:00
jianglong0156 99a52a34cb fix error tips in web 2015-08-07 18:29:45 +08:00
andyque a35e89225e Re-implement Editbox on Android platform.
This PR also fixed issue:

https://github.com/cocos2d/cocos2d-x/issues/9572

For the new EditBox:

1. Added a ResizeLayout for updating layout when soft keyboard is shown.
This is because some Android devices won't refresh the view and when
the view is panned, the native EditText will turn black. This is really
a hack, but it works for many Android devices from 2.3 to 5.0.

When keyboard is beginning to show, the ResizeLayout's doLayout
method will be called 24 frames per second. Once the keyboard is closed,
or the user begins to input, the doLayout method will be disabled.

2. EditText is working in a different UI thread, so all the data
are passed to GL thread via callbacks in UI thead.

3. It also overrides onKeyDown method in Cocos2dxEditBox.
When the EditText got the focus, users could press back key to exit
the game. This behavior is not allowed. We give developer the choice to
handle back key event manually.
2015-08-07 17:27:15 +08:00
pandamicro c794523613 Merge pull request #13260 from ZhangMenghe/v3-tileMap
TileMap Testcase abnormal
2015-08-07 11:52:28 +08:00
ZhangMenghe 7753a07359 TileMap Testcase abnormal 2015-08-07 11:20:17 +08:00
pandamicro d182c37f29 Merge pull request #13257 from ZhangMenghe/v3-UItestcase
UIScene testcase modification
2015-08-07 09:47:42 +08:00
ZhangMenghe 0ddd4e4a5b UIScene testcase modification 2015-08-07 09:30:22 +08:00
VisualSj ca82f41c1b Add loader tests 2015-08-06 19:03:26 +08:00
pandamicro 7a758bb961 Merge pull request #13243 from jianglong0156/fixExitButton
[ci skip]fix the close button function in main list frame
2015-08-06 17:33:47 +08:00
pandamicro ad4c349800 Merge pull request #13245 from ZhangMenghe/v3-1586bugfix
Fix offset on retina screen in shaderTest
2015-08-06 17:27:47 +08:00
ZhangMenghe 91ae9e07b6 Fix offset on retina screen in shaderTest 2015-08-06 15:14:13 +08:00
jianglong0156 482b8f3583 fix the close button function in main list frame 2015-08-06 14:14:52 +08:00
pandamicro 6831e24deb Merge pull request #13198 from ZhangMenghe/v3-UItestcase
[ci skip]Modify UItestcase structure
2015-08-05 19:06:11 +08:00
pandamicro 5faf7a9d76 Merge pull request #13209 from ZhangMenghe/v3-textfield
[ci skip]textField cc.vertext to cc.p
2015-08-05 15:48:16 +08:00
ZhangMenghe 88cb3ab711 textField cc.vertext to cc.p 2015-08-05 11:59:36 +08:00
pandamicro 8cdcade07a Merge pull request #13186 from jianglong0156/addEmotionTest
fix getStringUTFChars bug
2015-08-05 10:19:19 +08:00
ZhangMenghe f01f21d06f Modify UItestcase structure 2015-08-04 17:13:17 +08:00
jianglong0156 ee7e7d237f improve the test case 2015-08-04 11:40:10 +08:00
jianglong0156 36e8e9740a improve the test case 2015-08-04 11:30:55 +08:00
VisualSj 479676cbd8 [js-tests] add Change skin tests 2015-08-03 18:10:31 +08:00
pandamicro 80a207ae43 Merge pull request #13172 from jianglong0156/addEmotionTest
add emotion bug test current nothing will show
2015-08-03 16:36:47 +08:00
jianglong0156 f9b6d6b670 add emotion bug test 2015-08-03 16:09:45 +08:00
pandamicro 9393daaf8f Add test for PhysicsSprite bug#11618 2015-08-03 11:07:27 +08:00
pandamicro 3c2e66e425 Merge branch 'v3.7.1' of https://github.com/cocos2d/cocos2d-x into v3
# Conflicts:
#	.travis.yml
#	build/cocos2d_js_tests.xcodeproj/project.pbxproj
#	build/cocos2d_tests.xcodeproj/project.pbxproj
#	cocos/2d/CCFont.h
#	cocos/2d/CCFontAtlas.cpp
#	cocos/2d/CCFontAtlas.h
#	cocos/2d/CCFontFreeType.cpp
#	cocos/2d/CCFontFreeType.h
#	cocos/2d/libcocos2d_8_1/libcocos2d_8_1/libcocos2d_8_1.Windows/libcocos2d_8_1.Windows.vcxproj
#	cocos/2d/libcocos2d_8_1/libcocos2d_8_1/libcocos2d_8_1.WindowsPhone/libcocos2d_8_1.WindowsPhone.vcxproj
#	cocos/2d/libcocos2d_win10/libcocos2d.vcxproj
#	cocos/cocos2d.cpp
#	cocos/platform/android/jni/Java_org_cocos2dx_lib_Cocos2dxHelper.cpp
#	cocos/scripting/js-bindings/auto/jsb_cocos2dx_studio_auto.cpp
#	templates/cpp-template-default/proj.ios_mac/HelloCpp.xcodeproj/project.pbxproj
#	templates/js-template-default/frameworks/runtime-src/proj.ios_mac/HelloJavascript.xcodeproj/project.pbxproj
#	templates/js-template-runtime/frameworks/runtime-src/proj.ios_mac/HelloJavascript.xcodeproj/project.pbxproj
#	templates/lua-template-default/frameworks/runtime-src/proj.ios_mac/HelloLua.xcodeproj/project.pbxproj
#	tests/cpp-tests/Classes/LabelTest/LabelTestNew.cpp
#	tests/cpp-tests/Classes/LabelTest/LabelTestNew.h
#	tools/bindings-generator
#	tools/simulator/frameworks/runtime-src/proj.ios_mac/simulator.xcodeproj/project.pbxproj
#	tools/travis-scripts/generate-bindings.sh
#	tools/travis-scripts/generate-cocosfiles.sh
#	tools/travis-scripts/travis_mac.yml
2015-08-02 22:28:27 +08:00
jianglong0156 69040ef472 add Physics3DHingeConstraint support constructor
add Physics3DSliderConstraint support constructor
add Physics3DConeTwistConstraint support constructor
add Physics3D6DofConstraint support constructor
add PhysicsSprite3D support constructor
2015-08-01 16:18:00 +08:00
jianglong0156 bcec599993 Merge branch 'v3' into constructedWith3D_3#12404 2015-08-01 15:38:26 +08:00
pandamicro d52a5da1d8 Merge pull request #13114 from jianglong0156/constructedWith3D_2#12404
Constructed with3d
2015-08-01 10:09:08 +08:00
pandamicro 93c40d01c5 Merge pull request #13144 from WenhaiLin/v3.8-gradle-update
[Android Studio Projects]Update Gradle from 2.2.1 to 2.4
2015-08-01 09:59:54 +08:00
WenhaiLin 875d01573a [Android Studio Projects]Update Gradle from 2.2.1 to 2.4 2015-07-31 21:20:42 +08:00
jianglong0156 80e812e5a0 add Physics3DShape support constructor 2015-07-31 18:17:35 +08:00
VisualSj 04b05776a6 [JS-TESTS] Div should be black 2015-07-31 17:16:57 +08:00
pandamicro 3fa016a280 Fix win32 project and add winrt support 2015-07-30 23:39:52 +08:00
jianglong0156 113233b8df add Camera support constructor 2015-07-30 18:00:51 +08:00
jianglong0156 b016b642ce add Terrain support constructor 2015-07-30 17:17:57 +08:00
pandamicro 8d8c7fe14b Complete AudioEngineTest 2015-07-30 17:14:08 +08:00
jianglong0156 0f9483a0e3 add SpotLight support constructor 2015-07-30 15:21:35 +08:00
jianglong0156 8d3ceb7ac2 add PointLight support constructor 2015-07-30 15:11:37 +08:00
pandamicro f53ba42b3b Fix test issues and Add audio engine to js templates 2015-07-29 21:22:44 +08:00
pandamicro 9972bfb98c Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into audioengine
# Conflicts:
#	tests/js-tests/src/NativeTest/NativeTest.js
2015-07-29 21:01:56 +08:00
pandamicro 347854e8d3 Add Audio Control test case 2015-07-29 20:48:11 +08:00
zhangbin e30d84bca0 Solve the error in .cocos-project.json of js-tests. 2015-07-29 17:10:19 +08:00
pandamicro 36b7ba5b75 Merge pull request #13081 from natural-law/v3
Remove unused config in android project of js-tests.
2015-07-29 17:00:26 +08:00
pandamicro 16b03f0ebe Merge pull request #13065 from pandamicro/widget_onEnter
Ensure C++ classes onEnter, onExit can be safely override in JS
2015-07-29 15:36:12 +08:00
zhangbin 6fe880bee5 Remove unused config in android project of js-tests. 2015-07-29 15:35:59 +08:00
pandamicro cc63ff5c03 Fix indent 2015-07-28 18:37:57 +08:00
pandamicro 6c16a4b990 Add test cases for extended classes in JSB 2015-07-28 18:25:11 +08:00