Neo Kim
|
6a0609a687
|
Merge the logics for bouncing of VERTICAL, HORIZONTAL and BOTH in one function. VERTICAL and HORIZONTAL can be processed as BOTH.
|
2015-06-22 14:05:49 +09:00 |
Neo Kim
|
368b5e8f12
|
Remove duplicated logics in scrollChildrenBoth(), and extract meaningful logic into separate functions.
|
2015-06-22 14:05:49 +09: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 |
andyque
|
96f8842ee1
|
make scrollview time arguments more meaningful
|
2015-04-15 16:37:11 +08:00 |
andyque
|
16cf396ed7
|
refactor Button restrict capInsetSize logic and cleanup ui coding style
|
2014-12-16 16:44:04 +08:00 |
pipu
|
e38da9f9b6
|
Add callback framework using flat buffers
|
2014-11-27 16:49:19 +08:00 |
andyque
|
952e52365b
|
fix scrollView rotate issue
|
2014-10-17 14:02:49 +08:00 |
andyque
|
8161d2ad34
|
fix scrollView rotate issue
|
2014-10-17 11:31:00 +08:00 |
pipu
|
752eb839c7
|
Add protocolbuf.a
|
2014-10-09 18:28:09 +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
|
deb7ff64d4
|
fix pageView touch location
|
2014-08-19 15:14:07 +08:00 |
andyque
|
0e637b4d9f
|
add swallow touch and propagation customization to UIWidgets
|
2014-08-15 15:28:28 +08:00 |
andyque
|
d7b17c598d
|
fix potential crash when user remove self in widgets callback
|
2014-08-01 20:58:42 +08:00 |
andyque
|
6e64714331
|
fix scroll
|
2014-07-02 11:48:28 +08:00 |
joshuastray
|
99b127ba5d
|
fix scrollview crashes on win32 because of variable returned without initialization
|
2014-06-30 10:19:00 +08:00 |
andyque
|
a4bd3879ac
|
fix ListView addChild problem
|
2014-06-25 16:17:16 +08:00 |
minggo
|
e90e7699a6
|
Merge pull request #7195 from minggo/addChild-override
override addChild by name
|
2014-06-25 14:12:10 +08:00 |
minggo
|
66703addb2
|
fixed #4693: override addChild by name
|
2014-06-25 11:27:48 +08:00 |
andyque
|
78e119ef56
|
Merge branch 'v3' into fixTouchEvent
Conflicts:
cocos/ui/UIWidget.cpp
|
2014-06-25 11:10:51 +08:00 |
andyque
|
65e4c6f4d5
|
fix listView item click move
|
2014-06-25 10:45:08 +08:00 |
andyque
|
547ad379ae
|
closed #5589
|
2014-06-24 15:51:14 +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 |
andyque
|
585ccf2c71
|
issue #5161, replace all _size to _contentSize
|
2014-06-20 10:40:16 +08:00 |
minggo
|
08453b911d
|
Merge pull request #7071 from pandamicro/Script_onEnter_fix
Fixed #5563: Wrap override onEnter function by script call detection code to solve bugs in JSB
|
2014-06-18 13:37:57 +08:00 |
pandamicro
|
94fdff1da9
|
Fixed #5563: Make sendNodeEventToXXX as static functions of ScriptEngineManager in CCScriptSupport
|
2014-06-18 11:51:52 +08:00 |
pandamicro
|
d00c9fe70a
|
Fixed #5563: Add sendNodeEventToJSExtended function to fix issues and remove lua event send (unnecessary)
|
2014-06-16 12:50:35 +08:00 |
pandamicro
|
d524ba1013
|
Fixed #5563: Wrap override onEnter function by script call detection code to solve bugs in JSB
|
2014-06-13 17:59:23 +08:00 |
minggo
|
8a5bfb9840
|
issue #4693: add getName(), setName() and getChildByName()
|
2014-06-11 16:57:43 +08:00 |
andyque
|
7a25fbfe29
|
refactor touch event
|
2014-06-09 10:23:11 +08:00 |
andyque
|
c6cb3a56fb
|
refactor ListView, add do Layout
|
2014-06-04 10:51:32 +08:00 |
andyque
|
36e7c9cdfc
|
add constness to UIScrollView
|
2014-05-27 11:30:36 +08:00 |
andyque
|
e32a637bf5
|
add const to ui framework methods
|
2014-05-27 11:30:35 +08:00 |
andyque
|
cc8b70b87d
|
issue #5176, refactor UIFocusManager and UIScrollView
|
2014-05-26 17:34:56 +08:00 |
andyque
|
e866800044
|
issue #5176, refactor UICheckBox releaseUpEvent
|
2014-05-26 14:44:28 +08:00 |
andyque
|
40f2128acd
|
Merge branch 'v3' into 5176
Conflicts:
build/cocos2d_libs.xcodeproj/project.pbxproj
cocos/ui/UIPageView.cpp
cocos/ui/UIScrollView.cpp
cocos/ui/UIScrollView.h
|
2014-05-26 14:00:23 +08:00 |
andyque
|
634fea7c45
|
Merge remote-tracking branch 'upstream/v3' into refactor5183
|
2014-05-26 09:18:32 +08:00 |
andyque
|
d612518421
|
fix ui widget copyProperties issue
|
2014-05-23 15:03:46 +08:00 |
andyque
|
6d9a21d0ed
|
issue #5176, add focus event listener to UIScrollView
|
2014-05-23 11:18:26 +08:00 |
andyque
|
3f363f0e51
|
issue #5176, add focus to UIScrollView
|
2014-05-23 10:59:18 +08:00 |
andyque
|
26be2708a0
|
issue #5176, refactor UIScrollView
|
2014-05-23 10:08:53 +08:00 |
andyque
|
1165ba8bc3
|
issue #5176, readd addChild methods into UIListView
|
2014-05-22 17:49:19 +08:00 |
andyque
|
c8d9ab8122
|
issue #5176, refactor passTouchEventToParent method of UIWidget
|
2014-05-22 15:23:13 +08:00 |
andyque
|
3b777646c4
|
issue #5176. fix UIScrollView
|
2014-05-22 11:01:58 +08:00 |
andyque
|
432f688a67
|
issue #5183, refactor
|
2014-05-20 10:16:19 +08:00 |
andyque
|
a9e1c50897
|
issue #5183, refactor UIScrollView
|
2014-05-19 17:34:48 +08:00 |
andyque
|
ee24e137f7
|
issue #5183, refactor obscure functions
|
2014-05-19 17:18:04 +08:00 |
zifter
|
d875f27c67
|
Merge branch 'FixNodeConst' of https://github.com/zifter/cocos2d-x into FixNodeConst
Conflicts:
cocos/ui/UIListView.h
cocos/ui/UIPageView.h
|
2014-05-17 10:40:36 +03:00 |
andyque
|
1b3c28ea90
|
Merge branch 'v3' into refactorLayout
Conflicts:
cocos/ui/UILayout.cpp
|
2014-05-16 10:22:53 +08:00 |
andyque
|
cfa0342618
|
Merge branch 'v3' into issue5005
Conflicts:
cocos/ui/UIWidget.cpp
|
2014-05-15 11:03:03 +08:00 |