Commit Graph

3353 Commits

Author SHA1 Message Date
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
pandamicro 82881bf92f Merge pull request #14109 from loadrunner/label3
Added line spacing/leading feature to Label
2015-10-19 10:55:53 +08:00
Dale Stammen 3e3e47de10 added Win10 UWP curl support 2015-10-14 16:47:52 -07:00
pandamicro 40aa4187be Merge pull request #14138 from songchengjiang/cocos2d-v3-bugfix2
fix the #23272 bug
2015-10-14 14:05:09 +08:00
songchengjiang 02f20db82a fix the #23272 bug 2015-10-14 13:24:38 +08:00
pandamicro b19bf82170 Merge pull request #14108 from loadrunner/label2
Changed label font size type to float
2015-10-13 11:55:14 +08:00
pandamicro 5e43cfa129 Merge pull request #14107 from loadrunner/label1
Removed scale factor for label shadow
2015-10-13 11:54:14 +08:00
pandamicro 3dde02ba93 Merge pull request #14106 from loadrunner/tilemap
TMXLayer cast bug
2015-10-11 18:43:24 +08:00
Danut Chereches 471c23930c added line spacing/leading 2015-10-10 19:15:45 +03:00
Danut Chereches 019b549a20 changed font size type to float 2015-10-10 19:15:22 +03:00
Danut Chereches aeb268f3cd cast tile coordinates to int before calculating index 2015-10-10 19:05:51 +03:00
WenhaiLin 05c235f9fe ParticleSystemQuad:Fixed incorrectly generate errors "Particle system: not enough memory" 2015-10-10 17:55:05 +08:00
pandamicro f64105b3dc Merge pull request #14047 from liamcindy/v3.9
update for light3d reader
2015-10-10 11:43:05 +08:00
pandamicro ee3399a4a4 Merge pull request #14097 from TheCodez/patch-1
Add missing getChildByTag<>() api
2015-10-10 09:43:46 +08:00
Michael Kösel 493d95c3f6 Add missing getChildByTag<>() api 2015-10-10 00:08:38 +02:00
mogemimi 5993304e06 Fix typos 2015-10-09 17:59:11 +09:00
pandamicro a68d07b968 Merge pull request #14075 from TheCodez/getname_byref
Node::getName() now returns string by reference
2015-10-08 11:43:03 +08:00
pandamicro 5c816b5d9b Merge pull request #14063 from kammy/improve_spriteframecache
Inprove SpriteFrameCache::addSpriteFramesWithDictionary
2015-10-08 11:23:21 +08:00
TheCodez eb747cf808 Node::getName() returns string by reference 2015-10-05 21:42:07 +02:00
pandamicro 1e298a2c1a Merge pull request #14064 from MSOpenTech/v3-win10-fix
V3: fixed Windows 10 UWP app manifest by correcting image asset paths
2015-10-04 10:53:52 +08:00
Dale Stammen 32eeb560c3 clean up include files for WINRT platforms 2015-10-02 18:49:41 -07:00
KURA Shuichi 0469632cf8 Inprove addSpriteFramesWithDictionary
- Moved initialization of image to an appropriate
  location, because it always called twice in
  SpriteFrameCache::addSpriteFramesWithFile()
