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

3519 Commits

Author SHA1 Message Date
mogemimi 1d9e688707 Fix typos in documentation 2016-02-18 16:16:36 +09:00
NamJunHyone 79c69d77d6 fix return value 2016-02-18 11:23:54 +09:00
mogemimi 8280f06c1f Add missing reference-return types 2016-02-18 05:10:42 +09:00
James Chen 0cb94cc373 Merge branch 'v3_libwebsockets' of https://github.com/xiaofeng11/cocos2d-x into refactor-websocket 2016-02-17 14:56:57 +08:00
pandamicro 1030151047 Fix C++ crash caused by CC_ENABLE_GC_FOR_NATIVE_OBJECTS macro 2016-02-16 13:43:11 +08:00
pandamicro cb4d24e1ee Merge pull request #14759 from pandamicro/hbmemory 
Implement Full GC Relied memory model
 2016-02-14 14:48:01 +08:00
XiaoFeng 85fc074e29 libwebsockets have been compiled as static lib, remove libwebsockets.dll from win10 & win8.1 project 2016-02-14 10:07:00 +08:00
Ian Clarkson 1dbac01659 Bitmap font sizes are not loaded from binary .fnt files. 
This problem causes bitmap fonts based on .fnt files to not appear at all, and no error is thrown.
Fixes #15042.
 2016-02-12 14:21:18 -05:00
Mikhail Shulepov ec664bc08b Added aliases for PixelFormat names 2016-02-12 17:25:11 +03:00
Mikhail Shulepov 8ad49c1bbc SpriteFrameCache: take pixelFormat into account if specified 2016-02-11 15:47:23 +03:00
Wenhai Lin 4992037c5c Avoid creating temporary string objects 2016-02-03 23:12:37 +08:00
zilongshanren 4f388d769a Merge pull request #15002 from WenhaiLin/v3-TargetedAction-donefix 
Fixed TargetedAction::isDone always return false!
 2016-02-03 17:44:26 +08:00
pandamicro fefd05e54d Fix Menu event get released issue 2016-02-02 16:44:32 +08:00
Wenhai Lin bae36b7a98 Label:Fixed characters are displayed incorrectly with some specific font. 2016-02-02 11:16:36 +08:00
Wenhai Lin eba594bb41 Fixed TargetedAction::isDone always return false! 2016-02-02 11:07:38 +08:00
pandamicro e2568b3a6f Merge branch 'v3' of github.com:cocos2d/cocos2d-x into hbmemory 
Conflicts:
	tests/js-memory-gc-tests/src/tests-main.js
 2016-01-28 01:12:49 +08:00
pandamicro de9b51c0cf Fix other GC issues 2016-01-28 01:03:50 +08:00
Justin Luong bd4615795e fixed documentation for better reading clarity 2016-01-27 11:42:25 +10:00
pandamicro d6cedb88ec Remove JS::Persistent and move js object reference into JS scope 2016-01-24 19:47:26 +08:00
Justin Luong c4df3ccd10 please ignore just a test 2016-01-22 11:05:43 +10: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
Ricardo Quesada 4c11432781 fixed bold 2016-01-20 19:08:31 -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 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 e1e87c0205 Merge pull request #14914 from steerlink/font_family 
Add ability to get the font family
 2016-01-21 10:34:13 +08: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
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
sheldon.teerlink 535dfdac27 Fix warning. 2016-01-19 11:47:18 -07:00
sheldon.teerlink 41d7a27485 Implement getFontFamily(). 2016-01-19 11:43:35 -07:00
pandamicro fc19435123 Merge branch 'v3' of github.com:pandamicro/cocos2d-x into hbmemory 
Conflicts:
	cocos/base/ccConfig.h
	cocos/scripting/js-bindings/manual/ScriptingCore.cpp
	cocos/scripting/js-bindings/manual/ScriptingCore.h
	cocos/scripting/js-bindings/script/jsb_prepare.js
 2016-01-18 16:40:00 +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
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 0babe85947 add PlayableFrame 2016-01-12 17:21:01 +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 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
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
xiaofeng11 434c79ae90 Merge pull request #14793 from super626/fixsprite2 
It already been reviewed and compile by jenkins in https://github.com/cocos2d/cocos2d-x/pull/14697.
We need merge it to V3.10 to file TMX render bug.
 2015-12-24 09:40:36 +08:00
