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

406 Commits

Author SHA1 Message Date
pyrosphere 663bb4d7ed No CC_UNUSED_PARAM (#16812) 
* Added -Wno-unused-parameter and removed all uses of the CC_UNUSED_PARAM macro

* Commented unused parameter names in .cpp files which previously used CC_UNUSED_PARAM

* Reverted -Wno-unused-param flag.
Moved deprecated touch methods definitions to .cpp file.
Commented more unused parameter names.

* Fixed some errors and warnings caused by the previous commit.

* Commented remaining unused parameter names in .cpp files.

* Fixed unused parameter warnings in headers.

* Fixed some more unused parameter warnings.

* Fixed some more unused parameters warnings.

* Fixed mistake in previous commit, missing ComAudioReader:: in method. Other warnings.

* Fixed build errors.

* Added missing file to CMakeLists
 2016-11-16 09:48:37 +08:00
Josh Bodily 9f31a1e43c Add reason for edit end to UIEditBoxDelegate (#16771) 
* Add reason for edit end to UIEditBoxDelegate

* Adds "NEXT" action button for iOS and Android for easier form
* navigation

* Fix compile error
 2016-11-03 14:02:53 +08:00
Ricardo Quesada 323ea7c0d4 Sprite scale9 (#16702) 
* Adds slice9 support for Sprite.

how to use it:

// points coords
sprite->setCenterRect(Rect(x,y,w,h));

// normalized coords
sprite->setCenterRectNormalized(Rect(x,y,w,h));
starts scale9sprite in sprite

more slice 9 changes

sprite 9 slice works?

kind of works

correct anchor point

slice 9 works, at least with non-rotated atlases

streched works ok

better Y invert code.

cleaner, compatible with the previous code

yay, scaling workings...

need a better api now

sets scale correctly

yay! works as expected!

more fixes and tests

better test for box

setContentSize() changes size in non-9-slice mode sprites as well

setCenterRect() -> setCenterRectNormalized()

yet another test

adds setPositionNormalized()

adds setCenterRect() tests

remove devel team from xcode

tests: add one more tests

fun test!

improved test

yet another test for slice 9

* fixes anchorPoint issues

* adds documentation

* fix: using top-left coordinate for setRect

* sprite: fixes related to scale9 and tiled

* Sprite: slice 9 fixes

works Ok with rotated frames
uses `setCapInsets` instead of `setCenterRect` to be more familiar
with `UIScale9Sprite`

* fixes js and lua bindings for Autopolygon
 2016-10-26 18:45:40 -07:00
子龙山人 c3bbbb6cb2 Refactoring ui related code and fix label atlas and BMFont rendering issue with ETC1 texture format (#16615) 
* refactoring ui related code

* fix label bmfont/charmap etc drawing

* make code more robust
 2016-09-30 09:42:21 +08:00
mogemimi 2b9ac2c950 Remove redundant semicolons (#16558) 2016-09-12 09:45:34 +08:00
minggo 04fd2b16b2 merge v3.13 back to v3 2016-08-29 11:57:13 +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
minggo 2ca1760b78 Merge pull request #16079 from minggo/use-std_srand 
use std::srand() instead
 2016-07-11 12:01:38 +08:00
minggo a146f3eec7 use std::srand() instead 2016-07-11 11:17:28 +08:00
Ricardo Quesada 995868c62e fix: Text::create() does not crash on mac/ios 
...on invalid unicode.

fixes issue #16073
 2016-07-08 16:59:44 -07: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
zilongshanren b154f274a5 Merge pull request #15410 from 1scaR1/up_v3 
Make PageView indicator more tunable
 2016-05-19 16:19:18 +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
minggo 8068c51d94 remove studio related test cases and resources (#15574) 
* remove studio related test cases and resources

* remove unneeded files
 2016-05-06 13:38:19 +08:00
NamJunHyone 6746aeb992 ignoreAnchorPointForPosition() -> set ~ from missing files 2016-04-25 20:43:42 +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
mogemimi f9f751834a Add missing float suffix to avoid warning C4305 2016-04-20 03:54:47 +09:00
Xpol Wan dc0f7bf903 Fixes format warnings. 2016-04-18 17:52:58 +08:00
Бесшапошников Никита 2246495cc3 Add test for page view indicator tune 2016-04-11 12:29:02 +03:00
Ricardo Quesada c566dce581 fix: compile cpp-tests in release mode 
replace some deprecated functions
use `log` instead of `CCLOG` in order to avoid Warnings when not using
some variables
 2016-03-29 18:09:58 -07:00
Xpol Wan e7864cdb89 Removed unnecessary search paths. 2016-03-22 16:04:12 +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
zilongshanren 7ec4450fc0 add js ListView item reuse tests 2016-03-01 15:22:32 +08:00
zilongshanren 552d7d0132 add vertical list cell reuse tests 2016-03-01 13:44:42 +08:00
zilongshanren b3b08271e6 improve Listview item demo 2016-03-01 10:37:48 +08:00
zilongshanren a839d5818e add horizontal cell reuse ListView 2016-03-01 00:07:49 +08:00
zilongshanren 92dca220ce improve mac editbox 2016-02-25 11:05:18 +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
zilongshanren 74e7bd2083 fix win32 compile error 2016-01-26 09:52:53 +08:00
Ricardo Quesada 25f78e490d RichText with word wrapping working as expected 2016-01-21 21:44:45 -08:00
geron-cn 87434e2774 add scrollview bar parse for cocostudio in reader 2016-01-20 21:13:59 +08: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
zilongshanren e1d0d7f722 Merge pull request #14854 from zilongshanren/fixScale9GrayShader 
fix scale9sprite gray state opacity issue.
 2016-01-12 11:50:41 +08: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
zilongshanren 7d943f200f fix scale9sprite gray state opacity issue. 
Ticket: https://github.com/cocos2d/cocos2d-x/issues/14378
 2016-01-07 17:17:55 +08:00
zilongshanren 2797277de8 Revert "fix scale9sprite gray state opacity issue." 2016-01-07 17:07:27 +08:00
zilongshanren 1910f79b2f fix scale9sprite gray state opacity issue. 
Ticket: https://github.com/cocos2d/cocos2d-x/issues/14378
 2016-01-07 15:26:14 +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 bcc2ed0e2a update for scrollView test 2015-12-23 18:14:09 +08:00
Liam 8bf7908e93 fix loadingbar direction changed error 2015-12-19 15:59:27 +08:00
Sergey 714c01991e Scale9Sprite test improvemets 2015-12-18 01:38:53 +03:00
Sergey 98fe1d46cc Scale9Sprite now fully support cropped sprite frames in both mode simple & slice 2015-12-18 00:32:59 +03:00
zilongshanren 2881ce7c40 Merge pull request #14632 from liamcindy/UITest 
update for ui resource test
 2015-12-16 18:18:35 +08:00
Liam 508d54ec3c fix pageview child size 2015-12-14 15:29:02 +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 1a17e94e1c update for scrollview test 2015-12-10 15:25:27 +08:00
Liam 136b2bd514 Merge branch 'v3.10' of github.com:cocos2d/cocos2d-x into UITest 2015-12-10 14:53:43 +08:00
Liam e92db43e14 update for text clone 2015-12-10 13:17:31 +08:00
zilongshanren aedd48e74b Merge pull request #14615 from xiaofeng11/v3_testBugFix 
Remove default focus item from "Node:UI->1:GUI Dynamic Create Test->4:Focus Test"
 2015-12-09 18:36:08 +08:00
zilongshanren bb515dce58 fix issue 12249 2015-12-09 17:15:09 +08:00
zilongshanren df2ebfbc9c change uibutton nons9 to simple rendering mode 2015-12-09 14:21:26 +08:00
XiaoFeng 724e9b42a2 Remove default focus item from "Node:UI-->1:GUI Dynamic Create Test-->4:Focus Test" 2015-12-09 11:12:42 +08:00
zilongshanren 73d00b9262 fix scale9sprite be culled unexpectedly 
tickets: https://github.com/cocos2d/cocos2d-x/issues/14564
 2015-12-03 17:53:02 +08:00
Liam 096efe8744 rename print interface 2015-12-01 11:07:02 +08:00
Liam 6054dc0197 update for ui test 2015-11-30 16:17:13 +08:00
zilongshanren b1490c96b6 Merge branch 'v3' into fixListViewClippingIssue 2015-11-25 18:25:40 +08:00
zilongshanren 9c2130e88a fix Layout and ClippingNode nested rendering issue 2015-11-24 18:01:50 +08:00
zilongshanren 8d1f1a9933 Merge pull request #14457 from zilongshanren/testEditBoxScaleSize 
Fix edit box setPlaceholderFontName and scale font size issue
 2015-11-24 11:33:52 +08:00
zilongshanren 361daf7f5f fix wrong indentation 2015-11-23 11:50:04 +08:00
François Dupayrat 12df5ae1cc Fix wrong variable use for setPlaceholderFontName 
1. fix editbox scale not affect native font size
 2015-11-23 11:49:22 +08:00
zilongshanren 5d8cfa889c Merge pull request #14252 from neokim/change_pageview_to_derive_from_listview 
Change PageView to derive from ListView
 2015-11-17 12:02:10 +08:00
Neo Kim 603d788fbf PageView - Fix that page indicator was not working well in vertical page view. 2015-11-15 22:49:42 +09:00
Neo Kim 9cbbd283c7 PageView - Deprecate the APIs related to custom scroll threshold. 2015-11-10 21:35:01 +09:00
zilongshanren 3e2094981f add scale9sprite rendering type test 2015-10-30 14:01:01 +08:00
zilongshanren f84c2de1e2 add sprite and scale9sprite batch test 2015-10-30 09:58:02 +08:00
zilongshanren 1417534194 add rendering type to scale9sprite 2015-10-29 23:13:36 +08:00
Neo Kim 543fff63fb PageView - Add indicators to some test cases 2015-10-28 17:23:08 +09:00
Neo Kim abc309edb2 PageView - Replace the deprecated APIs with new ones. 2015-10-28 16:57:54 +09:00
Neo Kim b9a4449494 PageView - Add `handleReleaseLogic()` for page view. 2015-10-28 16:56:35 +09:00
Neo Kim 97acf52cc8 PageView - Replace the legacy methods of `PageView` with the ones of `ListView`. 2015-10-28 16:56:34 +09:00
Neo Kim e567259826 PageView - Change `PageView` to derive from `ListView` and use `ScrollView::Direction` instead of `PageView::Direction`. 2015-10-28 16:56:34 +09:00
Neo Kim a09f2af14c PageView - Trivial change on test code 2015-10-28 16:56:34 +09:00
XiaoFeng 767a4afb9f Fix UIPageViewVerticalTest in cpp-test can not scroll back to page 1 2015-10-14 09:16:34 +08:00
zilongshanren bee52e378d fix ui::WebView callback operate OpenGL issue. 
All the OpenGL operations should be in OpenGL thread.
This PR wraps the callbacks in OpenGL thread.
 2015-09-23 11:22:36 +08:00
pandamicro 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
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
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
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
Neo Kim 22b2f8b7b3 ListView - Change the order of test cases and fix for windows builds. 2015-09-11 16:00:53 +09: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
andyque c0f40ad4a5 fix Android EditBox font size issue 2015-09-02 18:25:30 +08: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
andyque 72496ae426 add missing ui test in Lua 2015-08-20 15:25:09 +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 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
WenhaiLin 772dab2002 Fixed minor problems in test cases. 2015-08-07 23:08:49 +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
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
andyque 5f34c1f072 add PageView vertical scroll support 2015-08-01 18:18:46 +08:00