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

1468 Commits

Author SHA1 Message Date
Sachin Garg 84f6863214 getSlidBallRenderer methods to allow more customization of UISlider (#16532) 
* getSlidBallRenderer methods to allow more customization of UISlider look and feel.

* Added const to declaration of getSlidBallRenderer methods for UISlider.
 2016-09-09 10:01:14 +08:00
Allen Lee 7c298bdcd7 misspelling check on cocos directory (#16522) 
Misspelling fix on some comments,
cocos/editor-support/cocostudio/CSParseBinary_generated.h
fix misspelling postion -> position
 2016-09-06 10:14:14 +08:00
minggo df3b33cd59 Merge pull request #16457 from minggo/merge-v3.13 
Update rapid json to version 1.1.0.
 2016-08-29 15:22:01 +08:00
minggo 04fd2b16b2 merge v3.13 back to v3 2016-08-29 11:57:13 +08:00
mogemimi 86563af08a Add missing override keywords 2016-08-28 23:45:15 +09:00
Alfonso Grillo 6c9a05f831 PageView with custom 'scrollToPage' time (#16390) 
* PageView with custom scrollToPage time

* fix compiler error
 2016-08-25 15:48:01 +08:00
halx99 5bc3659a33 #Improve XML parse performance with rapidxml pure SAX parser (#16419) 
* Update CCSAXParser.cpp

* #Improve XML parse performance with rapidxml pure SAX parser without compatible break.

* put rapidxml to external

* Update deps
 2016-08-24 16:37:03 -07:00
子龙山人 0d836b2cea Fix pageview click turning event (#16318) 
* fix pageView click turning event

* fix current PageIndx issue
 2016-08-05 14:04:57 +08:00
子龙山人 08515f46e3 fix pageView click turning event (#16310) 2016-08-05 09:43:15 +08:00
James Chen b135d512d2 Update copyright to 2016. (#16311) 2016-08-05 09:42:15 +08:00
子龙山人 6eaf15a2c2 fix pageview turning event (#16299) 2016-08-04 09:51:54 +08:00
Jeff Wang f8b2d8fe0f fixed base URL for webview on android doesn't work (#16279) 
fixed base URL for webview on android doesn't work
 2016-08-02 16:49:24 +08:00
minggo 57e4963502 Merge pull request #15963 from Drakon-Cocos/PageViewIndicator 
Fix PageViewIndicator opacity for 'inactive' pages
 2016-07-28 14:44:35 +08:00
mogemimi 093ef3a14f Fix typos in variable names 2016-07-26 04:06:01 +09:00
halx99 bf996c5bac Add ETC1 builtin alpha support. (#16118) 
* Add ETC1 builtin alpha support.

* Rename setETC1AlphaFileEndix to setETC1AlphaFileSuffix

* Check whether etc1 alpha suffix is empty

* fix Code ident & Add etc1 alpha test case to SpriteTest.

* Remove unused ETC1AA shader programs

* Fix all review issues and endl issues

* Add a new TriangleCommand::init() with Texture2D* instead of GLuint textureID

* #fix issues
 2016-07-25 17:31:54 +08:00
mogemimi 15030ad4c3 Fix typos in log messages 2016-07-25 02:53:22 +09:00
minggo 391d97d1dd improve log info 2016-07-22 11:56:41 +08:00
mogemimi d931c62649 Fix typos in documentation comments 2016-07-16 04:18:40 +09:00
mogemimi 98cc48bc62 Add missing override keyword 2016-07-13 15:03:53 +09:00
mogemimi b9c78ac41c Use std::abs to avoid overhead of casting float to double 2016-07-13 00:55:11 +09:00
mogemimi 7531c5156b Fix documentation when compile with -Wdocumentation and Clang 2016-07-10 17:38:32 +09:00
minggo 4e125d84a4 fix compiling and linking error with ndk r12b 2016-07-08 15:29:35 +08:00
mogemimi bed4e048b6 Fix various typos 2016-07-06 08:27:39 +09:00
mogemimi 2650fd1afd Add missing float suffix to avoid -Wdouble-promotion 2016-07-04 23:12:45 +09:00
minggo 8bbeb01be4 Merge pull request #16025 from mogemimi/fix-doc-typo 
Fix typos and other mistakes in docs
 2016-07-04 09:33:29 +08:00
mogemimi 2443e09d29 Fix typos and other mistakes in docs 2016-07-04 00:42:10 +09:00
mogemimi 57900112c5 Fix format string warning when compiling with Android NDK 2016-07-03 17:19:17 +09:00
mogemimi 2354df9faf Fix getSubStringOfUTF8String bug 2016-07-01 15:16:35 +09:00
mogemimi c0f2194961 Fix some minor typos in local variable names 2016-06-29 11:04:11 +09:00
Drakon-Cocos 7302ad979a Can set scroll to item duration in ListView and derived classes (#15964) 
* Can set scroll to item duration in ListView and derived classes (e.g. PageView)

* Parameter no more 'const'. Comments
 2016-06-29 09:48:03 +08:00
minggo bbd837aefa merge v3.12 back to v3 2016-06-28 17:53:50 +08:00
Alfonso Grillo b6fa894f81 Fix page view indicator opacity for inactive pages 2016-06-25 18:49:13 +02:00
zilongshanren 459b7f30c6 refactoring Android editbox setVisible API 
fix set visible issue of android editbox

fix android lower case multiline

revert unkown changes
 2016-06-23 18:18:39 +08:00
zilongshanren a6b0ea76de improve editbox test and font creation 2016-06-23 15:57:41 +08:00
mogemimi cbc0612306 Use nullptr instead of 0 or NULL 2016-06-23 12:39:23 +09:00
子龙山人 bac1870d16 fix android editbox custom font file (#15924) 
* fix android editbox custom font file

* simplify get real font name on Android
 2016-06-23 11:26:32 +08:00
mogemimi a3bc979452 Fix typos in documentation and comments 2016-06-22 11:22:05 +09:00
minggo 9b210e00d7 Merge pull request #15837 from geemedia/cmake-improvements 
Various CMake improvements
 2016-06-16 14:53:10 +08:00
minggo 5fa57ae5c1 Merge pull request #15844 from halx99/patch-1 
fix: missing properties for clone
 2016-06-16 11:15:13 +08:00
mogemimi a348cbda8b Move StringUtils functions from deprecated header file to ccUTF8.h (#15835) 
* Move StringUtils functions outside of deprecated header

* Replace deprecated headers with 'base/ccUTF8.h'
 2016-06-15 15:01:26 +08:00
halx99 dafa8054bf fix: missing properties for clone 
missing CascadeColorEnabled and CascadeOpacityEnabled for clone.
 2016-06-15 14:39:18 +08:00
Adrien de Sentenac dac9be5016 Various CMake improvements 
- Added c++_shared (LLVM) to Android toolchain options. Fixed AndroidNdkGdb.cmake.
- Fixed includes when not using prebuilt libs. Added option to use sources in external when not using prebuilt libs.
- Added option in CMake to be able build Box2D without using it as physics library in cocos2d-x (similar to what is done in the Visual Studio solution).
 2016-06-14 10:20:57 -04:00
子龙山人 da2ea7e08b Merge pull request #15794 from TheCodez/cachetexture 
UIScrollbar and UIPageViewIndicator cache base64 Texture now #15780
 2016-06-13 17:31:12 +08:00
minggo 7e1da2188c ios supports LOWERCASE_ALL_CHARACTERS 2016-06-07 10:31:16 +08:00
TheCodez 7885f55ce5 Cache bas64 images 2016-06-06 16:32:50 +02:00
minggo 3b4f2c38dd Merge pull request #15788 from minggo/editbox-capital-issue 
[ci skip]not use capital letters by default
 2016-06-06 14:00:32 +08:00
minggo 7e2f79ce8f not use capital letters by default 2016-06-06 13:55:20 +08:00
Alexander Shniperson 07c5e528e7 ListView select item programmatically 2016-06-02 10:11:28 +04:00
Ricardo Quesada b2c7358370 Merge pull request #15722 from ricardoquesada/issue_15154 
Fix crash on windows when using PolygonInfo
 2016-05-25 21:25:31 -03:00
Ricardo Quesada 9ad3db0635 fix: make PolygonCode cleaner 
not sure if this fixes the bug, but it makes the interfaces cleaner.

Github issue #15154
 2016-05-24 20:57:40 -03:00
mogemimi 1e04cb5950 Use nullptr instead of 0 or NULL 2016-05-25 03:09:11 +09:00
alecmilne 5daaa6e49b Adding setBounce to webview (#15623) 
* Adding setBounce to webview

This makes the .bounces of the scrollview section of webview publically accessible

When set to true it stops the grey over scroll of webviews

* Adding empty function for setBounces to Android

* Adding empty setBounces function for tizen

* Adding comments for empty Android and Tizen setBounce functions

* Small comment text change
 2016-05-24 18:27:59 +08:00
zilongshanren b154f274a5 Merge pull request #15410 from 1scaR1/up_v3 
Make PageView indicator more tunable
 2016-05-19 16:19:18 +08:00
zilongshanren 9223d1d917 Merge pull request #15668 from zilongshanren/fix-issue-of-tizen 
fix tizen related issues
 2016-05-18 17:20:19 +08:00
zilongshanren c4e6db4e9b fix tizen related issues 2016-05-18 16:26:13 +08:00
mogemimi 320ec027f7 Replace CCAssert macros with CCASSERT 2016-05-18 01:49:35 +09:00
mogemimi a1a8feed71 Add missing references to avoid unnecessary copies 2016-05-17 01:15:07 +09:00
zilongshanren 3ae5b1075b fix native control onEnter issue 2016-05-16 16:14:16 +08:00
minggo 74af3b5232 merge v3.11 back to v3 2016-05-12 09:50:03 +08:00
zilongshanren e4d91f5577 fix tizen videoplayer issue 2016-05-06 18:43:26 +08:00
zilongshanren 8c046fea92 fix jsb 3.11 related issues 2016-05-05 10:20:00 +08:00
mogemimi 2df9afbe71 Fix typos in documentation and comments 2016-05-05 08:05:20 +09:00
minggo a5602cc732 merge v3.11 back to v3 2016-05-04 16:02:23 +08:00
mogemimi 8429b34010 Reduce unnecessary c_str() calls 2016-05-04 04:18:25 +09:00
zilongshanren 482788c933 Add tizen support (#15518) 
* add Tizen Support

* fix linter error

* fix tizen audio engine lua bindings config
 2016-04-28 09:49:55 +08:00
minggo 2a4799758d Merge pull request #15511 from xpol/signed-unsigned-mismatch 
Fixes signed/unsigned mismatch warnings.
 2016-04-27 11:34:10 +08:00
mogemimi f395cadbac Add CC_GUI_DLL to suppress warning C4275 2016-04-27 04:08:09 +09:00
Xpol Wan 1cc0130bdd Fixes signed/unsigned mismatch warnings. 
```
2d\CCFontFNT.cpp(328): warning C4018: '<' : signed/unsigned mismatch
2d\CCLabel.cpp(782): warning C4018: '>' : signed/unsigned mismatch
2d\CCLabel.cpp(784): warning C4018: '<' : signed/unsigned mismatch
scripting\js-bindings\manual\cocos2d_specifics.cpp(2741): warning C4018: '<' : signed/unsigned mismatch
tests\cpp-tests\Classes\Sprite3DTest\Sprite3DTest.cpp(1969): warning C4018: '>=' : signed/unsigned mismatch
tests\cpp-tests\Classes\TextInputTest\TextInputTest.cpp(264): warning C4018: '>=' : signed/unsigned mismatch
ui\UIEditBox\UIEditBoxImpl-common.cpp(113): warning C4018: '<' : signed/unsigned mismatch
ui\UIRichText.cpp(1573): warning C4018: '<=' : signed/unsigned mismatch
ui\UITextField.cpp(89): warning C4018: '>=' : signed/unsigned mismatch
```
 2016-04-26 17:53:25 +08:00
Josh Bodily 614c3c47d7 Josh/winrt inplace editbox (#15473) 
* WinRT in-place edit box

* Fix static analysis errors
 2016-04-25 11:17:09 +08:00
mogemimi a3ad4cddf8 Fix warnings about signed/unsigned mismatch 2016-04-22 12:20:05 +09:00
Ricardo Quesada b8eae430fb Merge pull request #15289 from m-yukio/feature/richtext_xml_refactor 
extend the RichText
 2016-04-20 20:05:29 -07:00
Yukio Murakami a8ddbdc12c defaults and append tag support 2016-04-21 10:03:57 +09:00
Ricardo Quesada 775db978da fix: fix issue 15423 for v3.11 
Github issue #15423
 2016-04-20 08:41:20 -07:00
mogemimi 4dfdd159b7 Fix deprecation warning caused by PageView::getPages() 2016-04-21 00:28:34 +09:00
Ricardo Quesada 4bb35f2219 fix: fix crash in win for rich text 
use `std::locale()` when invoking `std::isXXX` function
to avoid crash

github issue #15423
 2016-04-19 13:53:27 -07:00
xpol 1e70fb5eb5 Remove include of cocos2d.h (#15435) 2016-04-18 15:09:21 +08:00
Stephen Phillips 7b35f31016 Fixed typo in UILayout using clipping rect x instead of y coordinate. 2016-04-15 13:45:21 +01:00
Бесшапошников Никита 23d074ea34 Make PageView indicator more tunable: 
-add possibility to change texture of index nodes
-add possibility to change color of index nodes
-add possibility to change scale of index nodes
 2016-04-11 12:28:47 +03:00
Adrien de Sentenac 0030beca7a Make PageView page turning event time tweak configurable. 2016-04-08 11:06:36 -04:00
zilongshanren 90087ae5a7 improve textfield code 2016-04-01 09:31:18 +08:00
zilongshanren dcb7c58216 fix textField password bug 2016-04-01 00:52:55 +08:00
zilongshanren 016979af3b fix TextField password issue 2016-03-30 18:19:28 +08:00
zilongshanren 6e3d69dded Merge pull request #15336 from cocos2d/v3.10 
V3.10
 2016-03-29 11:23:11 +08:00
zilongshanren db00d4944c Merge pull request #15293 from zilongshanren/fixDetachIME 
fix systemFontDirty and lineBreakMode issue
 2016-03-23 16:37:53 +08:00
Xpol Wan 71f0537734 Merge commit '43db5c052d3a8605ebfd9dc2acc23e26129c4265' into remove-uncessary-search-paths 2016-03-22 16:07:02 +08:00
Xpol Wan e7864cdb89 Removed unnecessary search paths. 2016-03-22 16:04:12 +08:00
zilongshanren ff6b7080f5 fix systemFontDirty and lineBreakMode issue 2016-03-22 14:47:33 +08:00
zilongshanren 400e77808c Revert "UIEditBox attachWithIME, detachWithIME make working" 2016-03-22 14:18:39 +08:00
Xpol Wan 32e408487f Fixes import path for m and mm files. 2016-03-21 20:12:58 +08:00
Xpol Wan 931d56bc10 Fixes includes in .m and .mm files. 2016-03-21 11:02:00 +08:00
Xpol Wan 90456d29ba Fixes 1605 include path in 541 files 
using the tools/coding-style/include-linter.py with -f options.
 2016-03-20 21:53:44 +08:00
zilongshanren 535d3b3c32 Merge pull request #15241 from newnon/v3_gl_program_imageview 
GLProgram for ImageView
 2016-03-17 11:39:58 +08:00
zilongshanren 00ec3690b2 Merge pull request #15242 from newnon/v3_cursor_support_for_textfield 
Cursor support for text field
 2016-03-17 11:39:11 +08:00
YooJaehong 7eeccbc771 UIEditBox attachWithIME, detachWithIME make working 
(android, iOS tested)
 2016-03-17 10:26:53 +09:00
Sergey 8541dead20 Cursor support for text field 2016-03-14 18:09:04 +03:00
Sergey 980d5fec68 GLProgram for ImageView 2016-03-14 17:05:39 +03:00
zilongshanren 1409adc07a Merge pull request #15205 from mogemimi/fix-mojibake-and-typo 
Fix typos in the documentation
 2016-03-11 22:33:31 +08:00
mogemimi 582835b670 Fix typos in the documentation 2016-03-11 00:34:32 +09:00
geron-cn 7824acc34e fix scrollview bugs: 
- fix bar's position not right after size changed
- fix bar setAutoHideEnabled some time not right
 2016-03-10 18:06:20 +08:00
geron-cn 0bd9d1638d Squashed commit of the following: 
commit 976d28b4d1c71576799ecd4d7cc51e39f3d15b2d
Author: geron-cn <c.ever.fallen@gmail.com>
Date:   Wed Mar 9 18:58:17 2016 +0800

    avoid warning

commit 1c0ad1a56262bdb37f76badc7b40925e413999f3
Merge: 4604c47 b9b3049
Author: geron-cn <c.ever.fallen@gmail.com>
Date:   Wed Mar 9 18:52:43 2016 +0800

    Merge branch 'v3' of github.com:cocos2d/cocos2d-x into uitabcontrol

commit 4604c47ded82a83b675d1f418fe0015683e6a57b
Author: geron-cn <c.ever.fallen@gmail.com>
Date:   Wed Mar 9 18:51:02 2016 +0800

    fix bugs:
    - fix there is a bar dot after init a scrollview with scrollbar
    - fix some time var can not auto hide after scroll

commit e70b093d8e8a18b532c50c23f4c43b0131933ea4
Merge: 45268ac f2c9994
Author: geron-cn <c.ever.fallen@gmail.com>
Date:   Mon Mar 7 15:32:08 2016 +0800

    Merge branch 'v3' of github.com:cocos2d/cocos2d-x into uitabcontrol

commit 45268ac10bf579b16a0beb8ad45b55512b47b49f
Author: geron-cn <c.ever.fallen@gmail.com>
Date:   Mon Mar 7 15:30:47 2016 +0800

    remove inline

commit a1c70265dfc2fd0ffbe8ff81a987af7d0bbc7a06
Merge: 8269019 b5a44bc
Author: geron-cn <c.ever.fallen@gmail.com>
Date:   Fri Mar 4 10:48:41 2016 +0800

    Merge branch 'v3' of github.com:cocos2d/cocos2d-x into uitabcontrol

commit 8269019874ca1bd0d265dff14e105e56bcc15bb2
Merge: 46f2e8c a6b02fc
Author: geron-cn <c.ever.fallen@gmail.com>
Date:   Thu Mar 3 18:43:40 2016 +0800

    Merge branch 'v3' of github.com:cocos2d/cocos2d-x into uitabcontrol
 2016-03-09 19:08:18 +08:00
geron-cn 9ba5dffb4c add tab control to js/lua binding generate 2016-03-04 13:35:41 +08:00
zilongshanren b5a44bc2f4 Merge pull request #15170 from geron-cn/uitabcontrol 
add TabControl TabHeader to tolua
 2016-03-04 10:26:06 +08:00
geron-cn 46f2e8c8b6 rename deactiveTabItem 2016-03-03 18:09:07 +08:00
zilongshanren 93b7e4396b Merge pull request #15150 from mogemimi/fix-incorrect-header-include 
Fix compile error on case-sensitive filesystems
 2016-03-03 15:53:38 +08:00
geron-cn 4f6fd3ef64 Squashed commit of the following: 
commit 87b7c3e404a9b6cce6d4f6bc8565e7feef429ee0
Author: geron-cn <c.ever.fallen@gmail.com>
Date:   Thu Mar 3 13:43:04 2016 +0800

    change enum to enum class
    use tabitem as pointer to replace _currentTabItemIndex

commit c0830cc581b8a07d6eed63268bf5be6a828c113a
Merge: 3663156 166931a
Author: geron-cn <c.ever.fallen@gmail.com>
Date:   Thu Mar 3 11:48:44 2016 +0800

    Merge remote-tracking branch 'gero/tabview' into tabcontrol

commit 366315624143ff01c3e2b22b415ab79050e381e4
Author: geron-cn <c.ever.fallen@gmail.com>
Date:   Thu Mar 3 11:48:15 2016 +0800

    Squashed commit of the following:

    commit 166931a28c8736ab58b7c4319c1139b5e4865a9e
    Author: geron-cn <c.ever.fallen@gmail.com>
    Date:   Wed Mar 2 21:35:06 2016 +0800

        fix

    commit e0eb069846a8ceb4b726c3c945801c944404b102
    Author: geron-cn <c.ever.fallen@gmail.com>
    Date:   Wed Mar 2 21:30:44 2016 +0800

        fix active deactive in tabcontrol

    commit aeb1c857cab23299e44a86ac1f627c7bd5fa5a6d
    Author: geron-cn <c.ever.fallen@gmail.com>
    Date:   Wed Mar 2 20:16:22 2016 +0800

        fix active -1

    commit e57796cbbae851e8cff52656b3265c80c2e8f6f7
    Author: geron-cn <c.ever.fallen@gmail.com>
    Date:   Wed Mar 2 16:00:51 2016 +0800

        fix merge file

    commit cdd44f1c577ad190bc175896107a48fbb36b65bb
    Merge: 1658ad6 6bf55ed
    Author: geron-cn <c.ever.fallen@gmail.com>
    Date:   Wed Mar 2 15:57:48 2016 +0800

        Merge branch 'v3' of github.com:cocos2d/cocos2d-x into tabview

        # Conflicts:
        #	cocos/ui/CMakeLists.txt

    commit 1658ad6f4a2bd0889d6cc020072d7fb9192cafc3
    Author: geron-cn <c.ever.fallen@gmail.com>
    Date:   Wed Mar 2 15:27:31 2016 +0800

        configure for win8.1

    commit ec236bff711b72952d48ec4d8b9137b4812b7a72
    Author: geron-cn <c.ever.fallen@gmail.com>
    Date:   Tue Mar 1 10:20:23 2016 +0800

        configure for iOS mac twos android linux

    commit 9d6678a4388461a791abe968fa637df2fc6839d3
    Author: geron-cn <c.ever.fallen@gmail.com>
    Date:   Tue Mar 1 10:02:17 2016 +0800

        add lack files

    commit 1f2b5a3e989b05f67a705c81a20c75d3e0ed88a1
    Author: geron-cn <c.ever.fallen@gmail.com>
    Date:   Mon Feb 29 22:05:22 2016 +0800

        add test case for TabControl

    commit 97b8d8d87a37881b33ebe90478392150ef341b3e
    Author: geron-cn <c.ever.fallen@gmail.com>
    Date:   Mon Feb 29 15:43:29 2016 +0800

        add const to getter setter

    commit f49a0483049d2aa7e21bcbe10e553c207adc4bdf
    Author: geron-cn <c.ever.fallen@gmail.com>
    Date:   Mon Feb 29 14:50:04 2016 +0800

        format the comments

    commit a1989a8f89d33ef8d9eefff6c8117b45977308ad
    Author: geron-cn <c.ever.fallen@gmail.com>
    Date:   Mon Feb 29 11:51:06 2016 +0800

        remove reference

    commit 1a573e68d30cc56bed9b2338cbbd311e2541fdfd
    Author: geron-cn <c.ever.fallen@gmail.com>
    Date:   Mon Feb 29 11:40:04 2016 +0800

        configure for win8.1

    commit c015ac54028534202f62ff85f9a9d4b62b12801e
    Author: geron-cn <c.ever.fallen@gmail.com>
    Date:   Mon Feb 29 11:27:54 2016 +0800

        fix error

    commit 91c4ac9ae73d4e7efcee389d7af5ec7178c94836
    Author: geron-cn <c.ever.fallen@gmail.com>
    Date:   Mon Feb 29 11:25:51 2016 +0800

        add interface

    commit eaf3e237cdcb9c49cd4161691471a8761f8dbdae
    Author: geron-cn <c.ever.fallen@gmail.com>
    Date:   Sun Feb 28 03:21:22 2016 +0800

        fix compile error for tw-os

    commit 3bfaa2976751e844a591ae5524bfd81249927c7c
    Author: geron-cn <c.ever.fallen@gmail.com>
    Date:   Sun Feb 28 03:04:23 2016 +0800

        fix linux compile error

    commit fafe3ad660e644924fd02665b77e1df4076a4802
    Author: geron-cn <c.ever.fallen@gmail.com>
    Date:   Sun Feb 28 02:54:34 2016 +0800

        re-indent code with X-Code

    commit f8dfe5b551b0bb0a1a1d7b15556db700a35651a5
    Author: geron-cn <c.ever.fallen@gmail.com>
    Date:   Sun Feb 28 02:37:51 2016 +0800

        add reader configure for android

    commit 07033f7b6074edf8a333e40c2382a09a2b2325e4
    Author: geron-cn <c.ever.fallen@gmail.com>
    Date:   Sun Feb 28 02:22:00 2016 +0800

        format code, remove some warning

    commit 22ed160628f1946d0ccbdf6fc066ec80e56ae611
    Author: geron-cn <c.ever.fallen@gmail.com>
    Date:   Sun Feb 28 02:02:27 2016 +0800

        configure for mac project

    commit de21cea12c0a898ea95f9951022be85bdddeefaf
    Author: geron-cn <c.ever.fallen@gmail.com>
    Date:   Sat Feb 27 18:28:10 2016 +0800

        add comment for apis

    commit b9cebf881a5cd4ecbb740b98cff7dc61183b1db2
    Author: geron-cn <c.ever.fallen@gmail.com>
    Date:   Sat Feb 27 15:32:46 2016 +0800

        fix parse objects in container

    commit 53bcce68b053a5b918a29735fed393c210d9cc2c
    Author: geron-cn <c.ever.fallen@gmail.com>
    Date:   Fri Feb 26 22:10:54 2016 +0800

        fix flatbuffer parse

    commit 9cbdbdc5d046751ae1398dd622ccab0e2797d055
    Author: geron-cn <c.ever.fallen@gmail.com>
    Date:   Fri Feb 26 18:26:07 2016 +0800

        Init ui::TabControl

commit 166931a28c8736ab58b7c4319c1139b5e4865a9e
Author: geron-cn <c.ever.fallen@gmail.com>
Date:   Wed Mar 2 21:35:06 2016 +0800

    fix

commit e0eb069846a8ceb4b726c3c945801c944404b102
Author: geron-cn <c.ever.fallen@gmail.com>
Date:   Wed Mar 2 21:30:44 2016 +0800

    fix active deactive in tabcontrol

commit aeb1c857cab23299e44a86ac1f627c7bd5fa5a6d
Author: geron-cn <c.ever.fallen@gmail.com>
Date:   Wed Mar 2 20:16:22 2016 +0800

    fix active -1

commit e57796cbbae851e8cff52656b3265c80c2e8f6f7
Author: geron-cn <c.ever.fallen@gmail.com>
Date:   Wed Mar 2 16:00:51 2016 +0800

    fix merge file

commit cdd44f1c577ad190bc175896107a48fbb36b65bb
Merge: 1658ad6 6bf55ed
Author: geron-cn <c.ever.fallen@gmail.com>
Date:   Wed Mar 2 15:57:48 2016 +0800

    Merge branch 'v3' of github.com:cocos2d/cocos2d-x into tabview

    # Conflicts:
    #	cocos/ui/CMakeLists.txt

commit 1658ad6f4a2bd0889d6cc020072d7fb9192cafc3
Author: geron-cn <c.ever.fallen@gmail.com>
Date:   Wed Mar 2 15:27:31 2016 +0800

    configure for win8.1

commit ec236bff711b72952d48ec4d8b9137b4812b7a72
Author: geron-cn <c.ever.fallen@gmail.com>
Date:   Tue Mar 1 10:20:23 2016 +0800

    configure for iOS mac twos android linux

commit 9d6678a4388461a791abe968fa637df2fc6839d3
Author: geron-cn <c.ever.fallen@gmail.com>
Date:   Tue Mar 1 10:02:17 2016 +0800

    add lack files

commit 1f2b5a3e989b05f67a705c81a20c75d3e0ed88a1
Author: geron-cn <c.ever.fallen@gmail.com>
Date:   Mon Feb 29 22:05:22 2016 +0800

    add test case for TabControl

commit 97b8d8d87a37881b33ebe90478392150ef341b3e
Author: geron-cn <c.ever.fallen@gmail.com>
Date:   Mon Feb 29 15:43:29 2016 +0800

    add const to getter setter

commit f49a0483049d2aa7e21bcbe10e553c207adc4bdf
Author: geron-cn <c.ever.fallen@gmail.com>
Date:   Mon Feb 29 14:50:04 2016 +0800

    format the comments

commit a1989a8f89d33ef8d9eefff6c8117b45977308ad
Author: geron-cn <c.ever.fallen@gmail.com>
Date:   Mon Feb 29 11:51:06 2016 +0800

    remove reference

commit 1a573e68d30cc56bed9b2338cbbd311e2541fdfd
Author: geron-cn <c.ever.fallen@gmail.com>
Date:   Mon Feb 29 11:40:04 2016 +0800

    configure for win8.1

commit c015ac54028534202f62ff85f9a9d4b62b12801e
Author: geron-cn <c.ever.fallen@gmail.com>
Date:   Mon Feb 29 11:27:54 2016 +0800

    fix error

commit 91c4ac9ae73d4e7efcee389d7af5ec7178c94836
Author: geron-cn <c.ever.fallen@gmail.com>
Date:   Mon Feb 29 11:25:51 2016 +0800

    add interface

commit eaf3e237cdcb9c49cd4161691471a8761f8dbdae
Author: geron-cn <c.ever.fallen@gmail.com>
Date:   Sun Feb 28 03:21:22 2016 +0800

    fix compile error for tw-os

commit 3bfaa2976751e844a591ae5524bfd81249927c7c
Author: geron-cn <c.ever.fallen@gmail.com>
Date:   Sun Feb 28 03:04:23 2016 +0800

    fix linux compile error

commit fafe3ad660e644924fd02665b77e1df4076a4802
Author: geron-cn <c.ever.fallen@gmail.com>
Date:   Sun Feb 28 02:54:34 2016 +0800

    re-indent code with X-Code

commit f8dfe5b551b0bb0a1a1d7b15556db700a35651a5
Author: geron-cn <c.ever.fallen@gmail.com>
Date:   Sun Feb 28 02:37:51 2016 +0800

    add reader configure for android

commit 07033f7b6074edf8a333e40c2382a09a2b2325e4
Author: geron-cn <c.ever.fallen@gmail.com>
Date:   Sun Feb 28 02:22:00 2016 +0800

    format code, remove some warning

commit 22ed160628f1946d0ccbdf6fc066ec80e56ae611
Author: geron-cn <c.ever.fallen@gmail.com>
Date:   Sun Feb 28 02:02:27 2016 +0800

    configure for mac project

commit de21cea12c0a898ea95f9951022be85bdddeefaf
Author: geron-cn <c.ever.fallen@gmail.com>
Date:   Sat Feb 27 18:28:10 2016 +0800

    add comment for apis

commit b9cebf881a5cd4ecbb740b98cff7dc61183b1db2
Author: geron-cn <c.ever.fallen@gmail.com>
Date:   Sat Feb 27 15:32:46 2016 +0800

    fix parse objects in container

commit 53bcce68b053a5b918a29735fed393c210d9cc2c
Author: geron-cn <c.ever.fallen@gmail.com>
Date:   Fri Feb 26 22:10:54 2016 +0800

    fix flatbuffer parse

commit 9cbdbdc5d046751ae1398dd622ccab0e2797d055
Author: geron-cn <c.ever.fallen@gmail.com>
Date:   Fri Feb 26 18:26:07 2016 +0800

    Init ui::TabControl
 2016-03-03 14:17:48 +08:00
Ricardo Quesada 462f4f4c0a Merge pull request #15156 from ricardoquesada/cmake_android_squash_2 
cmake for android
 2016-03-02 17:24:35 -08:00
Ricardo Quesada 028f8c28e1 Squashed commit of the following: 
commit 59e43a3c80f4af8998e4a14f6463bd7a91617d5f
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Wed Mar 2 15:19:48 2016 -0800

    uses new naming convention for projects

    uses _ instead of -

commit f97ba56608d48b17909649c8617ba9047b566196
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Wed Mar 2 14:49:22 2016 -0800

    fooling cmake for real

commit 20c2560f75eab952e5131b484284bf20cb07fe07
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Wed Mar 2 14:43:05 2016 -0800

    fooling cmake

commit a0ada44bc82941830f6c71219a1492d28c28c306
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Wed Mar 2 14:26:59 2016 -0800

    makes CMake for Mac happy

commit 656b4f5e2dd741215a4699db979fe1b0dce60298
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Wed Mar 2 13:50:15 2016 -0800

    linux fix

commit fa98aeac8505c764f4a69f15c8a8ff1123fad2a3
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Wed Mar 2 11:18:18 2016 -0800

    links correctly!

commit 9c56ce7143d3a35b44d33f246cec093ca9eaa7d9
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Tue Mar 1 17:44:58 2016 -0800

    Squashed commit of the following:

    commit 2ef52723dae44204c047cb177d5a5670fb659c79
    Merge: 8a5c998 25cf1f1
    Author: Ricardo Quesada <ricardoquesada@gmail.com>
    Date:   Tue Mar 1 16:54:04 2016 -0800

        Merge branch 'v3' into cmake_android

    commit 8a5c9981192e344fffc9f14be5cb14f66eccfa24
    Author: Chaoren Lin <chaorenl@google.com>
    Date:   Thu Feb 11 18:34:46 2016 -0800

        Fix module name in Android template to match CMake project.

    commit be85e19e852a9d5fbd6c58cea60c75fe47a5a576
    Author: Chaoren Lin <chaorenl@google.com>
    Date:   Thu Feb 11 18:27:45 2016 -0800

        Add missing platform specific source file to CMake project.

    commit 705389ac6582107a381d0cbc56268eaa98ffc5c3
    Author: Chaoren Lin <chaorenl@google.com>
    Date:   Wed Feb 10 19:21:12 2016 -0800

        Find AndroidNdkModules.cmake relative to android.toolchain.cmake.

    commit a10075e2cb30af2e1f9a30da99efac880658ad6b
    Author: Chaoren Lin <chaorenl@google.com>
    Date:   Wed Feb 10 19:03:11 2016 -0800

        Remove cpp-empty-test from project templates.

    commit e070fcbf210b8628f75785e738202a80a95ac0ff
    Author: WenhaiLin <wenhai.lin@chukong-inc.com>
    Date:   Mon Aug 31 09:56:03 2015 +0800

        Fix CMake for Android Target
 2016-03-02 16:51:54 -08:00
mogemimi 11f3f95a2c Fix compile error on case-sensitive filesystems 2016-03-02 15:47:42 +09:00
zilongshanren dbfb4c793c Merge pull request #15132 from mogemimi/remove-const-from-return 
Remove unnecessary const from return types
 2016-03-02 11:31:56 +08:00
Ricardo Quesada bc11e24019 Squashed commit of the following: 
commit 36c2807d07848448c1fed86f4b119205048691bf
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Mon Feb 29 13:11:40 2016 -0800

    binary file 82

commit 9b7cd003b12faefd0522d12f765c027efb001ab2
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Mon Feb 29 12:56:39 2016 -0800

    fore multiple in windows phone 8.1 too

commit daea8a3ef8d69915e7a9d962fd745a1103011bab
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Mon Feb 29 12:50:45 2016 -0800

    force multiple

commit 0fbabdbf99974e95de083d79c7d6ae7cf735e4b6
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Mon Feb 29 10:44:40 2016 -0800

    compiles

commit f817766afcd0ffc4ca93f628d55fabc4b5a96ba5
Merge: 7b2cea3 8bf3d33
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Mon Feb 29 09:37:24 2016 -0800

    Merge branch 'v3' into chipmunk_v7_2

commit 7b2cea329a56ae2786428d39a499bc12ba3860e6
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Sat Feb 27 01:11:13 2016 -0800

    correct paths for win8.1

commit dcf1f046eb1e18474d6f94b2d7dc31fbf1b06cea
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Fri Feb 26 22:46:58 2016 -0800

    projects works on win32

commit ab5b14c25ef0fdf224480302f9cb3cc01d5c360c
Merge: 04377cc 9af2f4e
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Fri Feb 26 21:57:10 2016 -0800

    Merge branch 'v3' into chipmunk_v7_2

commit 04377cce7f46b2c2016ccc3855fc479c4f6aa516
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Fri Feb 26 21:26:55 2016 -0800

    trying to make it compile on win32

commit 7703946d99e1cdc6a57f2ccb2a868818c1367291
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Wed Feb 24 10:28:12 2016 -0800

    quick hack to make it compile...

    ...autogenerated files will fix it.

commit ea35bf3a5894cb80b09ecd0a4a5408dcc19785f5
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Wed Feb 24 09:20:59 2016 -0800

    Squashed commit of the following:

    commit 487e52a7af7cdb40135fd3bd83b2efba0dfe6265
    Author: Ricardo Quesada <ricardoquesada@gmail.com>
    Date:   Tue Feb 23 20:10:13 2016 -0800

        compiles.. sort of

    commit a7990e2888d5ef1e43b811148b23c0b899105ab3
    Author: Ricardo Quesada <ricardoquesada@gmail.com>
    Date:   Tue Feb 23 19:55:24 2016 -0800

        more chipmunk fixes

    commit 1174f6ec8201324161d7946af0f493b136a56690
    Author: Ricardo Quesada <ricardoquesada@gmail.com>
    Date:   Tue Feb 23 19:36:15 2016 -0800

        more chipmunk fixes

    commit 00ac2449ca0c35bd9184310d58e74aaa05bd1323
    Merge: f942c5a 0594d3c
    Author: Ricardo Quesada <ricardoquesada@gmail.com>
    Date:   Tue Feb 23 19:29:27 2016 -0800

        Merge branch 'chipmunk_v7_squashed' of github.com:ricardoquesada/cocos2d-x into chipmunk_v7_squashed

    commit f942c5a3cc7b24f3ac211d781be1b9c9d4ec0fd7
    Author: Ricardo Quesada <ricardoquesada@gmail.com>
    Date:   Tue Feb 23 19:28:51 2016 -0800

        correct path for chipmunk

    commit 0594d3c4141d390b2566ea76101e383f15ebcaaf
    Author: Ricardo Quesada <ricardoquesada@gmail.com>
    Date:   Tue Feb 23 18:44:05 2016 -0800

        compiles on ios

    commit 379503399c384ad77d25d68a2f83b71a829b1c04
    Author: Ricardo Quesada <ricardoquesada@gmail.com>
    Date:   Tue Feb 23 17:51:36 2016 -0800

        chipmunk include fixes

    commit 95839fb7b406a32255853294b016d8c15aec1ed6
    Author: Ricardo Quesada <ricardoquesada@gmail.com>
    Date:   Tue Feb 23 17:09:04 2016 -0800

        fixes for cmake + mac

    commit 39449ea3b7efccae2946785c1c11433d964ee480
    Author: Ricardo Quesada <ricardoquesada@gmail.com>
    Date:   Tue Feb 23 16:51:25 2016 -0800

        correct includes

    commit 98e97d7d2f00e6a78d040dcaf17e5a077e9a88c3
    Author: Ricardo Quesada <ricardoquesada@gmail.com>
    Date:   Tue Feb 23 16:35:40 2016 -0800

        fixes chipmunk with cmake

    commit 337f21f9466703722847635301d841ace9b757cb
    Author: Ricardo Quesada <ricardoquesada@gmail.com>
    Date:   Tue Feb 23 14:42:01 2016 -0800

        updates android and linux projects

    commit 7111a9993b97f78cf73206804b25665c21a59ca8
    Author: Ricardo Quesada <ricardoquesada@gmail.com>
    Date:   Tue Feb 23 14:18:26 2016 -0800

        cosmetic changes

    commit ce15038b8d2c0c7ebe31b4e1efe92646b7c70d1b
    Author: Ricardo Quesada <ricardoquesada@gmail.com>
    Date:   Tue Feb 23 06:53:41 2016 -0800

        chipmunk autogenerated files

    commit 66c71bfa3aaab04abf25f284e2e76ce2a74a98de
    Author: Ricardo Quesada <ricardoquesada@gmail.com>
    Date:   Tue Feb 23 06:47:41 2016 -0800

        compatibility both in JS (to reduce space)

        and in C for (C++ users)

    commit 0f9ffa0a8ab23a19e1f10b04e6987c2288764b1f
    Author: Ricardo Quesada <ricardoquesada@gmail.com>
    Date:   Tue Feb 23 06:10:02 2016 -0800

        mooooore fixes

    commit 9ab23014093677e8eda69b105f50410b8c792aa3
    Author: Ricardo Quesada <ricardoquesada@gmail.com>
    Date:   Tue Feb 23 05:30:58 2016 -0800

        doesn't crash with collision handler

    commit 69275a16817a038244bbaaff9e82a011b6729cb2
    Author: Ricardo Quesada <ricardoquesada@gmail.com>
    Date:   Tue Feb 23 05:16:29 2016 -0800

        adds missing space functions

    commit a6b97bbc76cb9ab293356bb7451cfa858353f589
    Author: Ricardo Quesada <ricardoquesada@gmail.com>
    Date:   Mon Feb 22 22:22:27 2016 -0800

        queries... better

    commit 3442bceca64f5a0ddbbbb1a288146a2a61d87632
    Author: Ricardo Quesada <ricardoquesada@gmail.com>
    Date:   Mon Feb 22 19:48:41 2016 -0800

        adds more missing functions

        fixes other chipmunk JS issues

    commit 3797a033896d059da58a05ce0de832ed9c150eff
    Author: Ricardo Quesada <ricardoquesada@gmail.com>
    Date:   Mon Feb 22 18:30:21 2016 -0800

        yep... poly works ok

    commit d1bb57776891605b9d3e4fb90736c6869d96b944
    Author: Ricardo Quesada <ricardoquesada@gmail.com>
    Date:   Mon Feb 22 17:28:29 2016 -0800

        neede compat files

    commit 39ec518d4e089124d9a53fe3a8dce3aa0474c233
    Author: Ricardo Quesada <ricardoquesada@gmail.com>
    Date:   Mon Feb 22 17:28:04 2016 -0800

        query working!

    commit 71a8001fd6bc03ac674621f5da38a3f8778430b4
    Author: Ricardo Quesada <ricardoquesada@gmail.com>
    Date:   Fri Feb 19 21:57:03 2016 -0800

        almost there

    commit 9272fdcd06ba188db2fe5701fb2ac21476d54883
    Author: Ricardo Quesada <ricardoquesada@gmail.com>
    Date:   Fri Feb 19 21:18:46 2016 -0800

        fixes return values

    commit 7218778da846e1e36a510c0a19a5ee76f91db032
    Author: Ricardo Quesada <ricardoquesada@gmail.com>
    Date:   Fri Feb 19 20:36:14 2016 -0800

        cpMomentForSegment is manual since parameter 4 is optional

        in chipmunk 6, but not in 7

    commit 98d5d3e23c2cdb941cc0b1f3ce8275990356e88d
    Author: Ricardo Quesada <ricardoquesada@gmail.com>
    Date:   Fri Feb 19 17:29:28 2016 -0800

        yeah... process the arguments correctly

        works both for functions and auto_classes

    commit ce6a4fe3593b4f3b0fcdf11d12e297d789e0d96b
    Author: Ricardo Quesada <ricardoquesada@gmail.com>
    Date:   Fri Feb 19 16:49:00 2016 -0800

        compiles and links

        fixes some issues with the queries.
        returns shapes instad of the queryInfo

    commit 3f879482dc6db86e45e4319bc802ccf19b52a46c
    Author: Ricardo Quesada <ricardoquesada@gmail.com>
    Date:   Fri Feb 19 15:03:18 2016 -0800

        adds removeCollisionHandler and other fixes

    commit 32d825fc7bd323e144db6a1badc4a62420b6ea44
    Author: Ricardo Quesada <ricardoquesada@gmail.com>
    Date:   Thu Feb 18 20:59:24 2016 -0800

        compiles... doesn't work yet

    commit bd64de81713fb2d7652a538d667d73f05f5d9320
    Author: Ricardo Quesada <ricardoquesada@gmail.com>
    Date:   Wed Feb 17 18:17:39 2016 -0800

        WIP: chipmunk bindings
 2016-02-29 13:53:00 -08:00
mogemimi 2a8d84e7f9 Remove unnecessary const from return types 2016-02-29 16:48:07 +09:00
zilongshanren 92dca220ce improve mac editbox 2016-02-25 11:05:18 +08:00
mogemimi 8280f06c1f Add missing reference-return types 2016-02-18 05:10:42 +09:00
zilongshanren 9d8d003ac8 Merge pull request #15039 from Shulepov/scale9sprite_shaders_support 
Scale9Sprite: allow to set custom shaders (fix #12753)
 2016-02-15 21:24:14 +08:00
肖峰 57badc99aa make UIEditBox code compatible with 32bit project 2016-02-15 17:38:54 +08:00
zilongshanren 4db0d2c47a Merge pull request #15016 from zilongshanren/addMacEditBoxMultilineSupport 
add Mac Editbox multiline  support.
 2016-02-11 21:33:56 +08:00
Mikhail Shulepov 19e2434326 Scale9Sprite: allow to set custom GLProgram 2016-02-11 16:18:41 +03:00
zilongshanren 805be977fe tweak PageView page turning event time. 2016-02-04 15:57:32 +08:00
zilongshanren 35b0112290 fix linux compile issue 2016-02-04 15:30:16 +08:00
zilongshanren a93bc88d31 add Mac Editbox multiline support. 
1. It also refactor the original logic and optimize the iOS EditBox implementation.
 2016-02-04 14:21:07 +08:00
Wenhai Lin 4992037c5c Avoid creating temporary string objects 2016-02-03 23:12:37 +08:00
zilongshanren ee31d2ad22 Merge pull request #14940 from mxenabled/stop_auto_scroll 
Add ability to stop auto scrolling in ui::ScrollView and extension::ScrollView
 2016-02-01 14:27:55 +08:00
zilongshanren b0d0a7a064 Merge pull request #14964 from zilongshanren/fix14909 
fix pageview page turning event issue
 2016-01-27 20:53:48 +08:00
zilongshanren f853a43e04 Merge pull request #14970 from mxenabled/steerlink/cleanup_obsolete_win32 
Remove obsolete Win32 references.
 2016-01-26 09:58:32 +08:00
sheldon.teerlink 60d640442f Remove obsolete Win32 references. 2016-01-25 12:23:53 -07:00
zilongshanren b43764fc92 fix lua deprecated function bindings 2016-01-25 14:48:17 +08:00
zilongshanren dbf5b2c4a5 fix pageview page turning event issue 2016-01-25 11:53:40 +08:00
Ricardo Quesada 7582518424 default is word-wrap 2016-01-22 06:20:01 -08:00
Ricardo Quesada 25f78e490d RichText with word wrapping working as expected 2016-01-21 21:44:45 -08:00
Shane Smit ace1e9d563 Fixed variable rename to _autoScrollTotalTime 2016-01-21 11:18:52 -07:00
Ricardo Quesada ec2d29ed16 Merge pull request #14930 from ricardoquesada/rich_text_fixes 
adds JS tests for RichText
 2016-01-20 22:47:35 -08:00
zilongshanren 841ad8ae99 Merge pull request #14716 from newnon/v3.10_editbox_ios_mac_fix 
fix font for EditBox in iOS & Mac
 2016-01-21 11:05:12 +08:00
zilongshanren d9af70f913 Merge pull request #14600 from enhhh/enh_v3 
We should not intercept touch event if scrollview's _direction is NONE
 2016-01-21 10:58:20 +08:00
zilongshanren 061c6c7c6f Merge pull request #14907 from neokim/feature/scroll_view_touch_total_time_threshold 
Add a setter for touch total time threshold in ScrollView
 2016-01-21 10:31:31 +08:00
Ricardo Quesada 7735a75651 adds JS tests for RichText 2016-01-20 17:59:13 -08:00
Shane Smit 6fdefeb7a7 Make ui::ScrollView::scrollTo* functions virtual 
This mirrors the "jumpTo*" functions, which are already virtual
 2016-01-20 17:07:22 -07:00
Shane Smit c8ecab84a3 Add stopAutoScroll() to ui::ScrollView 
Immediately stops inner container scroll initiated by any of the "scrollTo*" member functions
 2016-01-20 17:05:52 -07:00
Ricardo Quesada e36d71a24c adds Invalid test 
UIRichText reports error on console when parsing invalid xml
 2016-01-19 21:16:53 -08:00
Ricardo Quesada 27c8e5227d Adds xml support in UIRichText 
Supported tags:
- <small>: makes the font 20% smaller
- <big>: makes the font 25% bigger
- <img src="" />: to add an image
- <font face="path to font" size="size" color="#00ffaa">: font
  attributes
- <i>: italics
- <b>: bold
- <u>: underline
- <del> strike-through
- </br>: new line

Also adds support for strikethrough, italics, bold and underlie to
`Label`

Contains tests for UIRichText and Label

Squashed commit of the following:

commit a0d6ae0513d40dbf414930210ab032a49d8984a0
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Tue Jan 19 20:39:21 2016 -0800

    cleanup LabelTestNew

commit 0cf423af85d88a42fc1317207feeb3d05da7f8ab
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Tue Jan 19 20:34:53 2016 -0800

    adds maaaany tests

    ...and fixes width and height in <img src="">

commit e8ba6acd5d79bbc766d7aa02ef166e166c801d01
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Fri Jan 15 19:41:37 2016 -0800

    Label + URL working Ok

commit 36689e29ee3d77310e92264a09084cc06e30664c
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Fri Jan 15 18:24:44 2016 -0800

    adding this code just in case...

    ... should use a listener component instead

commit af03708950e74483b875d0baad593aa6ed242a04
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Thu Jan 14 20:23:36 2016 -0800

    URL node

    plus <de><u> and <a img

commit e3a4930b012c0b3756752dac6ffb5ad43d24ae99
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Wed Jan 13 18:42:18 2016 -0800

    strikethrough and underline implemented

    they support multiline and horizontal alignment as well
    includes test
    however vertical alignment might not work

commit 640ccf39f56e153db46785a61be7000e898174c7
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Tue Jan 12 18:14:57 2016 -0800

    bug fixes

commit 5e41fb76e91c571639585a609a255eb41797a302
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Tue Jan 12 16:47:20 2016 -0800

    adds italics and bold "disable test"

commit 202c5a45bb9c8ea160b9f6880ef858874e07814b
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Tue Jan 12 14:40:13 2016 -0800

    adds italics test

commit d1a8b421445053cc36860fc376f52692a3672dfe
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Mon Jan 11 20:53:23 2016 -0800

    italics is working ok

commit fdd02087fce920c27c2409301ec88685fe68085b
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Fri Jan 8 17:18:56 2016 -0800

    color, size and face working

commit c01bdef6b1d49f8805b69d4c162b74cd00c8f5b3
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Thu Jan 7 19:02:16 2016 -0800

    initial commit
 2016-01-19 20:41:31 -08:00
Neo Kim df2aae0498 Add a setter for touch total time threshold in ScrollView 2016-01-18 19:25:08 +09:00
zilongshanren cd7671088f Merge pull request #14712 from xpol/fix-include-for-compile-under-crystax-ndk 
crystax-ndk-10.3.0 needs <stdint.h> to be included in cocos/ui/UIWebViewImpl-android.h.
 2016-01-12 11:56:43 +08:00
zilongshanren 161be986af Merge pull request #14340 from fnz/easyjni 
easy jni
 2016-01-12 11:50:16 +08:00
mogemimi 41dd44c75d Fix some typos in docs 2016-01-11 19:23:05 +09:00
XiaoFeng ab0efd933a Merge branch 'v3.10' of https://github.com/cocos2d/cocos2d-x into v3 
Conflicts:
	CHANGELOG
	cocos/scripting/js-bindings/manual/cocos2d_specifics.cpp
	tests/js-tests/src/RenderTextureTest/RenderTextureTest.js
 2016-01-09 18:01:56 +08:00
Ricardo Quesada 692c0f8a0e adds tvOS support 
Ported tests:
 - js-tests
 - cpp-tsts
 - lua-tests
 - game-controller tests

all of them working, but most of the tests can't be navigated
since they expect a controller.
 2015-12-28 15:59:36 -08:00
Liam c92b563c28 fix layout backimage size error with neweset scale9sprite 2015-12-25 14:11:56 +08:00
Liam d005bd18b7 remove error logic 2015-12-24 14:39:15 +08:00
zilongshanren 830eb3433f Merge pull request #14786 from liamcindy/v3_ui_widget 
fix uiWidget clipping error with Node
 2015-12-23 18:57:15 +08:00
Liam 0cac519e5c fix uiWidget clipping error with Node 2015-12-23 16:05:52 +08:00
zilongshanren 2a2f184449 refine code with DRY. 2015-12-23 14:43:25 +08:00
zilongshanren 847094ec7d ui::loadingBar -> add flip logic back 2015-12-23 14:34:36 +08:00
zilongshanren d4a5d0da44 rollback uislider 2015-12-22 20:03:56 +08:00
zilongshanren ab77e8c520 Revert "loading bar use new scale9 feature" 
This reverts commit a671bf7ce9.
 2015-12-22 19:53:24 +08:00
Liam 98a6558018 add interface for BMFont 2015-12-21 18:49:46 +08:00
ArisLittle 68e166568e fix some minor typos in the comments 
change spelling from "a item" to "an item", "a event" to "an event", "a index" to "an index" in cocos/ui/UIListView.h
 2015-12-21 14:26:50 +08:00
mogemimi aac1558b75 Fix typos in documentation, comments and strings 2015-12-21 08:22:41 +09:00
pandamicro 022bcc24f1 Merge branch 'v3.10' of github.com:cocos2d/cocos2d-x into v3 
Conflicts:
	cocos/scripting/js-bindings/manual/chipmunk/js_bindings_chipmunk_manual.cpp
	cocos/scripting/js-bindings/manual/component/CCComponentJS.cpp
	cocos/scripting/js-bindings/manual/js_bindings_opengl.cpp
 2015-12-20 22:56:33 +08:00
zilongshanren 94ee0734a5 Merge pull request #14721 from newnon/v3.10_slider_missprint 
slider misprint fix
 2015-12-19 17:06:26 +08:00
zilongshanren 4fda883c3b Merge pull request #14742 from xiaofeng11/v3.10 
Fix TextField won't show security text when first time set password enable
 2015-12-19 17:01:43 +08:00
Liam 8bf7908e93 fix loadingbar direction changed error 2015-12-19 15:59:27 +08:00
XiaoFeng d8817f3cbb Fix TextField won't show security text when first time set password enable 2015-12-19 15:44:39 +08:00
zilongshanren b480e9191d Merge pull request #14729 from newnon/v3.10_scale9sprite_cropped_spriteframes_support 
Scale9Sprite cropped sprite frames support
 2015-12-19 13:07:25 +08:00
Sergey 9e6657d6b2 fix scale9error error 2015-12-18 22:40:12 +03:00
mogemimi 12ece31121 Mark the old functions as CC_DEPRECATED_ATTRIBUTE 2015-12-19 01:21:56 +09:00
mogemimi 689ee1081a Fix spelling of function name 2015-12-19 01:07:08 +09:00
pandamicro 4d9beb9d77 Merge pull request #14699 from WenhaiLin/v3-new-nothrow 
Adds `std::nothrow` to the `new` statements
 2015-12-18 14:38:28 +08:00
Sergey 98fe1d46cc Scale9Sprite now fully support cropped sprite frames in both mode simple & slice 2015-12-18 00:32:59 +03:00
XiaoFeng 6c08dd920e Fix TextField missing default password style text setting 2015-12-17 18:29:23 +08:00
Sergey 3e049f8049 slider misprint fix 2015-12-17 12:06:39 +03:00
Sergey 89f4a1208b fix font for EditBox in iOS & Mac 2015-12-17 12:02:39 +03:00
Xpol Wan 41d4a41920 crystax-ndk-10.3.0 needs <stdint.h> to be included here. 2015-12-17 12:08:14 +08:00
Wenhai Lin dfdc202171 refine 2015-12-16 15:08:48 +08:00
Wenhai Lin 4fa58602a8 Adds `std::nothrow` to the `new` statements 2015-12-16 14:02:55 +08:00
Wenhai Lin e5952ad440 Improved robustness in release mode 2015-12-16 11:53:59 +08:00
Liam 508d54ec3c fix pageview child size 2015-12-14 15:29:02 +08:00
zilongshanren 0dd4433104 Merge pull request #14669 from zilongshanren/fixCustomSize 
fix #12249
 2015-12-14 13:56:50 +08:00
zilongshanren 6781c96fe0 Merge pull request #14661 from zilongshanren/v3.10 
fix scale9sprite global zorder issue.
 2015-12-14 13:56:29 +08:00
zilongshanren 838bd242ce fix #12249 2015-12-14 11:53:09 +08:00
zilongshanren 3e64e09e69 fix memory leaks of stencileStateManager 2015-12-14 10:40:09 +08:00
zilongshanren 0f5aac5754 fix typo 2015-12-14 10:14:39 +08:00
zilongshanren 8c9b03112e fix scale9sprite global zorder issue. 
1. it also fix the positiong issue when call setScale9Enabled(false)
 2015-12-14 10:09:06 +08:00
zilongshanren d75767bfc4 Merge pull request #14639 from liamcindy/v3_ui_text 
update for text effect clone
 2015-12-11 13:54:46 +08:00
Liam 4c5c6e6d9b update for code format 2015-12-11 12:04:54 +08:00
Liam 8c2b4c78db fix scrollview render error 2015-12-10 13:37:07 +08:00
Liam e92db43e14 update for text clone 2015-12-10 13:17:31 +08:00
zilongshanren bb515dce58 fix issue 12249 2015-12-09 17:15:09 +08:00
zilongshanren e37e1909f2 don't remove optimize code for capInsets 2015-12-09 15:00:41 +08:00
zilongshanren df44b164ef change layout scale9 rendering type to simple 2015-12-09 14:38:53 +08:00
zilongshanren 4c99bdf04f change imageview non-s9 to simple rendering type 2015-12-09 14:26:12 +08:00
zilongshanren df2ebfbc9c change uibutton nons9 to simple rendering mode 2015-12-09 14:21:26 +08:00
zilongshanren 9fd5985581 add simple rendering mode to slider 2015-12-09 11:32:52 +08:00
zilongshanren a671bf7ce9 loading bar use new scale9 feature 2015-12-09 10:41:31 +08:00
zilongshanren ea5dacedd0 Merge pull request #14608 from xiaofeng11/v3_310fix 
Bug fix & make test case more clear.
 2015-12-08 18:05:36 +08:00
XiaoFeng 73d0f8a46e Bug fix & make test case more clear. 
1. In CameraBackgroundSkyBoxBrush _actived and _textureValid should set true as default, otherwise will cause user get wrong display status.
2. "Enable Wrap" check box in "31:Node: Label - New API -> 55:Resize content Test" is not used, so set it to disabled, won't let user to change it.
3. When set blank texture to UISlider or UISlider button, use resetRender function to clear texture, use init with blank file name will cause error.
 2015-12-07 18:36:28 +08:00
Liam 15072a6dd3 revert error changes 2015-12-07 16:21:12 +08:00
enh a318e31222 We should not intercept touch event if scrollview's _direction is NONE 2015-12-06 22:51:22 +08:00
mogemimi 745f54b421 Replace 'ResouceData' with 'ResourceData' 2015-12-05 18:59:54 +09:00
mogemimi 09c6e5d2f7 Replace 'Disabeld' with 'Disabled' 2015-12-05 18:59:54 +09:00
pandamicro 1820a006ba Merge pull request #14502 from xiaofeng11/v3_combine_2d 
Combine Studio change for 2d components
 2015-12-04 16:05:24 +08:00
XiaoFeng 6fb65b5610 Editing code as comment. 
Move CocosStudioExtension path and update related files.
 2015-12-04 10:43:39 +08:00