Ricardo Quesada 707f08c557 Revert "fix setflip for batch sprite" 2015-12-23 09:54:04 -08:00
Ricardo Quesada 0d0534a2e1 Merge pull request #14697 from super626/v3.10-fixsprite 
fix setflip for batch sprite
 2015-12-23 09:53:24 -08:00
mogemimi b0c4adcbd0 Fix method name spelling in AutoPolygon 2015-12-23 19:07:03 +09:00
XiaoFeng 3fd8f36a90 Limit force GC in menu item only work in lua-binding 2015-12-23 12:30:59 +08:00
XiaoFeng 82867b0073 Roll back disable force GC change on windows platform, this cause lua binding can not respond mouse click 
Remove 3d touch demo iOS sdk checking, it SDK defines won't work in cpp compile
 2015-12-22 18:41:44 +08:00
pandamicro 6a6407f711 Pass native references to script scope 2015-12-21 00:16:16 +08: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
Sergey bac68bd0b8 getVersion win32 implementation 2015-12-20 00:09:45 +03:00
pandamicro 8f836162aa Temporary disable forceGC on win32 2015-12-19 22:45:57 +08: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
zilongshanren 2a6cec25fa Merge pull request #14701 from WenhaiLin/v3-label-letterfix 
Fixed label's letter can't be hide by `setVisible(false)`.
 2015-12-18 11:41:51 +08:00
kci d3898991af fix some logical error 2015-12-18 11:03:23 +09:00
kci 8a39c1a06a Windows/osx/linux build fail bug fixed 2015-12-17 15:40:16 +09:00
kci afc50be1ed Fix #14428 CCRenderTexture does not work properly on some devices which does not support "GL_OES_packed_depth_stencil". 2015-12-17 10:34:51 +09:00
zilongshanren 89c620eb4b Merge pull request #14696 from WenhaiLin/v3-labelfix 
Improved robustness in release mode
 2015-12-16 17:00:45 +08:00
pandamicro 05da27338a Merge branch 'fix/ios9_downloader_bug' of github.com:cezheng/cocos2d-x into v3.10 2015-12-16 15:24:42 +08:00
Wenhai Lin b91882f150 Fixed label's letter can't be hide by `setVisible(false)`. 2015-12-16 14:59:33 +08:00
Wenhai Lin 4fa58602a8 Adds `std::nothrow` to the `new` statements 2015-12-16 14:02:55 +08:00
yangxiao 74b480c1b6 fix setflip for batch sprite 2015-12-16 13:45:37 +08:00
Wenhai Lin e5952ad440 Improved robustness in release mode 2015-12-16 11:53:59 +08:00
Joachim Grill ba45e2df33 updated lua bindings; updated file format description 2015-12-15 10:56:10 +01:00
XiaoYang 727d857c88 Merge pull request #14674 from super626/tilemap 
fix fast tilemap blend function
 2015-12-15 17:23:53 +08:00
mogemimi 18aec7e942 Fix deprecation warning in FontFNT 2015-12-15 02:25:32 +09:00
Joachim Grill 4dd3595b1e added test with plist file containing anchor points 2015-12-14 16:17:41 +01:00
Joachim Grill 033b9aabf0 read sprite anchor point from plist file 2015-12-14 15:42:18 +01:00
yangxiao b6ec4c9c5d fix fast tilemap blend function 2015-12-14 16:51:53 +08:00
yangxiao eee7726f5f fix setflip for batch sprite 2015-12-14 15:35:26 +08:00
zilongshanren 96db089b64 Merge pull request #14665 from zilongshanren/fixMemoryLeak 
fix memory leaks of stencileStateManager
 2015-12-14 13:34:17 +08:00
pandamicro 41218a65e7 Merge pull request #14668 from pandamicro/v3 
Sync v3 and Fix win32 js project crash issue
 2015-12-14 13:12:42 +08:00
zilongshanren 3e64e09e69 fix memory leaks of stencileStateManager 2015-12-14 10:40:09 +08:00
xiaofeng11 1c53920a13 Merge pull request #14660 from chengstory/#24345 
Fix #24345
 2015-12-14 10:38:13 +08:00
zilongshanren b1d700ad33 fix bmfont size error 2015-12-13 13:59:42 +08:00
mogemimi 07673f71cd Fix inconsistent header include guards 2015-12-12 21:05:22 +09: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
Ricardo Quesada 2420c942c3 Merge pull request #14617 from chengstory/#24345 
Fix #24345
 2015-12-10 09:19:30 -08:00