2015-10-03 03:18:07 +09:00
mogemimi 9f768bc1ab Add missing override keyword 2015-10-02 18:18:23 +09:00
Joachim Grill c49b60ae40 SpriteFrameCache: added plist file format documentation, fixed broken link 2015-10-01 10:36:18 +02:00
Joachim Grill 9a0ea79b61 remove set/get/hasPolygonInfo methods from js / lua api; fixed C++11 issue 2015-09-30 15:20:53 +02:00
Joachim Grill 79656ffe13 fixed typo, indentation 2015-09-29 16:50:14 +02:00
Joachim Grill ac24612e98 extend SpriteFrameCache to load PolygonInfo from plist file 2015-09-29 15:42:04 +02:00
Liam 87a406febe update for light3d reader 2015-09-29 11:27:01 +08:00
Danut Chereches 8944f9e1cd removed scale factor for label shadow 2015-09-28 16:27:20 +03:00
pandamicro 7b85211cfe Remove ScriptComponent
Because windows platform can't successfully compile in previous architecture
2015-09-27 22:18:59 +08:00
pandamicro ddb636a022 Add ScriptComponent and ComponentJS 2015-09-26 19:43:36 +08:00
minggo 26632ec69a linjia demo finish 2015-09-26 19:43:35 +08:00
pandamicro 95379c5dc2 Merge pull request #13995 from xiaofeng11/v3
Fix issue http://punchbox.info:3000/issues/23146
2015-09-24 13:03:59 +08:00
XiaoFeng 6db2cd7b9c Fix issue : http://punchbox.info:3000/issues/23182
When time scale set to negative value, it will cause emitCounter been set to negative value and cause render crash
2015-09-23 18:37:12 +08:00
Martin Taylor 62e36e8006 fix typos and syntax error. A thorough check by tool VSSpellChecker. 2015-09-22 16:08:23 +08:00
pandamicro 08204ec0bd Merge pull request #13991 from MSOpenTech/v3-win10-fix
V3 Win10 UWP fixes
2015-09-22 02:44:45 +08:00
Dale Stammen 6a5db06115 added missing CCMotionStreak3D files. Re-added all Physics and 3D files to project 2015-09-21 11:11:34 -07:00
pandamicro b54a06a55e Merge pull request #13987 from Dimon4eg/Fix-crash-in-FontFreeType
Fix crash in destructor of FontFreeType
2015-09-22 01:59:34 +08:00
pandamicro deacab9222 Merge pull request #13990 from MSOpenTech/v3-win10-fix
V3 Win10 UWP fixes
2015-09-22 01:57:53 +08:00
Dale Stammen 70e157a44a removed CCComponentPhysics2d from Win10 UWP project 2015-09-21 10:44:30 -07:00
dimon4eg 09b5b7fcc3 Fix crash in destructor of FontFreeType 2015-09-21 18:18:58 +03:00
pandamicro 5511d42cd4 Merge pull request #13716 from fusijie/particle_performance
Refactory particle system update.
2015-09-21 14:19:55 +08:00
fusijie d871b1aa8a Refactory particle system. 2015-09-20 16:46:09 +08:00
pandamicro 0cbc1e5f40 Merge pull request #13923 from WenhaiLin/v3-physics-refine
Refine components to improve physics performance
2015-09-18 21:56:36 +08:00
pandamicro add24ccf95 Merge pull request #13913 from fusijie/revert-12889-fix_clippingRectangle_bug
Revert "remove CCClippingRectangleNode transform error support."
2015-09-18 21:43:42 +08:00
pandamicro 13f3d46ad4 Merge pull request #13897 from super626/v3
SkyboxBrush : Make the shader parameter take effect at once
2015-09-18 16:14:06 +08:00
WenhaiLin a17a702cd1 Refine components to improve performance 2015-09-18 14:34:02 +08:00
fusijie 23246b006b fixed region x,y scale bug. 2015-09-18 13:39:22 +08:00
偶尔e网事 eb480fb021 Revert "remove CCClippingRectangleNode transform error support." 2015-09-18 11:31:37 +08:00
yangxiao 757209e59e make the shader parameter take effect at once 2015-09-17 18:14:17 +08:00
yangxiao 572ee3adb2 merge cocos 2015-09-17 14:24:01 +08:00
pandamicro 0479cca364 Merge pull request #13832 from yangws/downloader
Restructure CCDownloader implement on iOS and Android don't use libcurl.
2015-09-16 14:01:28 +08:00
Vincent Yang 848fa2c0d0 Merge cocos2d. 2015-09-15 18:30:45 +08:00
子龙山人 73d2c5d1b8 Merge pull request #13577 from fusijie/fix_13454
Fixed sprite debug draw.
2015-09-15 14:24:23 +08:00
pandamicro f281ae31b0 Merge pull request #13725 from WenhaiLin/v3-comonent-refine
Refine ComponentContainer to  improve performance
2015-09-10 18:04:26 +08:00
pandamicro 7611f99ee4 Merge pull request #13746 from WenhaiLin/v3-menuitemtoggle-refine
Uncoupling the implementation of MenuItemToggle dependence on tag.
2015-09-10 16:15:18 +08:00
pandamicro 98f29e4dee Merge pull request #13764 from fusijie/fix_autopolygon_comments
[ci skip]Fixed autopolygon comments
2015-09-10 15:22:55 +08:00
fusijie d957e0c032 Fixed auto polygon comments out of date. 2015-09-10 15:18:04 +08:00
WenhaiLin e251866d23 Uncoupling the implementation of MenuItemToggle dependence on tag. 2015-09-09 15:32:44 +08:00
WenhaiLin 34be2065e4 Refine ComponentContainer to improve performance 2015-09-09 11:53:55 +08:00
Martin Taylor e592a1a02d fix typos 2015-09-09 11:37:41 +08:00
pandamicro dc607a1784 Merge pull request #13726 from jianglong0156/actionExtendSquash
support custom action, and rewrite update function
2015-09-09 10:25:56 +08:00
江龙 badd80bf3a support custom action, and rewrite update function
support custom action in js, and developer can rewrite the update function in custom action class.
useage:
// custom action sample code
var customMoveBy = cc.MoveBy.extend({
    ctor:function (duration, deltaPos, deltaY) {
        this._super(duration, deltaPos, deltaY);
    },
    update:function (dt) {
        this._super(dt);

        if (this.getTarget()) { // rand color
            this.getTarget().setColor(cc.color(cc.rand()%255, cc.rand()%255, cc.rand()%255));
        }

    }
});
2015-09-09 10:08:07 +08:00
minggo 8326ed6535 add physics component 2015-09-08 09:54:01 +08:00