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

108 Commits

Author SHA1 Message Date
mogemimi 2a8d84e7f9 Remove unnecessary const from return types 2016-02-29 16:48:07 +09:00
zilongshanren 838bd242ce fix #12249 2015-12-14 11:53:09 +08:00
zilongshanren df2ebfbc9c change uibutton nons9 to simple rendering mode 2015-12-09 14:21:26 +08: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
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
Liam 15072a6dd3 revert error changes 2015-12-07 16:21:12 +08:00
mogemimi 745f54b421 Replace 'ResouceData' with 'ResourceData' 2015-12-05 18:59:54 +09:00
XiaoFeng 6fb65b5610 Editing code as comment. 
Move CocosStudioExtension path and update related files.
 2015-12-04 10:43:39 +08:00
XiaoFeng d744c167b7 Fix button texture loaded mark has set to wrong value bug 2015-11-26 13:49:32 +08:00
XiaoFeng eb47d28266 Change component resource load logic, won't dependent on sprite edit in other studio combine PR 2015-11-25 20:07:50 +08:00
XiaoFeng 27f6d6a6ba Remove condition macro check. 2015-11-24 19:17:38 +08:00
XiaoFeng bb83fe4596 Combine Studio change for UI components 2015-11-18 13:38:29 +08:00
子龙山人 f2bee23696 Merge pull request #13789 from neokim/fix-13668 
Fix for #13668
 2015-09-15 18:28:24 +08:00
andyque 2fea4db9fc fix ui::Button title location issue 2015-09-15 13:37:32 +08:00
Neo Kim c224a81497 Rectify typos 2015-09-14 15:27:51 +09:00
Vincent Yang 35040e7bb1 Fixed #12249 : Button touch doesn't work with setScale9Enabled. 2015-07-23 17:27:04 +08:00
andyque 517221a0df add jumpToPage API to PageView. 
1. This commit also fix the default font size issue in ui::Button.
 2015-07-16 11:33:57 +08:00
andyque 74f0b3b436 add bmfont test 2015-05-27 16:58:52 +08:00
子龙山人 ca8ca35fd6 Merge pull request #12054 from andyque/Feature_Add_Title_Alignment_for_Button 
[ci skip]Feature add title alignment for button
 2015-05-27 16:09:06 +08:00
andyque 44babe18fb add missing comments and fix back compatibility. 2015-05-27 16:07:37 +08:00
Felix J d5a7163b29 don't update content size if not necessary 
refactor a little so we don't need to update the content size if bmfont is used, but still updating the _fontSize.
 2015-05-25 14:45:26 +07:00
Felix J 219d8193c4 remove else clause 
Removing the else clause cause BMFont cannot set its font size
 2015-05-25 12:48:56 +07:00
felixjingga 9c264ab64b include algorithm header file 2015-05-20 16:42:48 +07:00
felixjingga ee13dd82b8 fix compile error, and fix check of the fontname 2015-05-20 16:34:45 +07:00
felixjingga dcf4492ff0 add implementation detail to support BMFont 2015-05-20 15:56:07 +07:00
dkorchinskiy 03aa73d68f Feature #11886 add title alignment for button 2015-05-18 13:33:48 +03:00
andyque 8a9f420735 fix side effect of ui::button clone 2015-04-16 14:38:00 +08:00
andyque 240bf58bfc fix edge case crash 2015-04-14 15:34:15 +08:00
andyque a2df0ca769 optimize memory usage of ui::Button 2015-04-14 15:00:42 +08:00
andyque 7b81f3a811 remove unused code 2015-01-27 10:17:41 +08:00
andyque d58426db99 fix button pressAction scale issue 2015-01-21 14:54:37 +08:00
minggo dca1edccd7 Merge pull request #10113 from liamcindy/Scale9Error 
update for ui object scale9 state refresh
 2015-01-21 10:51:55 +08:00
Liam a42d213d16 update for ui object scale9 state refresh 2015-01-20 17:24:04 +08:00
Liam 90df276067 add function for ui button 2015-01-19 16:58:46 +08:00
minggo 7ab4e0de3a Merge pull request #9634 from andyque/fixIssue9628 
fix setTitleColor calls method setColor instead of setTextColor of title label.
 2014-12-29 11:24:36 +08:00
andyque 3f0f7c289f change setColor to setTextColor 2014-12-25 16:07:34 +08:00
andyque d8f726bc4f modify widget default behavior 2014-12-23 15:03:31 +08:00
andyque 16cf396ed7 refactor Button restrict capInsetSize logic and cleanup ui coding style 2014-12-16 16:44:04 +08:00
Haneol Park a6e4b31b0d Additional unnecessary set dirty of ui widgets 2014-11-25 20:42:03 +09: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
Liam 19ed3d1965 udpate for ui button state change event 2014-10-27 11:16:25 +08:00
Liam f1970e98dd update for ui button press event 2014-10-25 18:00:57 +08:00
Liam 92bdfea638 update ui button size changed logic 2014-10-24 17:38:32 +08:00
minggo 0ab3017094 Merge pull request #8658 from pipu/v3_pipu 
V3 pipu
 2014-10-14 14:25:46 +08:00
minggo 1d5652ad48 Merge pull request #8635 from ahlwong/v3 
Fix UIButton setFontSize sync ContentSize
 2014-10-13 17:25:18 +08:00
pipu 96c8fde63a 1. Modifying UIButton.cpp 
2.  Modifying protocol directory name to "protobuf-lite" for iOS, mac platform
 2014-10-13 12:49:15 +08:00
pipu 9503253a17 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_pipu 2014-10-12 17:44:28 +08:00
Ahlwong dd5c5a29b9 Refactor UIButton ContentSize update 2014-10-10 21:13:04 -07:00
pipu b732ce378e Merge branch 'v3_pipu_protocol_buffers' into merge_test 
Conflicts:
	cocos/ui/UIScale9Sprite.cpp
 2014-10-11 11:08:46 +08:00