Liam e92db43e14 update for text clone 2015-12-10 13:17:31 +08:00
Dale Stammen 35c855a565 updated dll name to v3.10 2015-12-09 17:33:14 -08:00
zhangcheng 2a806a82c6 Fix #24345 
TMX Iso Zorder and TMX Ortho Zorder rendering error in TestCPP.
 2015-12-09 15:07:58 +08:00
mogemimi f280a31323 Fix typo in documentation and comments 2015-12-09 01:48:24 +09: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
zilongshanren 5ef1c92420 Merge pull request #14609 from zilongshanren/fixLabelClampIssue 
fix horizontal clamp and shrink issue
 2015-12-07 19:45:19 +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
zilongshanren 6c17ef4baf fix horizontal clamp and shrink issue 2015-12-07 18:13:03 +08:00
Ricardo Quesada aebfefd7a8 Merge branch 'v3' into js_more_conversions 2015-12-04 19:01:20 -08: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 71217fd393 Fix indent 2015-12-04 15:14:47 +08:00
XiaoFeng 1171c6aaa1 Remove desktop only function, set ondraw serial function in DrawNode override able. 2015-12-04 14:55:54 +08:00
XiaoFeng 6fb65b5610 Editing code as comment. 
Move CocosStudioExtension path and update related files.
 2015-12-04 10:43:39 +08:00
zilongshanren 01644cb46e Merge pull request #14569 from mogemimi/fix-docs-typo 
Fix typos in documentation
 2015-12-04 09:55:30 +08:00
XiaoFeng 2da192a1c2 Remove cocostudio header file from sprite and particle, and adjust tests 
Fix compile error under iOS & Mac
 2015-12-04 09:26:14 +08:00
Ricardo Quesada 3100cba5a1 Animation ported to JS 2015-12-03 15:02:39 -08:00
Ricardo Quesada 3646d1e9fc Adds init(array) for Sequence and Spawn 
it also makes the code cleaner.
this is needed for JS
 2015-12-03 12:16:21 -08:00
mogemimi be213bf306 Fix typos in documentation 2015-12-03 21:03:00 +09:00
XiaoFeng 70b9183ddb Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_combine_2d 
Conflicts:
	tools/bindings-generator
 2015-12-03 14:35:36 +08:00
XiaoFeng 32b81a69f5 Add test for new API 
remove Sprite::setOffsetPosFromCenter api add by cocos studio, and reset _unflippedOffsetPositionFromCenter to zero in Sprite::setTexture
 2015-12-03 14:21:00 +08:00
Ricardo Quesada 48523572b7 label JS fixes 2015-12-02 17:23:23 -08:00
XiaoFeng a804c67a12 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_combine_2d 
Conflicts:
	cocos/scripting/lua-bindings/manual/LuaBasicConversions.h
 2015-12-02 15:07:58 +08:00
zilongshanren ed55d41858 fix label clamp when scaled with bmfont 2015-12-02 13:48:20 +08:00
XiaoFeng 89ef6da5b5 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_combine_2d 
Conflicts:
	cocos/2d/CCFontFNT.h
 2015-11-28 12:48:55 +08:00
PavlOm 6e0525156b no message 2015-11-27 23:33:20 +10:00
zilongshanren 0f8c3e0c1c Merge pull request #14435 from zilongshanren/improve-label-layout-v2 
Add Overflow to Label
 2015-11-27 17:31:40 +08:00
肖峰 8b631f5c9f Fix compile failed on mobile platform 2015-11-27 15:19:50 +08:00
XiaoFeng d69453fa54 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_combine 2015-11-26 19:04:13 +08:00
XiaoFeng 52f696945d Remove condition MACRO and remove ASSERT in Sprite::initWithFile function 
Remove CameraFlag define for Cocos Studio only
 2015-11-26 14:47:37 +08:00
zilongshanren 5221f8a6fc improve the code by code review suggestions. 2015-11-26 12:03:18 +08:00
XiaoFeng 397fa809da Add default line width to create function 2015-11-26 09:32:57 +08:00
XiaoFeng 9ec451ca31 Update CCDrawNode, remove condition MACRO 2015-11-25 23:26:57 +08:00
zilongshanren 584a5d7407 fix alphaThreshold undefined issue 2015-11-25 18:27:38 +08:00
zilongshanren b1490c96b6 Merge branch 'v3' into fixListViewClippingIssue 2015-11-25 18:25:40 +08:00
zilongshanren b0d88a552a Merge pull request #14419 from xiaofeng11/v3_combine_ui 
Combine Studio change for UI components
 2015-11-25 17:19:54 +08:00
