Commit Graph

2612 Commits

Author SHA1 Message Date
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
Liam 68f25f65c4 update submodule 2015-10-08 14:59:48 +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 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
Michael Kösel 744b7f54c9 Fix wrong debug check 2015-09-26 16:58:26 +02: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
zilongshanren 1c40f7b61b CCScrollView should override removeChild
Fixed issue: https://github.com/cocos2d/cocos2d-x/issues/8396
2015-09-21 11:35:11 +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
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 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 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
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 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
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
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
子龙山人 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
Neo Kim 22b2f8b7b3 ListView - Change the order of test cases and fix for windows builds. 2015-09-11 16:00:53 +09: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
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
yangxiao ff85173b4b remove cached material switch test demo 2015-09-09 11:13:17 +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
yangxiao 7f7b4f83c4 add outline material 2015-09-08 15:33:24 +08:00
yangxiao f944750627 add material cache 2015-09-08 15:29:54 +08:00
yangxiao 2076071e8f outline test using material file 2015-09-08 14:13:53 +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
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
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
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
yangxiao 8499400514 motionstreak3d test demo 2015-09-01 10:39:31 +08:00
Vincent Yang cf664800ac refine #22483 : Restructure CCDownload Interface and implements on iOS. 2015-08-28 16:40:11 +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
Dale Stammen d55bc653e0 update c++ debug info settings 2015-08-20 13:25:17 -07: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 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
子龙山人 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 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
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
WenhaiLin ae836bd364 cpp-tests[win32 project]:Fixed link errors in release mode. 2015-08-17 17:43:36 +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
WenhaiLin aeca6ae024 DownloaderAsyncTest:Fixed crash cause by double-click `start download` button. 2015-08-17 10:16:04 +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
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
Vincent Yang 295dcde2a8 Modify test case SchedulerPauseResumeAll and SchedulerPauseResumeAllUser. 2015-08-13 14:38:51 +08:00
Vincent Yang d333d24177 Fix bug: timer dt time error when interval = 0. 2015-08-13 12:55:07 +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
子龙山人 f78ebf5843 Merge pull request #13312 from super626/animate3d
Modify CCLOG to cocos2d::log
2015-08-12 13:57:31 +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
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
子龙山人 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
Vincent Yang 47ecb246b8 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into bug_21906 2015-08-11 14:24:02 +08:00
yangxiao 7b04dbca88 modify CCLOG to cocos2d::log 2015-08-11 11:54:08 +08:00
Vincent Yang d0a5c02399 fix bug: #21906 Pause/Resume 's result not correct. 2015-08-10 17:58:49 +08:00
Vincent Yang 0d1dfbc440 Fix bug: #21861 cpp-tests->Node:Sprite->Testing Sprite BatchNode's effect not correct. 2015-08-10 17:07:46 +08:00
Huabing.Xu d848da0e7d change max parsing count to 5000 2015-08-10 16:41:16 +08:00
fusijie 4965a9a11c fix retro effect pos bug. 2015-08-10 16:32:24 +08:00
Huabing.Xu ea9d6e7997 refine test case to be more testing friendly 2015-08-10 16:12:15 +08:00
Huabing.Xu b7c624805e fix material parsing crash on WP8.1 because memory exhausted 2015-08-10 15:51:26 +08:00
Huabing.Xu 0dee83b154 fix shader test crash 2015-08-10 14:40:54 +08:00
pandamicro acc5754f5e Merge pull request #13269 from WenhaiLin/v3.8-audioengine-addtestcase
Add test case for issue 11143.
2015-08-10 11:39: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 e825160750 Merge pull request #13266 from super626/fixtest
Fix Sprite3D test background to foreground bug
2015-08-08 19:44:41 +08:00
pandamicro 395b6cb91f Merge pull request #13263 from super626/v3
avoid to trigger touch event multiple times
2015-08-08 17:58:41 +08:00
pandamicro 6644b06643 Merge pull request #13271 from WenhaiLin/v3.8-minorproblem-fix
Fixed minor problems in test cases.
2015-08-08 12:04:30 +08:00
肖峰 4575587cf7 Fix cocostudio 3d test crash on mobile platform 2015-08-08 11:57:40 +08:00
geron-cn 744fd74b3b make skeleton's debugdraw contorls all subbone's debug draw 2015-08-08 00:39:01 +08:00
WenhaiLin 772dab2002 Fixed minor problems in test cases. 2015-08-07 23:08:49 +08:00
pandamicro 4fe7c6de2a Revert "remove unused code" 2015-08-07 20:21:24 +08:00
pandamicro 5293dcb5bb Merge pull request #13274 from super626/animate3d
remove unused code
2015-08-07 20:05:14 +08:00
yangxiao d74245bfa9 remove unused code 2015-08-07 18:03:50 +08:00
Vincent Yang 354f64ec51 fixed bug #21800 [CppTest]Node: Scene3D when player outof terrain app will no response. 2015-08-07 17:36:35 +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
WenhaiLin 5c33f2f6ed Add test case for issue 11143. 2015-08-07 16:50:54 +08:00
yangxiao 544c96385a fix background to foreground 2015-08-07 16:16:43 +08:00
yangxiao d744554a4b avoid to trigger touch event multiple times 2015-08-07 15:09:01 +08:00
andyque 211dde38e9 Fix improper touch intercept event propagation.
When the container widget is disabled, it shouldn't intercept touch.

