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

101 Commits

Author SHA1 Message Date
andyque 29e9ef7edf Merge branch 'v3' into modifyWidgetDefaultBehavior 
Conflicts:
	cocos/2d/libcocos2d.vcxproj.filters
	cocos/2d/libcocos2d_8_1/libcocos2d_8_1/libcocos2d_8_1.Shared/libcocos2d_8_1.Shared.vcxitems.filters
	cocos/2d/libcocos2d_wp8.vcxproj.filters
 2014-12-25 18:08:07 +08:00
Liam dcd544cc66 update ui widget function format 2014-12-24 11:12:14 +08:00
Liam 815ea2a1a5 update for code format 2014-12-23 20:29:53 +08:00
andyque d8f726bc4f modify widget default behavior 2014-12-23 15:03:31 +08:00
Liam f5a242be97 update for widget percent position and size logic 2014-12-22 15:23:26 +08:00
Liam 5a73ea9313 reset widget chaned 2014-12-22 15:04:25 +08:00
Liam 56e42b0a0a update for lay out 2014-12-22 11:20:03 +08:00
pipu e38da9f9b6 Add callback framework using flat buffers 2014-11-27 16:49:19 +08:00
andyque 9c3c693a21 refactor Widget flip logic 2014-11-07 11:11:51 +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
minggo bca15538e3 Merge pull request #8823 from super626/v3 
add isVisibleByVisitingCamera check
 2014-10-18 15:11:45 +08:00
Liam 3f954857a8 update for lay out 2014-10-17 19:13:37 +08:00
yangxiao 66dd0807eb add isVisibleByVisitingCamera check when visit 2014-10-17 18:07:45 +08:00
pipu 752eb839c7 Add protocolbuf.a 2014-10-09 18:28:09 +08:00
andyque 294271682b change return const value to value 2014-09-12 14:39:22 +08:00
andyque ed22792a72 fix text only button issue 2014-09-12 13:50:13 +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
minggo b9c51e6994 remove unneeded codes 2014-08-26 18:19:28 +08:00
andyque 3f51926c5d add click event listener to Widget 2014-08-21 10:21:07 +08:00
andyque 0e637b4d9f add swallow touch and propagation customization to UIWidgets 2014-08-15 15:28:28 +08:00
andyque cdb2b9f59f fixed Widget's Children reload textures change RGBA issue 2014-08-11 15:04:00 +08:00
andyque ab33e6f9a2 Let Widget class don't support cascaded opacity and cascaded color on default. 2014-08-06 16:21:00 +08:00
minggo b2e705acd8 Merge pull request #7567 from andyque/fixWidgetCallbackDeleteSelf 
fix remove self in Widget touch callback issue
 2014-07-28 14:04:20 +08:00
andyque 7353f8685a Simplify Widget ContentSize cascade change algorithm 2014-07-25 14:59:58 +08:00
andyque 3502cb0a23 fix remove self in Widget touch callback issue 2014-07-25 14:23:04 +08:00
andyque 4fa1af584c fix listview insert child at index bug 2014-07-18 18:02:46 +08:00
andyque 78e119ef56 Merge branch 'v3' into fixTouchEvent 
Conflicts:
	cocos/ui/UIWidget.cpp
 2014-06-25 11:10:51 +08:00
andyque 547ad379ae closed #5589 2014-06-24 15:51:14 +08:00
andyque 4d82673760 issue #5161, replace _size with _contentSize 2014-06-24 15:08:58 +08:00
andyque 9b945683b5 fix contentSize not set properly problem 2014-06-20 14:55:42 +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 8a5bfb9840 issue #4693: add getName(), setName() and getChildByName() 2014-06-11 16:57:43 +08:00
samuele3hu 5a80b4da2e Fix the crash of cocostudio ui lua test cases and add some deprecated functions of Widget 2014-06-10 11:30:39 +08:00
andyque 7a25fbfe29 refactor touch event 2014-06-09 10:23:11 +08:00
andyque 4f22b03d7f refactor Widget setColor & setOpacity 2014-06-06 16:14:35 +08:00
Ricardo Quesada 79ebc546f8 Merge remote-tracking branch 'cocos2d/v3' into normalized_position 
Conflicts:
	CHANGELOG
	cocos/ui/UILayout.cpp
 2014-06-04 09:19:22 -07:00
andyque 38e274de73 refact ui header file include 2014-06-04 14:56:33 +08:00
Ricardo Quesada 1b8d0d88df Adds setNormalizedPosition() 
Changes in `visit()` were done in order to do it
in a robust and fast way.
 2014-05-30 16:42:05 -07:00
andyque e32a637bf5 add const to ui framework methods 2014-05-27 11:30:35 +08:00
andyque 9cef55d62c issue #5176, refactor FocusNavigationController 2014-05-27 10:20:37 +08:00
andyque d8d5139aaf closed #5176, refactor UILayout and focus 2014-05-26 23:04:44 +08:00
andyque f32044fca9 closed #5176, fix FocusNavigationController 2014-05-26 18:38:03 +08:00
andyque 642969cc84 issue #5176, move setting setFirstFocsuedWidget to setFocused method 2014-05-26 18:27:06 +08:00
andyque 1a6dba8656 issue #5176, refactor UIFocusManager 2014-05-26 18:17:47 +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