XiaoFeng
6fb65b5610
Editing code as comment.
...
Move CocosStudioExtension path and update related files.
2015-12-04 10:43:39 +08:00
zilongshanren
b1490c96b6
Merge branch 'v3' into fixListViewClippingIssue
2015-11-25 18:25:40 +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
XiaoFeng
bb83fe4596
Combine Studio change for UI components
2015-11-18 13:38:29 +08:00
pandamicro
27fc6b24ee
Merge pull request #14080 from 1scaR1/v3
...
Fixed enabling of scale9 background in ccui.Layout
2015-10-10 09:39:09 +08:00
mogemimi
5993304e06
Fix typos
2015-10-09 17:59:11 +09:00
Nikita
0042f9f5cd
Fixed background size if scale9 enabled in Layout
...
Fixes for issue: cocos2d#14001
2015-10-06 16:14:47 +03:00
pandamicro
aed6b0719e
Merge pull request #13089 from yangws/issue_12692
...
Fixed #12692 : UILayout viewing area cutting position calculation error
2015-07-31 12:02:00 +08:00
Vincent Yang
e1d4d22353
Fixed #12692 : UILayout viewing area cutting position calculation error
2015-07-29 18:43:11 +08:00
pandamicro
9fea134de1
Use sendNodeEventToJSExtended instead of sendNodeEventToJS in sub classes
2015-07-28 18:24:03 +08:00
pandamicro
89c722ed4b
Add script invocation for onEnter, onExit etc in other classes
2015-07-28 16:07:14 +08:00
xpol
29dcbe6685
Fixes some warnings and a related bug in CCSprite.
...
This story tells us that we should not just ignore warnings.
2015-07-07 23:01:24 +08:00
pandamicro
1b22438792
Merge branch 'v3.7-release' of https://github.com/cocos2d/cocos2d-x into merge-v3.7
...
Conflicts:
cocos/ui/UICheckBox.cpp
2015-07-03 10:23:49 +08:00
yangxiao
269feeb1f9
remove stencil from Renderstate
2015-07-01 14:06:37 +08:00
yangxiao
a56a5d24b6
fix camera mask of listview
2015-06-29 14:41:03 +08:00
Ricardo Quesada
c17da7e90d
Removes not-needed draws
2015-06-15 10:40:47 -07:00
Ricardo Quesada
32aae46343
fixes
2015-06-12 15:37:29 -07:00
Ricardo Quesada
2a3347dd49
RenderState: default state fixes
...
parts of cocos2d code calls GL directly.
This should be avoided since v3.7 since the
`RenderState::StateBlock::_defaultState` won't know that
and the state will be invalid.
In order to fix this issue, after calling GL directly, you should
update the `_defaultState` manually.
2015-06-12 15:03:48 -07:00
Vladimir Perminov
4c33050536
Optimize Vec2
...
small function Vec2 move to Vec2.inl
Added:
setZero();
Change all code:
_vec2 = Vec2(x, y); -> _vec2.set(x, y);
Vec2 vec2 = Vec2(x, y); -> Vec2 vec2(x, y);
_vec2 += Vec2(x, y); -> _vec2.add(x, y);
_vec2 = Vec2::ZERO; -> _vec2.setZero();
Vec2 vec2(Vec2::ZERO); -> Vec2 vec2;
2015-04-19 20:40:52 +03:00
minggo
20beb3b9e0
Merge pull request #9567 from joewan/v3-improve-perf
...
fix serious performance problem of Animate.
2014-12-22 14:57:26 +08:00
joewanchen
c2473b9b99
fix.
2014-12-21 01:03:30 +08:00
andyque
16cf396ed7
refactor Button restrict capInsetSize logic and cleanup ui coding style
2014-12-16 16:44:04 +08:00
Vladimir Timofeev
2835b094da
Cleanup order of fields initialization.
...
Make initialization order to match declarations.
This change twice reduces number of warnings when compiling on MacOS X with Xcode 6.1
Warnings was like "Field 'XXXX' will be initialized after field 'YYYY'"
2014-10-30 17:28:41 +03:00
pipu
9503253a17
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_pipu
2014-10-12 17:44:28 +08:00
pipu
752eb839c7
Add protocolbuf.a
2014-10-09 18:28:09 +08:00
Dhilan007
83150aa4d1
fix warns and memory leak
2014-10-09 17:19:43 +08:00
huangshiwu
c8bdba69ad
fix bug produce by CCDrawNode in test Node:UI-GUI Editor test-ScrollView PageView ListView
2014-09-17 14:00:40 +08:00
huangshiwu
8922121ed1
Deprecate DrawPrimitives and enhance DrawNode --make some modify
2014-09-12 07:33:34 +08:00
huangshiwu
8d8f4436db
Deprecate DrawPrimitives and enhance DrawNode --fix android compile error
2014-09-11 17:55:47 +08:00
huangshiwu
d9634057ab
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_drawnode_prbk
2014-09-11 16:41:54 +08:00
huangshiwu
fb1d47900c
Deprecate DrawPrimitives and enhance DrawNode
2014-09-11 15:39:56 +08:00
minggo
6a8270f33b
Merge pull request #7900 from minggo/setposition-optimize
...
not create Vec as possible for setting position
2014-08-28 14:31:54 +08:00
minggo
9fb977ff99
not create Vec as possible for setting position
2014-08-28 11:41:18 +08:00
Ricardo Quesada
3dda35b4ef
Adds `std::nothrow` to `new`
...
Since cocos2d-x doesn't support exceptions, it is important to add
`std::nothrow` to all the `new` statements
2014-08-27 16:31:57 -07:00
andyque
0e637b4d9f
add swallow touch and propagation customization to UIWidgets
2014-08-15 15:28:28 +08:00
huangshiwu
575c9787c0
Merge branch 'v3' into v3_pr
...
Conflicts:
cocos/2d/libcocos2d.vcxproj.filters
2014-08-01 15:11:34 +08:00
huangshiwu
ef69faf3ba
GLView Hook
2014-07-31 00:53:04 +08:00
andyque
83298171d9
refactor Layout
2014-07-30 16:33:37 +08:00
andyque
1daaea1410
remove extension::Scale9Sprite dependency
2014-07-29 16:24:27 +08:00
zhangcheng
6cfc5b72dc
1. CocosStudio adapt to cocos2d-x v3.2.
2014-07-21 17:45:56 +08:00
andyque
4fa1af584c
fix listview insert child at index bug
2014-07-18 18:02:46 +08:00
andyque
1dc1df0827
fix Layout typo
2014-07-15 14:57:10 +08:00
Dhilan007
6cff8cb564
fixed warn and replace NULL with nullptr.
2014-07-10 00:45:27 +08:00
andyque
60ea37cabc
fix focus functions
2014-06-30 14:09:27 +08:00
andyque
a4bd3879ac
fix ListView addChild problem
2014-06-25 16:17:16 +08:00
minggo
66703addb2
fixed #4693 : override addChild by name
2014-06-25 11:27:48 +08:00
andyque
5f5b705bee
refactor setSize to setContentSize and deprecated the old interface
2014-06-20 14:03:33 +08:00
andyque
4ca184b58a
issue #5161 , deprecated getSize
2014-06-20 11:18:53 +08:00