https://github.com/cocos2d/cocos2d-x/issues/8316
2015-08-06 22:50:53 +08:00
子龙山人 a0a34deb78 Merge pull request #13242 from WenhaiLin/v3.8-cpptests-freeze
CppTests: Avoid freeze when the program crashed on Android.
2015-08-06 15:03:30 +08:00
WenhaiLin ffda8ace82 CppTests: Avoid freeze when the program crashed on Android. 2015-08-06 13:50:15 +08:00
子龙山人 41afa9695c Merge pull request #13230 from WenhaiLin/v3.8-label-space-lost
Spaces should not be lost if label created with Fingerpop.ttf
2015-08-06 11:01:35 +08:00
WenhaiLin e81d5af12d Spaces should not be lost if label created with Fingerpop.ttf 2015-08-05 23:46:41 +08:00
子龙山人 05e88ad279 Merge pull request #13211 from fusijie/v3
[ci skip]fixed title.
2015-08-05 16:59:37 +08:00
fusijie 6072cf9a9d [ci skip]fixed title. 2015-08-05 15:47:59 +08:00
WenhaiLin 2c220092e6 Fixed FontAtlasCache::purgeCachedData might cause crash. 2015-08-05 14:12:02 +08:00
pandamicro 25cb0d2896 Merge branch 'v3.7.1' of https://github.com/cocos2d/cocos2d-x into v3
# Conflicts:
#	web
2015-08-03 19:47:56 +08:00
pandamicro 4b7b85f113 Merge pull request #12889 from fusijie/fix_clippingRectangle_bug
remove CCClippingRectangleNode transform error support.
2015-08-03 18:01:01 +08:00
geron-cn d00e54ad8a remove comment in test case 2015-08-03 16:55:55 +08:00
pandamicro b13fddb18e Merge pull request #13162 from super626/v3
Terrain: Add light map support
2015-08-03 15:37:42 +08:00
yangxiao 0de2a3b33d add terrain test with light map 2015-08-03 14:02:46 +08:00
pandamicro 702e667143 Merge pull request #13152 from zilongshanren/addVerticalPageView
add PageView vertical scroll support
2015-08-03 13:00:48 +08:00
yangxiao 8a6c49b5a3 merge cocos 2015-08-03 09:54:29 +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
pandamicro 00a3d572d1 Merge pull request #12899 from super626/v3
Animate3D Callback and Bug fix
2015-08-01 18:24:05 +08:00
andyque 5f34c1f072 add PageView vertical scroll support 2015-08-01 18:18:46 +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
pandamicro 3bdc7e4e1e Merge pull request #13138 from fusijie/fix_spritepolygon_setflip
fix polygon sprite setFlipped bug.
2015-08-01 09:59:25 +08:00
WenhaiLin 875d01573a [Android Studio Projects]Update Gradle from 2.2.1 to 2.4 2015-07-31 21:20:42 +08:00
fusijie dcef1e9d31 fix polygon sprite setflipped bug. 2015-07-31 15:49:44 +08:00
pandamicro aed6b0719e Merge pull request #13089 from yangws/issue_12692
Fixed #12692 : UILayout viewing area cutting position calculation error
2015-07-31 12:02:00 +08:00
pandamicro ede9195d14 Merge pull request #13073 from super626/fixtest
Bug Fix
2015-07-31 09:58:14 +08:00
pandamicro c9d23805e7 Merge pull request #12978 from yangws/issue_12249
Fixed #12249 : Button touch doesn't work with setScale9Enabled.
2015-07-31 09:54:38 +08:00
pandamicro c0066f9afd Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into audioengine 2015-07-30 20:25:57 +08:00
pandamicro 9b5c8d5d12 Merge pull request #12601 from super626/physics3d
3d physics collider
2015-07-30 18:19:23 +08:00
pandamicro 8d8c7fe14b Complete AudioEngineTest 2015-07-30 17:14:08 +08:00
pandamicro 39721c6eb6 Merge pull request #13105 from fusijie/fix_10487
fix Sprite/Label/FastTMX auto-culling bug.
2015-07-30 17:12:37 +08:00
fusijie 17c7848e62 fix FastTiledMap auto-culling bug. 2015-07-30 15:07:03 +08:00
fusijie f91a58c8ff fix Label auto-culling bug. 2015-07-30 13:59:50 +08:00
子龙山人 6818a97311 Merge pull request #13104 from fusijie/fix_cpptests_androidstudio_compile
[ci skip]fix android studio compile error.
2015-07-30 11:59:05 +08:00
fusijie d2181e137e fix android studio compile error. 2015-07-30 11:55:33 +08:00
子龙山人 c039c7a9bd Merge pull request #13084 from WenhaiLin/v3.8-label-df-contentsize-fix
Fixed the content size of Label is incorrect with GLOW effect.
2015-07-30 11:29:48 +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 07fdea50de Refine C++ test case 2015-07-29 20:47:38 +08:00
Vincent Yang e1d4d22353 Fixed #12692 : UILayout viewing area cutting position calculation error 2015-07-29 18:43:11 +08:00
WenhaiLin a9f27865d3 Fixed the content size of Label is incorrect with GLOW effect. 2015-07-29 16:30:07 +08:00
tangziwen cee43ccebb update terrain again 2015-07-29 14:32:36 +08:00
yangxiao ad80c11235 sync render state 2015-07-29 10:35:37 +08:00
geron-cn 7e05538521 ADD SKELETON NEST TEST CASE 2015-07-29 10:23:03 +08:00
pandamicro 81842417c4 Merge pull request #13032 from xiaofeng11/v3
Fix issue https://github.com/cocos2d/cocos2d-x/issues/12968
2015-07-29 09:54:43 +08:00
geron-cn d2de5b1c85 add test case for bug: #13060 and #13005 2015-07-28 19:18:58 +08:00
pandamicro 66b21fb2a8 Merge pull request #12972 from yangws/issue_12145
Fixed #12145 : formarRenderers in RichText doesn’t update container s…
2015-07-28 17:13:26 +08:00
XiaoFeng bca6934786 Normalization function names 2015-07-28 14:05:56 +08:00
Vincent Yang b92733c402 Add items as protected children. 2015-07-28 11:38:21 +08:00
子龙山人 3a58668d71 Merge pull request #12744 from fusijie/fix_pageturndown
Fix PageTurn3D
2015-07-28 11:35:15 +08:00
pandamicro 3cc039b063 Merge pull request #13036 from fusijie/fix_12505
fix shader-basic testcase 'center' uniform error.
2015-07-27 15:40:44 +08:00
fusijie f8de67a0c4 fix shader-basic testcase 'center' uniform error. 2015-07-27 14:18:17 +08:00
子龙山人 7f383f961a Merge pull request #13026 from fusijie/fix_13025
fix 13025 wild pointer.
2015-07-27 13:38:38 +08:00
XiaoFeng f410fcd737 Fix issue https://github.com/cocos2d/cocos2d-x/issues/12968 2015-07-27 11:55:18 +08:00
子龙山人 bd0bdae530 Merge pull request #12993 from WenhaiLin/v3.8-label-layout-refine
Label:refine the implementation about text layout and support debug draw.
2015-07-27 11:10:31 +08:00
fusijie f2f425d19c fix 13025 wild pointer. 2015-07-27 10:39:31 +08:00
pandamicro 7ae3dd12a1 Merge pull request #12995 from fusijie/fix_12505
fix blur shader compliant on win8 universal.
2015-07-25 12:42:35 +08:00
pandamicro fa46a0abb4 Merge pull request #12992 from yangws/v3.7.1
Fixed #12962 : Scene can't have std::vector member.
2015-07-25 09:52:00 +08:00
pandamicro a666658764 Merge pull request #12998 from pandamicro/v3.7.1
Add BoneNode/SkeletonNode/SkinNode JS bindings
2015-07-24 23:42:38 +08:00
WenhaiLin a1e682ca65 Improves the test to reproduce issue 12996 2015-07-24 21:34:59 +08:00
fusijie 647848e843 fix blur sprite shader on win8 universal. 2015-07-24 21:04:44 +08:00
pandamicro 05bb775438 Sync timelineParser and fix issue 2015-07-24 20:16:56 +08:00
VisualSj 64d247d91b Issue #12997: Add JS test case (ccs.BoneNode) 2015-07-24 15:45:19 +08:00
fusijie bd0a57242b refine blur shader test case. 2015-07-24 13:52:40 +08:00
fusijie d550dace35 fix blur shader compliant on win8 universal. 2015-07-24 12:47:38 +08:00
geron-cn 0b09fd5bcb Merge branch 'v3.7.1' of github.com:cocos2d/cocos2d-x into 3.7.1
Conflicts:
	cocos/2d/libcocos2d.vcxproj.filters
	cocos/2d/libcocos2d_8_1/libcocos2d_8_1/libcocos2d_8_1.Shared/libcocos2d_8_1.Shared.vcxitems.filters
	tests/cpp-tests/Classes/ExtensionsTest/CocoStudioActionTimelineTest/ActionTimelineTestScene.cpp
	tests/cpp-tests/Classes/ExtensionsTest/CocoStudioActionTimelineTest/ActionTimelineTestScene.h