zilongshanren 03046d6fbd change the default alphaThreshold 2015-11-25 14:31:32 +08:00
zilongshanren 759c0bbf31 rename CCStencilBitsManager to StencilStateManager 2015-11-25 14:24:27 +08:00
zilongshanren 5fef088695 refactor stencil state management code 2015-11-25 14:14:17 +08:00
zilongshanren 9c2130e88a fix Layout and ClippingNode nested rendering issue 2015-11-24 18:01:50 +08:00
zilongshanren 7676b1cb73 improve label layout logic 2015-11-23 17:47:30 +08:00
zilongshanren 7ee82f20fc fix getLetter crash issue. 
1. make vertical clamp works in non-wrap mode.

2. make the lineHeight and letterSprite scale work correct.
 2015-11-20 16:39:48 +08:00
zilongshanren 8c25749366 minor improvement 2015-11-20 10:54:05 +08:00
zilongshanren 19257d6120 Add Overflow feature char map font. 
1. fix single line clamp.
 2015-11-19 18:14:46 +08:00
zilongshanren ccdb2a75f9 Add Label Overflow and wrap option. 
Squashed commit of the following:

commit 7176582def3686f78701f92ead4d0976bccd115d
Author: zilongshanren <guanghui8827@126.com>
Date:   Thu Nov 19 10:30:54 2015 +0800

    add char map font test

commit 7ea7c251ff549e4a74d5c5c3faa49893fe5defc4
Author: zilongshanren <guanghui8827@126.com>
Date:   Wed Nov 18 15:00:17 2015 +0800

    system font overflow is not supported

commit a02fe0c7f94692b95a0bfd6f194a94c4519cee3a
Author: zilongshanren <guanghui8827@126.com>
Date:   Wed Nov 18 11:04:15 2015 +0800

    add system font test

commit eb098da8b16f485c86929a9b2ba00a64068264e9
Author: zilongshanren <guanghui8827@126.com>
Date:   Tue Nov 17 10:29:35 2015 +0800

    Finish resize height mode

commit ca78ba35abdbacc23bf6f8315454ec0a356a6aca
Author: zilongshanren <guanghui8827@126.com>
Date:   Mon Nov 16 11:01:27 2015 +0800

    fix wrap issue

commit baf1a5e0dc3a08da0a13500aea5afc82017b054a
Author: zilongshanren <guanghui8827@126.com>
Date:   Sat Nov 14 08:28:57 2015 +0800

    horizontal shrink still has a issue

commit 7e8abc0990cdf299d23c8072c5c1d4aa561bf798
Author: zilongshanren <guanghui8827@126.com>
Date:   Fri Nov 13 11:42:34 2015 +0800

    finish shrink without wrap

commit c9c45bd1f304ba00a6f9a274fa5631659a075bc1
Author: zilongshanren <guanghui8827@126.com>
Date:   Fri Nov 13 10:09:46 2015 +0800

    update shrink

commit ad82010ea846679e4d1a09f5127be29ae2e6adae
Author: zilongshanren <guanghui8827@126.com>
Date:   Thu Nov 12 17:55:15 2015 +0800

    refactor shrink logic

commit effc1ee1cd9f06eaa4f46dd5c2a1401f6a285af6
Author: zilongshanren <guanghui8827@126.com>
Date:   Wed Nov 11 18:25:34 2015 +0800

    add resize overflow type

commit 194d552adc2a4ba2c439eff969b082556315e0ae
Author: zilongshanren <guanghui8827@126.com>
Date:   Wed Nov 11 11:49:51 2015 +0800

    no wrap, shrink is working.

commit e2222ef14d5392817bd727895b3c2caec5ce4faf
Author: zilongshanren <guanghui8827@126.com>
Date:   Tue Nov 10 16:16:27 2015 +0800

    add overflow type to label.

    1. optimize the testcase

commit b65e2de4bfb3cb86a0d0cfa118be891a3f9fe858
Author: zilongshanren <guanghui8827@126.com>
Date:   Mon Nov 9 17:22:34 2015 +0800

    finish bmfont wrap by char

commit f339ff0309dc9e2ca2871f03f4551d329afce5e1
Author: zilongshanren <guanghui8827@126.com>
Date:   Mon Nov 9 17:04:51 2015 +0800

    finish bmfont wrap by word

