Commit Graph

34169 Commits

Author SHA1 Message Date
CocosRobot 4b214fd528 [ci skip][AUTO]: updating luabinding & jsbinding automatically 2016-01-21 07:40:58 +00:00
zilongshanren be7c8c7553 Merge pull request #14888 from xiaofeng11/v3_actiontimeline
Fix when add two ActionTimeLine object in one node, play state is wrong
2016-01-21 15:35:30 +08: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
xiaofeng11 015994da37 Merge pull request #14926 from geron-cn/scroll_bar
add scrollview bar parse for cocostudio in reader
2016-01-21 13:09:34 +08:00
geron-cn 7b405b29bc fix code indent 2016-01-21 11:33:13 +08:00
Ricardo Quesada 4c11432781 fixed bold 2016-01-20 19:08:31 -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 790c7b4b79 Merge pull request #14891 from mogemimi/fix-extra-tokens-warning
Fix warning: extra tokens at end of #ifdef directive
2016-01-21 10:51:01 +08:00
zilongshanren 4d128a83f4 Merge pull request #14659 from elvman/resizable_window
Resizable window
2016-01-21 10:49:33 +08:00
zilongshanren 8fda08abcd Merge pull request #14755 from mogemimi/fix-redefinition-warning
Fix OpenGL macro redefinition warning in JS bindings/Mac
2016-01-21 10:46:58 +08:00
zilongshanren 2ed4965b6d Merge pull request #14751 from newnon/v3_get_version_windows
getVersion win32 implementation
2016-01-21 10:42:19 +08:00
Ricardo Quesada 60d273e31b underline and strikethrough working ok on system fonts 2016-01-20 18:41:59 -08:00
zilongshanren 2fbf4c1539 Merge pull request #14932 from CocosRobot/update_lua_bindings_1453343722
[ci skip][AUTO]: updating luabinding & jsbinding automatically
2016-01-21 10:41:00 +08:00
CocosRobot 4dab20b715 [ci skip][AUTO]: updating luabinding & jsbinding automatically 2016-01-21 02:37:23 +00:00
zilongshanren fd0ed05f18 Merge pull request #14902 from mogemimi/update-docs-to-v3
Update docs to reflect latest API changes
2016-01-21 10:35:27 +08:00
zilongshanren c824b6e74a Merge pull request #14931 from CocosRobot/update_cocosfiles_1453343619
[AUTO][ci skip]: updating cocos2dx_files.json
2016-01-21 10:34:49 +08:00
zilongshanren e1e87c0205 Merge pull request #14914 from steerlink/font_family
Add ability to get the font family
2016-01-21 10:34:13 +08:00
CocosRobot f3cd516926 [AUTO][ci skip]: updating cocos2dx_files.json 2016-01-21 02:33:41 +00:00
zilongshanren c642014d1e Merge pull request #14927 from mogemimi/fix-unsigned-comparison-warn
Fix warning and a bug in FontAtlasCache::unloadFontAtlasTTF()
2016-01-21 10:32:56 +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
geron-cn be6fd6a2ee format code indent 2016-01-21 10:27:37 +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
mogemimi 9c5eecacc7 Update docs to reflect latest API changes 2016-01-21 01:08:32 +09:00
mogemimi 639bf3f682 Fix warning and a bug in FontAtlasCache::unloadFontAtlasTTF() 2016-01-20 23:59:45 +09:00
mogemimi 73793a8317 Fix macro redefinition warning in JS bindings/Mac 2016-01-20 23:17:24 +09:00
geron-cn 87434e2774 add scrollview bar parse for cocostudio in reader 2016-01-20 21:13:59 +08:00
geron-cn e2a3fb4a04 update ccs-res for scroll bar test 2016-01-20 21:12:52 +08:00
zilongshanren 6718fa3ea2 Merge pull request #14925 from CocosRobot/update_lua_bindings_1453285654
[ci skip][AUTO]: updating luabinding & jsbinding automatically
2016-01-20 18:32:37 +08:00
CocosRobot b3bb4a9b27 [ci skip][AUTO]: updating luabinding & jsbinding automatically 2016-01-20 10:30:04 +00:00
zilongshanren c675c74c29 Merge pull request #14924 from CocosRobot/update_cocosfiles_1453285559
[AUTO][ci skip]: updating cocos2dx_files.json
2016-01-20 18:26:41 +08:00
CocosRobot 309a6de467 [AUTO][ci skip]: updating cocos2dx_files.json 2016-01-20 10:26:00 +00:00
zilongshanren 44acbbfeb6 Merge pull request #14921 from CocosRobot/update_lua_bindings_1453285144
[ci skip][AUTO]: updating luabinding & jsbinding automatically
2016-01-20 18:24:28 +08:00
zilongshanren 74f9f3fd0e Merge pull request #14905 from WenhaiLin/v3-remove-CocosPlayClient
Remove CocosPlayClient
2016-01-20 18:24:16 +08:00
CocosRobot b340e48cb1 [ci skip][AUTO]: updating luabinding & jsbinding automatically 2016-01-20 10:21:41 +00:00
zilongshanren 76c00cb394 Merge pull request #14920 from CocosRobot/update_cocosfiles_1453285067
[AUTO][ci skip]: updating cocos2dx_files.json
2016-01-20 18:18:34 +08:00
CocosRobot f882d26a07 [AUTO][ci skip]: updating cocos2dx_files.json 2016-01-20 10:17:49 +00:00
zilongshanren 9af06d88b1 Merge pull request #14912 from SuperWangKai/v3
README typos
2016-01-20 18:17:11 +08:00
zilongshanren a10e2d2309 Merge pull request #14915 from MSOpenTech/v3-winrt-fix
v3 added missing getFileSize() method for winrt
2016-01-20 18:16:06 +08:00
zilongshanren 8940e1bdcc Merge pull request #14919 from xiaofeng11/v3_fixbot
update auto-binding bot setting
2016-01-20 18:15:20 +08:00
XiaoFeng 4ba7083cb9 update auto-binding bot setting 2016-01-20 17:49:34 +08:00
Ricardo Quesada 23014e4e00 Merge pull request #14918 from ricardoquesada/rich_text_squashed
Adds xml support in UIRichText
2016-01-19 22:15:15 -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 86e8f7d0b3 oops... removing debugging code 2016-01-19 20:46:57 -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
pandamicro 39ab445f7d Merge pull request #14904 from pandamicro/v3
[ci skip]Add more test case to jsb memory test
2016-01-20 11:43:49 +08:00
pandamicro 751e2f6eb8 Improve gc test case and add action cycle reference test 2016-01-20 11:15:06 +08:00
Dale Stammen a64be12646 added missing getFileSize() method for winrt 2016-01-19 12:36:10 -08:00
sheldon.teerlink 535dfdac27 Fix warning. 2016-01-19 11:47:18 -07:00