2015-07-24 11:38:09 +08:00
Vincent Yang e4a8aeee45 Fixed #12962 : Scene can't have std::vector member. 2015-07-24 11:16:45 +08:00
Dale Stammen 6669fec648 added missing bug test 2015-07-23 12:34:37 -07:00
Vincent Yang 35040e7bb1 Fixed #12249 : Button touch doesn't work with setScale9Enabled. 2015-07-23 17:27:04 +08:00
zhangcheng 012053e163 replace space to tab. 2015-07-23 17:04:08 +08:00
zhangcheng 4b8248c015 Optimization of Custom Data.
replace ComExtensionData to ObjectExtensionData.
2015-07-23 16:30:23 +08:00
geron-cn 7255b5308b config for mac 2015-07-23 15:13:14 +08:00
geron-cn d46c8c6802 add lack file 2015-07-23 15:12:09 +08:00
geron-cn 915cefa208 bone node 2015-07-23 11:51:49 +08:00
Ricardo Quesada b2b9bad83d improves the test to reproduce bug 12847 2015-07-22 15:08:36 -07:00
pandamicro 6029ca3edd Merge pull request #12949 from yangws/issue_12906
Fixed #12906 : Can't add custom member to cocos2d::Scene subclass.
2015-07-22 16:17:14 +08:00
Liam 99c1c33c61 update resource 2015-07-22 15:56:35 +08:00
pandamicro 741163db40 Merge pull request #12938 from WenhaiLin/v3.8-deps70
Update deps for support FullType.
2015-07-22 15:42:13 +08:00
pandamicro e0e5ae9d99 Merge pull request #12924 from liamcindy/SkyBox_3.7.1
update for Game3DNodeReader & UserCameraReader
2015-07-22 15:34:18 +08:00
子龙山人 bb9500769f Merge pull request #12885 from zilongshanren/add-jumpToPage-api
Fix PageView scrollToPage bug and the curPageIndex bug
2015-07-22 15:01:57 +08:00
fusijie 92e68cd9dc add sprite frame flash line bug test case. 2015-07-22 13:42:10 +08:00
Vincent Yang 3addf38134 Fixed #12906 : Can't add custom member to cocos2d::Scene subclass. 2015-07-22 12:01:34 +08:00
andyque fbfb3a9dac update ccs-res submodule 2015-07-22 10:45:18 +08:00
WenhaiLin 979a9be1f5 Add test case for test font supported by FullType. 2015-07-21 17:09:27 +08:00
pandamicro 85d4ce0d5a Merge branch 'v3.7-release' of https://github.com/cocos2d/cocos2d-x into v3
Conflicts:
	cocos/scripting/lua-bindings/auto/lua_cocos2dx_ui_auto.hpp
	docs/RELEASE_NOTES.md
	tools/cocos2d-console
	tools/tojs/cocos2dx.ini