commit 4c8edc65204a1294ac81315e72f1299acbdf43c0
Author: zilongshanren <guanghui8827@126.com>
Date:   Mon Nov 9 11:29:21 2015 +0800

    add BMFont size support

commit 3282481bda9dcb0f88b41f2568f7e5c856af6d53
Author: zilongshanren <guanghui8827@126.com>
Date:   Mon Nov 9 09:58:01 2015 +0800

    add font size support for BMFONT

commit 0c8e2a0374983625507a183cb2eb53a0b1709e25
Author: zilongshanren <guanghui8827@126.com>
Date:   Fri Nov 6 16:36:27 2015 +0800

    add toggle wrap option.

    1. make hirozontal clamp working

commit 19dcd3e80a34c54b20934d08937eb270e689a7db
Author: zilongshanren <guanghui8827@126.com>
Date:   Fri Nov 6 15:12:59 2015 +0800

    tweak label layout

commit e36a40babf4817ea7e9830614ac7560f2e69c583
Author: zilongshanren <guanghui8827@126.com>
Date:   Thu Nov 5 11:11:02 2015 +0800

    finish the test skeleton

commit a144a3a5d388d15c4f37cbfc12563eccabffb8e1
Author: zilongshanren <guanghui8827@126.com>
Date:   Wed Nov 4 16:38:54 2015 +0800

    add setFontSize api to label.

    1. add new chinese-english bmfont
    2. beautify base test

commit b22551c9eb3738fbb1c38ae4a3bfd07a202dcaf0
Author: zilongshanren <guanghui8827@126.com>
Date:   Wed Nov 4 11:27:18 2015 +0800

    add label layout test skeleton
 2015-11-19 16:06:13 +08:00
XiaoFeng 5369f9a84d Add header file to make this pr can pass jenkins auto build 2015-11-19 10:14:27 +08:00
XiaoFeng bb83fe4596 Combine Studio change for UI components 2015-11-18 13:38:29 +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
zilongshanren a5b7674b4d Merge pull request #14263 from zilongshanren/improve-scale9sprite-v4 
improve scale9sprite
 2015-11-17 10:48:09 +08:00
XiaoFeng d47a79c0e4 Remove cocos studio limitation for new functions 2015-11-16 11:08:20 +08:00
XiaoFeng 140eaf7b6c Fix function name in cpp file 2015-11-13 09:09:02 +08:00
XiaoFeng 4c8066e39f Normalize function names. 2015-11-12 18:23:56 +08:00
XiaoFeng 1546a062a1 Update 2015-11-12 10:57:22 +08:00
XiaoFeng c40a2a3301 Combine Studio change for 2d components 2015-11-12 09:49:49 +08:00
mogemimi a31cce9a80 Fix minor grammar and typo in documentation 2015-11-04 17:14:00 +09:00
Dale Stammen dfe56769a1 added missing Light3DReader files 2015-11-03 08:04:55 -08:00
liamcindy 872141d547 update for light3d reader 2015-11-03 13:34:21 +08:00
zilongshanren ccf4cb5a74 improve scale9sprite 2015-10-29 10:41:58 +08:00
Neo Kim b72e4118f0 PageViewIndicator - Add `PageViewIndicator.cpp` to build configuration files. 2015-10-28 16:56:36 +09:00
pandamicro b6b9364a84 Merge pull request #14232 from xiaofeng11/v3 
Fix FadeOutDownTilesTest won't show last tile
 2015-10-28 15:44:28 +08:00
XiaoFeng 6029635493 Remove comment out codes 2015-10-27 18:43:51 +08:00
pandamicro aa9f0d5bd5 Merge pull request #14049 from CodeAndWeb/v3-sprite-polygoninfo-from-plist 
Extending SpriteFrameCache to read PolygonInfo from atlas plist file
 2015-10-27 17:28:22 +08:00
XiaoFeng f374df408e Fix FadeOutDownTilesTest won't show last tile 2015-10-27 14:41:31 +08:00
Joachim Grill 94ab41ceb3 use "const string &" in SpriteFrameCache 2015-10-26 09:36:01 +01:00
mogemimi 9df30d2454 Fix typos in documentation 2015-10-23 16:59:51 +09:00
pandamicro 05b277752c Merge pull request #14105 from WenhaiLin/v3.9-rc 
ParticleSystemQuad:Fixed incorrectly generate errors "Particle system not enough memory"
 2015-10-22 10:36:02 +08:00
mogemimi c3194ac34d Fix memory leak in TMXLayer 2015-10-19 19:47:36 +09:00