Commit Graph

11260 Commits

Author SHA1 Message Date
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 f8016978ff Fix an improper macro syntax for windows platform 2016-01-18 14:28:39 +08:00
pandamicro 8bc9f712ea Merge pull request #14895 from minggo/firefox-remote-debug
web console supports for JSB projects
2016-01-15 21:27:27 +08:00
minggo 5f9bd06bee support webconsole 2016-01-15 18:05:59 +08:00
minggo e062ade514 make require() returns the value of last statement 2016-01-15 18:02:11 +08:00
pandamicro 2640396822 Merge pull request #14890 from minggo/firefox-remote-debug
can use new firefox version to debug cocos2d-x jsb projects
2016-01-15 12:48:46 +08:00
minggo 299a56d52e can use new firefox version to debug cocos2d-x jsb projects 2016-01-15 11:39:17 +08:00
James Chen b04e4754d7 Refactor CCBundle3D, remove wrong use of getDataFromFile. _jsonBuffer is std::string, _binaryBuffer is Data instance now. 2016-01-15 00:55:10 +08:00
James Chen 057db2444c Removes unused code in Material::initWithFile. 2016-01-15 00:55:10 +08:00
James Chen e7ed79f655 const Data -> const Data& for function argument, performance improvement. 2016-01-15 00:55:10 +08:00
James Chen 7e0a1344ca The fix for BMFontConfiguration::parseConfigFile reads string file.
'strchr' finds a char until it gets a '\0', if 'contents' self doesn't end with '\0',
'strchr' will search '\n' out of 'contents' 's buffer size, it will trigger potential and random crashes since
lineLength may bigger than 512 and 'memcpy(line, contents + parseCount, lineLength);' will cause stack buffer overflow.
2016-01-15 00:55:10 +08:00
zilongshanren 9c86d1f0f1 Merge pull request #14880 from mogemimi/fix-minor-typo
Fix typos in comments and documentation
2016-01-14 09:58:29 +08:00
xiaofeng11 be6f9c0f03 Merge pull request #14882 from geron-cn/playableframe
add PlayableFrame
2016-01-14 09:42:17 +08:00
Ricardo Quesada d589e44b0a Merge pull request #14692 from CodeAndWeb/spriteframe-anchor-from-plist
Load anchor points from plist files
2016-01-13 15:58:02 -08:00
geron-cn eab1de0f1e format code and remove fixes already in https://github.com/cocos2d/cocos2d-x/pull/14885 2016-01-13 16:34:04 +08:00
geron-cn e3c50caf11 add test case for PlayableFrame 2016-01-13 15:25:31 +08:00
geron-cn 0babe85947 add PlayableFrame 2016-01-12 17:21:01 +08:00
mogemimi 18a793792e Fix typos in comments and documentation 2016-01-12 13:27:06 +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 e1d0d7f722 Merge pull request #14854 from zilongshanren/fixScale9GrayShader
fix scale9sprite gray state opacity issue.
2016-01-12 11:50:41 +08:00
zilongshanren 161be986af Merge pull request #14340 from fnz/easyjni
easy jni
2016-01-12 11:50:16 +08:00
zilongshanren cf6fc000e7 Merge pull request #14709 from kcisoul/v3
Fix  #14428 CCRenderTexture does not work properly on some devices wh…
2016-01-12 11:35:00 +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 dc785f63ea garbage collect when transition is finished 2016-01-07 10:52:03 -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 ddb142e211 ouch... doesn't crash on pure C++ projects 2016-01-06 11:16:55 -08:00
XiaoFeng 0fcfb359d2 Fix more js parser font setting error 2016-01-06 20:42:27 +08:00
XiaoFeng d82b6b6f1c Fix js parser use resource path name for font name when font name is blank in BMFontLoader and ButtonLoader 2016-01-06 19:36:32 +08:00
zilongshanren b45e96f77e fix indent issue 2016-01-05 10:20:05 +08:00
zilongshanren 100a119181 add overFlow enum to jsb and lua.
1. change clamp to 1 and shrink to 2
2016-01-04 21:43:37 +08:00
Andreas Loew 69eed4b99c Updated comment 2016-01-04 11:19:40 +01:00
Wenhai Lin 168e851cce Fixed WebSocket may automatically disconnected if invoke `send` several times in quick succession on Android. 2015-12-31 10:42:06 +08:00
zilongshanren efbbdb1f58 Merge pull request #14813 from xiaofeng11/v3.10_xf_fix
Fix boundingRectWithSize compile failed with OSX 10.10 or lower version SDK
2015-12-30 13:51:41 +08:00
Ricardo Quesada b92b67edad moves macro definition to `ccConfig.h` 2015-12-29 17:36:02 -08:00
Ricardo Quesada 7cd80cb669 Adds iOS tests, calls GC after replacing scene
and some bug fixes

Squashed commit of the following:

commit 36b74ce4e68bf2f4a4c464453e695497716506eb
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Tue Dec 22 19:07:01 2015 -0800

    adds missing file

commit 017d03807122faa38fefaa8f4554db8edc83561d
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Tue Dec 22 19:02:27 2015 -0800

    disables GC by default

commit a2f3767a952e052eb8f0391bb5cbd1a8d0ce1b38
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Tue Dec 22 18:57:14 2015 -0800

    Adds iOS test and calls GC after replacing the scene

commit 7b3b628caeb3366356d9a896aebd9c96887a85ed
Merge: 79e926a e311655
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Tue Dec 22 15:29:01 2015 -0800

    Merge branch 'v3' into v3_js_memory_test_and_fixes

commit 79e926a970e3153ee826b299c3417fb6ac599153
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Mon Dec 21 21:27:19 2015 -0800

    fixes crashes

commit 76f3910748e15c4ea179eab846f24f3e65d52d2d
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Mon Dec 21 11:57:56 2015 -0800

    Adds standalone test for JS GC memory

    and fixes leaks on extended/subclassed objects
2015-12-29 17:36:02 -08:00
Ricardo Quesada 77aa3871b6 fixes compilation issues on tvOS 2015-12-29 12:30:00 -08:00
pandamicro 6ea389f475 Merge pull request #14815 from pandamicro/v3.10
Made require overwritable
2015-12-29 22:06:00 +08:00
pandamicro daac6ceb08 Made require overwritable 2015-12-29 21:28:30 +08:00
肖峰 770f3d7f8e Fix boundingRectWithSize compile failed with OSX 10.10 or lower version SDK 2015-12-29 18:31:20 +08:00
Ricardo Quesada b6d1edc8e7 Merge branch 'tvos_support' of github.com:ricardoquesada/cocos2d-x into tvos_support 2015-12-28 16:43:01 -08:00
Ricardo Quesada 666a6c6f88 adds missing scheme files 2015-12-28 16:42:44 -08:00
Ricardo Quesada 492389fd5b Update CCPlatformConfig.h 2015-12-28 16:03:48 -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
xiaofeng11 69a6406661 Merge pull request #14805 from pandamicro/v3.10
Fix JSB issues on win32
2015-12-25 20:06:47 +08:00