2015-07-21 11:39:24 +08:00
pandamicro 641ff2abf4 Merge pull request #12914 from WenhaiLin/v3.8-label-bmfont-opacity
Label:Fixed opacity setting is invalid with bitmap font.
2015-07-20 18:02:49 +08:00
WenhaiLin 63326c2826 Label:Fixed opacity setting is invalid with bitmap font. 2015-07-20 11:10:17 +08:00
yangxiao beda48124c merge cocos 2015-07-17 17:54:00 +08:00
yangxiao ef49e5a169 merge cocos 2015-07-17 17:43:32 +08:00
子龙山人 22ef262295 Merge pull request #12894 from zilongshanren/fixXcode5Warning
fix xcode 5.1.1 warnings
2015-07-17 17:33:13 +08:00
子龙山人 309b563c5b Merge pull request #12896 from yangws/v3
[ci skip] Fix bug: the Back button in Node: UI->UIEditBoxTests click area has p…
2015-07-17 15:57:19 +08:00
Vincent Yang f9e90f31f6 Fix bug: the Back button in Node: UI->UIEditBoxTests click area has positoin offset. 2015-07-17 15:52:58 +08:00
andyque 8c31d70211 fix xcode 5.1.1 warnings 2015-07-17 15:20:49 +08:00
fusijie d828c030cb remove CCClippingRectangleNode transform error support. 2015-07-17 11:56:23 +08:00
子龙山人 89e5307f0c Merge pull request #12867 from WenhaiLin/v3.8-label-letter-color
Label:Fixed the color of letter will be overridden by fade action.
2015-07-17 11:29:58 +08:00
yangxiao bf20145e35 animate3d callback and test 2015-07-17 11:08:27 +08:00
WenhaiLin a6f8031af9 Label:support font that contains GB2312 char map.[except android] 2015-07-16 17:10:05 +08:00
andyque 96f6c44281 fix auto scrolling and curPageIdx issue 2015-07-16 16:50:47 +08:00
WenhaiLin d5d5af5ac3 change ‘auto’ to ‘auto&&’ 2015-07-16 14:08:59 +08:00
子龙山人 40f4e0b27b Merge pull request #12864 from zilongshanren/add-jumpToPage-api
add setCurPageIndex API to PageView.
2015-07-16 13:56:05 +08:00
andyque 517221a0df add jumpToPage API to PageView.
1. This commit also fix the default font size issue in ui::Button.
2015-07-16 11:33:57 +08:00
WenhaiLin 1c9a181c35 Label:Fixed the color of letter will be overridden by fade action. 2015-07-15 20:17:05 +08:00
songchengjiang 282dc23bb2 modify interfaces of Animate3DCallback 2015-07-15 17:34:14 +08:00
pandamicro 99e504e668 Merge pull request #12854 from yangws/issue_11310
fixed #11310 : multiple camera case utils::captureScreen bug.
2015-07-15 15:00:29 +08:00
andyque 2f31f6baa6 fixed Scale9Sprite gray state issue.
When call `setCapInsets`, the Scale9Sprite's inner sprite will be
rebuild and it's state will be lose.

This commit reset the shader state.
2015-07-15 14:35:13 +08:00
Vincent Yang 7a105ce1e1 fixed #11310 : multiple camera case utils::captureScreen bug. 2015-07-15 12:09:08 +08:00
andyque e4cad50c2f fix tons of warnings 2015-07-15 12:04:48 +08:00
songchengjiang 6c83e8d81c Merge branch 'v3' of https://github.com/super626/cocos2d-x into v3
Conflicts:
	tests/cpp-tests/Classes/Sprite3DTest/Sprite3DTest.cpp
2015-07-15 11:13:27 +08:00
andyque 91dfb07a8c add more descriptive message to ASSET macro. 2015-07-14 15:28:36 +08:00
andyque ef5d4ddf86 Merge remote-tracking branch 'upstream/v3' into v3
# Conflicts:
#	tests/cpp-tests/proj.win8.1-universal/cpp-tests.Shared/cpp-tests.Shared.vcxitems.filters
2015-07-14 11:24:38 +08:00
Vincent Yang 0589c14302 Restructure CCFileUtils class, move platform related functions to CCFileUtilsXXX.
Add TestIsDirectoryExist and TestUnicodePath in cpp-tests FileUtil test.
2015-07-14 09:44:36 +08:00
andyque fc673ee502 Merge branch 'v3.7-release' into v3 2015-07-13 22:44:54 +08:00
Vincent Yang 74227eaf16 Add TestIsDirectoryExist and TestUnicodePath in cpp-tests FileUtil test. 2015-07-13 22:44:40 +08:00
子龙山人 cdc7e5205b Merge pull request #11995 from MAUSMAUSgames/v3
using Action::_tag as flag field
2015-07-13 22:19:03 +08:00
子龙山人 c151ba89e5 Merge pull request #12774 from WenhaiLin/v3-label-createfail
Label:Fixed create fail if the font(TTF) not contain a Unicode charmap.
2015-07-13 21:58:39 +08:00
子龙山人 db71e073dd Merge pull request #12742 from WenhaiLin/v3-audioengine-preload
AudioEngine:support preload for audio
2015-07-13 17:06:17 +08:00
Vincent Yang e65b01bdc0 Merge pr11866: FileUtilsWin32 correct use all unicode version winapi. 2015-07-13 17:06:01 +08:00
WenhaiLin adfa6d4f0d Add test case for issue 12775 2015-07-13 15:38:33 +08:00
songchengjiang 5a16748273 optimize Animate3DCallback
add Animate3DCallbackTest
2015-07-13 11:43:13 +08:00
WenhaiLin 80dff7f1c4 Rollback pr12299 2015-07-13 11:32:25 +08:00
pandamicro c167e249cd Merge pull request #12790 from pandamicro/shaderNormal
Use shader with normal while creating mesh with normals
2015-07-12 21:47:05 +08:00
pandamicro 600568fdba Migrate test case from #10692 @babcca 2015-07-12 11:33:22 +08:00
Liam 4a53afc798 update for error resource,just for build 2015-07-10 17:24:35 +08:00
songchengjiang 21a8a8d567 fix mirrored Effect3DOutline 2015-07-10 16:30:45 +08:00
pandamicro c30ce38cb5 Merge pull request #12766 from super626/v3.7-release
Set default 3d animation quality to low
2015-07-10 15:35:22 +08:00
pandamicro 2d27091398 Merge pull request #12717 from jianglong0156/FileUtilsWriteFunctionMerge
add write api in FileUtils
2015-07-10 15:13:21 +08:00
songchengjiang a1956e2210 fix issue#9310 issue#10151 issue#12551 2015-07-09 18:05:47 +08:00
yangxiao 10fe728eee animation quality default to low, do not interpolation 2015-07-09 17:54:21 +08:00
Liam e50fc4f184 merge code 2015-07-09 17:12:48 +08:00
WenhaiLin 41bc3a1900 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3.8
Conflicts:
	AUTHORS
2015-07-09 11:11:34 +08:00
Liam c6ebaa19ec add scene 3d test 2015-07-09 10:19:07 +08:00
Jacky 02597eb369 Completed test case and comment. 2015-07-08 22:34:33 +08:00
Jacky 34d1cc0b1d refactory Effects test case. 2015-07-08 21:56:14 +08:00
Jacky 4a9e9f3744 completed api. 2015-07-08 17:26:29 +08:00
子龙山人 155ac8c07e Merge pull request #11583 from hannon235/v3-update-sio
Updates socket.io network extension to correctly detect and manage connection to socket.io server versions 0.9.x - 1.x
2015-07-08 16:11:05 +08:00
Jacky 260ce177d7 refine GridNode with rect. 2015-07-08 15:57:27 +08:00
WenhaiLin b395ef06d8 AudioEngine:support preload for audio[WIN32/WINRT 8.1/WP8.1] 2015-07-08 10:48:20 +08:00
XiaoFeng 8429cc1d90 Update CCDrawNode bug test 2015-07-08 09:35:29 +08:00
XiaoFeng 707b4d8b90 Fix windows universal project file 2015-07-07 19:44:18 +08:00
WenhaiLin 581f1ab42b Add test case 2015-07-07 15:41:54 +08:00
jianglong0156 abee4a376a add write api in FileUtils
bool writeStringToFile(std::string dataStr, const std::string& fullPath);
bool writeDataToFile(Data retData, const std::string& fullPath);
bool writeValueMapToFile(ValueMap& dict, const std::string& fullPath);
bool writeValueVectorToFile(ValueVector vecData, const std::string& fullPath);
and
formate the FileUtils code
2015-07-07 14:06:59 +08:00
子龙山人 f28fbdd0c4 Merge pull request #12683 from neokim/add_scroll_bar_into_scroll_view
Add scroll bar feature into ScrollView
2015-07-07 13:56:09 +08:00
肖峰 37674c3689 Add bug test to Mac & iOS cpp-test project 2015-07-07 11:17:08 +08:00
XiaoFeng a9dfd8012c Add new bug test to Android, Win 10, Win Universal, Linux project file 2015-07-07 11:02:00 +08:00
XiaoFeng 9a6ffd8904 Add bug test for PageView layout & CCNodeDraw::onDrawGLLine 2015-07-07 09:54:42 +08:00
jianglong0156 6f3b977c1e add UserDefault api deleteValueForKey 2015-07-06 17:01:17 +08:00
Neo Kim 3ab4285960 Refactor code 2015-07-04 16:06:05 +09:00
Neo Kim ceeca575f3 Replace 'margin' of scroll bar with 'positionFromCorner' 2015-07-04 14:05:47 +09:00
Neo Kim 60c32f6fb5 Refactor some codes 2015-07-04 09:56:53 +09:00
Neo Kim c093bb18e2 Add scroll bar manipulation methods into ScrollView 2015-07-04 09:56:52 +09:00
Neo Kim 2cae17b462 Add scroll bar feature into ScrollView 2015-07-04 09:56:52 +09:00
pandamicro 99bad19cff Merge pull request #12660 from pandamicro/merge-v3.7
Merge v3.7-release
2015-07-03 11:08:50 +08:00
pandamicro 48c99d2ac4 Merge pull request #12635 from yangws/v3_scene3dtest
Fix bug: spine animition can't show in Scene3DTest.
2015-07-03 11:04:23 +08:00
pandamicro 1b22438792 Merge branch 'v3.7-release' of https://github.com/cocos2d/cocos2d-x into merge-v3.7
Conflicts:
	cocos/ui/UICheckBox.cpp
2015-07-03 10:23:49 +08:00
子龙山人 5b971ee93d Merge pull request #12607 from neokim/add_radio_button_and_group
Add RadioButton and RadioButtonGroup widgets
2015-07-02 17:12:59 +08:00
Neo Kim 6550a9ccc2 Replace all tabs to 4 spaces to comply with the convention 2015-07-02 11:30:14 +09:00
Neo Kim 4b2bff4674 Change RadioButtonGroup not to be a node-parent of radio buttons but just a grouping node. And add one more test case. 2015-07-02 11:28:14 +09:00
Vincent Yang 46d25a45a0 Merge branch 'v3_scene3d_fixspineani' into v3_scene3dtest 2015-07-02 10:27:25 +08:00
Neo Kim a3cbd13402 Update the resource sub module reference 2015-07-01 18:44:59 +09:00
Vincent Yang dc6e966501 [ci skip] remove a unnecessary CCLOG info. 2015-07-01 14:55:31 +08:00
yangxiao d35bf2305f add clipping test 2015-07-01 14:48:37 +08:00
Vincent Yang 276ed46c01 Fixbug : issue 8194. 2015-07-01 14:39:35 +08:00
Neo Kim 00e360f438 Add the missing file into CMake and Windows project configurations. 2015-07-01 15:36:53 +09:00
yangxiao 269feeb1f9 remove stencil from Renderstate 2015-07-01 14:06:37 +08:00
Neo Kim 3f05ad2b98 Replace all tabs to 4 spaces to comply with the convention 2015-06-30 20:31:31 +09:00
Neo Kim f5e7184f0b Add new cpp files into Android.mk 2015-06-30 18:50:13 +09:00
Neo Kim bed90606d3 Add RadioButton feature and a test case for it. 2015-06-30 18:50:13 +09:00
yangxiao 538daf5bce add empty line 2015-06-30 14:19:58 +08:00
yangxiao 2ed5ee123e improve collider 2015-06-30 14:16:05 +08:00
Vincent Yang 1105111fab Merge v3 branch. 2015-06-30 11:59:56 +08:00
子龙山人 29cccf631e Merge pull request #12550 from kompjoefriek/v3-vibrate
Vibrate support in v3
2015-06-30 10:28:59 +08:00
子龙山人 265c9b55e0 Merge pull request #12586 from fusijie/add-autoculling-bug-testcase
add auto culling test case.
2015-06-30 09:33:36 +08:00
Jacky 0be9763a9c add auto culling test case. 2015-06-29 17:25:13 +08:00
子龙山人 c997284825 Merge pull request #12352 from andyque/add-two-events-to-ui-slider
Improve ui::Slider
2015-06-29 17:01:27 +08:00
songchengjiang 7befab0f7b add Physics3DCollider 2015-06-29 10:26:09 +08:00
pandamicro 88aeaa36f4 Merge pull request #12534 from super626/skybox
Skybox improvement
2015-06-26 17:05:17 +08:00
pandamicro d29c5643bc Merge pull request #12559 from WenhaiLin/v3-37-crashfix
[Cpp-tests-->SpriteOffsetAnchorRotation]Fixed crash when enter `SpriteOffsetAnchorRotation` again after a auto-tested.
2015-06-26 12:51:07 +08:00
Wenhai Lin 94c0c0c3fc [Cpp-tests-->SpriteOffsetAnchorRotation]Fixed crash when enter `SpriteOffsetAnchorRotation` test case again after a auto-tested. 2015-06-26 12:02:15 +08:00
pandamicro ddb982246f Merge pull request #12553 from VisualSJ/v3-aa
Encoded into AVC
2015-06-26 10:15:02 +08:00
pandamicro d2764918b9 Merge pull request #12545 from WenhaiLin/v3-37-removeUInclude
Remove unneeded include files and fixed warns.
2015-06-26 09:31:51 +08:00
kompjoefriek 6eca03fdd2 Merged changes from "Vibrate support in v4" into v3 branch. 2015-06-26 01:02:44 +02:00
WenhaiLin 1494f09f06 Remove unneeded include files and fixed warns. 2015-06-25 23:15:39 +08:00
pandamicro 1ab369a70b Merge pull request #12542 from andyque/fix-v3.7-stuio-percent-mode
Fix v3.7 cocosStudio percent position bug
2015-06-25 21:37:12 +08:00
pandamicro a81d7aa8b4 Merge pull request #12541 from VisualSJ/v3-aa
[ci skip] Encoded into AVC
2015-06-25 20:32:53 +08:00
andyque 516d45db62 update submodule 2015-06-25 20:16:43 +08:00
VisualSJ 110e51d0bc Encoded into AVC 2015-06-25 19:01:55 +08:00
andyque 8f7b439dfe add cocostudio 1.6 tests 2015-06-25 18:06:45 +08:00
samuele3hu 7feaa18d82 Fix the compile error for cpp-tests based on android studio 2015-06-25 16:08:48 +08:00
yangxiao 63f948c822 modify skybox to projection space 2015-06-25 15:01:39 +08:00
pandamicro 117a72fa07 Merge pull request #12514 from WenhaiLin/v3-37-autotest-timeoutfix
[Cpp-tests]Fixed cannot start auto test again if the timeout has occurred.
2015-06-24 23:07:38 +08:00
pandamicro f9db471026 Merge pull request #12495 from super626/v3
Fix terrain getIntersectionPoint
2015-06-24 18:36:52 +08:00
WenhaiLin a7632a962f [Cpp-tests]Fixed cannot start auto test again if the timeout has occurred. 2015-06-24 18:24:16 +08:00
pandamicro 6638a53d69 Merge pull request #12509 from xiaofeng11/v3_xiaofeng
Add a text label to Node3DReader Test, notice user there has no content to show
2015-06-24 17:10:08 +08:00
Bin Zhang c9c212d0e1 Solve the error when run tests projects with `cocos run`. 2015-06-24 15:33:13 +08:00
XiaoFeng 0846dadbc3 Add a text label to Node3DReader Test, notice user there has no content to show 2015-06-24 14:58:14 +08:00
yangxiao c3593c9d64 merge cocos 2015-06-23 18:29:39 +08:00
yangxiao 251c81d7be Merge branch 'newcode' into v3 2015-06-23 18:25:41 +08:00
WenhaiLin f95245312a Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3-37alpha0 2015-06-23 17:08:25 +08:00
WenhaiLin cbb073e905 Fixed Application may be created more than once on Android. 2015-06-23 16:58:38 +08:00
子龙山人 fca9b89a4c Merge pull request #12480 from andyque/fix-rapidjson-assert-error
fix rapidjson assert error
2015-06-23 15:34:47 +08:00
andyque 70b709f4a8 fix rapidjson assert error 2015-06-23 13:54:11 +08:00
pandamicro 4823cc3bc2 Merge pull request #12476 from super626/fps
show fps in scene3d demo
2015-06-23 13:42:26 +08:00
子龙山人 d8a2695620 Merge pull request #12473 from WenhaiLin/v3-37-ParticleDemo-crashfix
[cpp-tests] ParticleIssue12310:Fixed crash when tap left/right arrow to move to another test case.
2015-06-23 13:36:36 +08:00
yangxiao a433d57807 show fps 2015-06-23 11:56:50 +08:00
WenhaiLin a68874d3cb Node: Particles --> ParticleIssue12310:Fixed crash when tap left/right arrow to move to another test case. 2015-06-23 11:00:23 +08:00
andyque 931011809d fixed unintended spaces in string 2015-06-23 10:38:43 +08:00
pandamicro b1e24ee8f2 Merge pull request #12455 from natural-law/v3
Solve the error when build tests projects with cocos command on win32.
2015-06-22 13:04:17 +08:00
WenhaiLin 6bd46fcfcc [ci skip]UIRichTextTest:Fixed text don't render properly in the Windows 8.1 Store App. 2015-06-20 17:07:11 +08:00
Bin Zhang 85fe9e8816 Solve the error when build tests projects with cocos command on win32. 2015-06-19 18:32:32 +08:00
WenhaiLin 45de0b650a [ci skip]Fixed resources. 2015-06-19 16:26:03 +08:00
WenhaiLin d32a317ea0 Label:Fixed line wrap error without space. 2015-06-19 13:39:19 +08:00
tangziwen 1989de7a04 fix terraintest and Terrain::getInstersectionPoint() 2015-06-18 12:20:44 +08:00
Vincent Yang 27bf636eab Fix bug: spine animition can't show in Scene3DTest. 2015-06-18 11:45:17 +08:00
tangziwen 4187ea2241 fix Scene3D test 2015-06-18 10:17:46 +08:00
Vincent Yang 0e0c8cf72e Modify Scene3DTest to composite 2D/3D scene by moving UI and camera far away. 2015-06-18 09:54:48 +08:00
pandamicro 4fa1cdc302 Update submodules 2015-06-17 15:43:35 +08:00
Jacky 3c5ab4f518 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into fix_spritepolygon2
# Conflicts:
#	cocos/2d/libcocos2d_8_1/libcocos2d_8_1/libcocos2d_8_1.Shared/libcocos2d_8_1.Shared.vcxitems.filters
2015-06-17 13:04:24 +08:00
WuHao aeeed0f4ab Merge remote-tracking branch 'origin' into fix_spritepolygon
# Conflicts:
#	external/config.json
2015-06-16 11:19:20 +08:00
Dale Stammen 8d8e7d6cb9 Merge branch 'v3' into v3-winrt-librecast 2015-06-15 19:27:40 -07:00
Dale Stammen 0781978788 added librecast. Updated build properties 2015-06-15 18:44:14 -07:00
andyque b8826d9de4 improve the enum naming 2015-06-16 09:42:06 +08:00
Dale Stammen e14fdedf67 added missing NavMeshTest files 2015-06-15 18:19:51 -07:00
Ricardo Quesada b167ab3e78 StateBlock() is public 2015-06-15 17:43:37 -07:00
Ricardo Quesada ca3da86da7 StateBlock::restore() is public
It is possible to restore to default state
2015-06-15 14:12:44 -07:00
andyque c1108db31e Improve ui::Slider
1. Add two APIs to gain big precision
2. Add three type events in Slider's callback.
2015-06-15 18:31:21 +08:00
WuHao 27d0f51e9b Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into fix_spritepolygon
Conflicts:
	build/cocos2d_libs.xcodeproj/project.pbxproj
	build/cocos2d_tests.xcodeproj/project.pbxproj
	cocos/2d/libcocos2d.vcxproj.filters
	tools/cocos2d-console
	web
2015-06-15 16:13:36 +08:00
pandamicro 0216d05eee Merge pull request #12102 from super626/navigation2
3D Navigation
2015-06-15 13:39:05 +08:00
yangxiao 97ef7974bb create agent in the onEnter 2015-06-15 11:57:05 +08:00
Ricardo Quesada a8cf72dc43 pass bits to invalidate 2015-06-12 17:14:09 -07:00
Ricardo Quesada 4278bf51b1 Adds RenderState::StateBlock::invalidate();
handy function to restore the GL state to the default one.
Only use it if calling GL calls directly
2015-06-12 16:47:08 -07:00
Ricardo Quesada d9b0b2ca38 more fixes 2015-06-12 15:28:29 -07:00
pandamicro 9806c09b0e Merge pull request #12299 from WenhaiLin/v3-label-cropped
Label:the texture of character have not cropped if character cross the axis-aligned bounding-box.
2015-06-12 21:33:09 +08:00
子龙山人 c01d1fe00a Merge pull request #12310 from WenhaiLin/v3-particlefile-key
Fixed ParticleSystem may using wrong texture if the particle PLIST file created via ParticleDesigner.
2015-06-12 16:44:12 +08:00
Jacky 29c108bdef Merge remote-tracking branch 'origin' into fix_spritepolygon2
# Conflicts:
#	cocos/2d/libcocos2d_8_1/libcocos2d_8_1/libcocos2d_8_1.Shared/libcocos2d_8_1.Shared.vcxitems.filters
2015-06-12 16:28:41 +08:00
WenhaiLin 4d97d5075b Add test case for issue12310. 2015-06-12 15:39:57 +08:00
子龙山人 7a9b48bd83 Merge pull request #12214 from andyque/optimize-ui-memory-usage
Optimize ui memory usage
2015-06-12 10:11:21 +08:00
WenhaiLin 5aa31ea83a Label:the texture of character have not cropped if character cross the axis-aligned bounding-box. 2015-06-11 17:16:44 +08:00
子龙山人 43555272d5 Merge pull request #12236 from WenhaiLin/v3-box2d-compilefix
Fixed compile error cause by enable CC_ENABLE_BOX2D_INTEGRATION.
2015-06-11 16:34:45 +08:00
yangxiao 44c2b0d5ad merge cocos 2015-06-11 15:54:42 +08:00
WenhaiLin aff2f8c2c4 Fixed compile error. 2015-06-11 14:42:03 +08:00
samuele3hu 1b20e463d8 Update the Lua binding about the Polygon and update the test case. 2015-06-11 14:38:38 +08:00
Jacky b41c60dbdb Merge remote-tracking branch 'origin/v3' into fix_spritepolygon2
# Conflicts:
#	external/config.json
2015-06-10 10:23:43 +08:00
Huabing.Xu 10352c40b2 Merge branch 'v3' into v3FrameBufferObject
# Conflicts:
#	cocos/2d/CCCamera.h
2015-06-10 10:16:42 +08:00
Huabing.Xu 3e331128c6 file rename CCFrameBufferObject->CCFrameBuffer 2015-06-09 15:32:12 +08:00
Huabing.Xu 97b387560b revert some accidental changes 2015-06-09 14:06:11 +08:00
Jacky 562d4b9a78 fix on the windows. 2015-06-09 11:23:37 +08:00
Huabing.Xu 9acab65e4f rename FrameBufferObject->FrameBuffer
Move FrameBufferObject related class to experimental namespace
2015-06-09 10:59:43 +08:00
WuHao a67e570ef7 deleted more leftover comments, placed polygon test further down the tests 2015-06-08 15:40:18 +08:00
WuHao 2650de030c modified tests to show current epsilon 2015-06-08 15:08:16 +08:00
WuHao 0808b6aff9 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into fix_spritepolygon
Conflicts:
	cocos/2d/MarchingSquare.cpp
2015-06-08 13:59:26 +08:00
WenhaiLin 784f142f91 Fixed compile error cause by enable CC_ENABLE_BOX2D_INTEGRATION. 2015-06-08 11:06:02 +08:00
Jacky 3e62dd0473 remove unused file and code. 2015-06-06 13:31:25 +08:00
Dale Stammen d4c9a81908 Merge branch 'v3' into v3-winrt-ogg 2015-06-05 16:03:54 -07:00
Ricardo Quesada 453a3d93bc samplers are treated as uniforms 2015-06-05 14:55:33 -07:00
Dale Stammen bc1ea87adf updated app guid and disables auto version increment for App Cert tests 2015-06-05 06:21:03 -07:00
andyque 56b7037c5f optimize uislider memory usage 2015-06-05 17:16:10 +08:00
pandamicro 399ecfcb9f Merge pull request #12176 from super626/fixphysics3d
rename syncToNode and syncToPhysics
2015-06-05 16:02:45 +08:00
andyque 6390f063fe optimize UILoadingBar memory usage 2015-06-05 15:57:39 +08:00
yangxiao d50c1823d4 merge cocos 2015-06-05 14:25:37 +08:00
andyque a7141bab38 improve imageView memory usage 2015-06-05 14:19:05 +08:00
andyque 91ddb802e1 optimize ui::CheckBox memory consumption 2015-06-05 10:32:22 +08:00
WuHao 5b572ab803 Polyinfo is no longer a pointer 2015-06-04 16:20:00 +08:00
WuHao 0a51c9bd27 Finished AutoPolygon and Sprite 2015-06-04 15:43:31 +08:00