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

73 Commits

Author SHA1 Message Date
zilongshanren d4a5d0da44 rollback uislider 2015-12-22 20:03:56 +08:00
Sergey 3e049f8049 slider misprint fix 2015-12-17 12:06:39 +03:00
zilongshanren 838bd242ce fix #12249 2015-12-14 11:53:09 +08:00
zilongshanren bb515dce58 fix issue 12249 2015-12-09 17:15:09 +08:00
zilongshanren e37e1909f2 don't remove optimize code for capInsets 2015-12-09 15:00:41 +08:00
zilongshanren 9fd5985581 add simple rendering mode to slider 2015-12-09 11:32:52 +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
mogemimi 745f54b421 Replace 'ResouceData' with 'ResourceData' 2015-12-05 18:59:54 +09:00
mogemimi 09c6e5d2f7 Replace 'Disabeld' with 'Disabled' 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 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
XiaoFeng f5c88c32af Fix click slider bar but not drag ball, after slider position changed won't send percentChangedEvent 2015-09-23 10:55:01 +08:00
andyque fe5a43c428 Enable tapping Slider bar to scroll 
Fixed issue: https://github.com/cocos2d/cocos2d-x/issues/13434
 2015-09-15 14:13:52 +08:00
andyque 40492e6169 fix Slider create missing res type. 
fixed https://github.com/cocos2d/cocos2d-x/issues/13575
 2015-08-27 23:34:39 +08:00
andyque fc673ee502 Merge branch 'v3.7-release' into v3 2015-07-13 22:44:54 +08:00
XiaoFeng 92d78efce0 Fix percentage setting won't effect when UISlider's background resource set to null 2015-07-10 17:00:16 +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
XiaoFeng 668dc50e07 Fix when slider set to disable mode then clean slider ball disable texture, normal texture won't show 2015-07-02 16:45:17 +08:00
Vincent Yang 2ba6f266ad Fixed bug: UI component can't click correctly by moving UI and camera far away of origin. 2015-06-30 14:32:14 +08:00
Vincent Yang f8a5b1e18c Fixed bug: UI component can't click correctly by moving UI and camera far away of origin. 2015-06-18 10:23:52 +08:00
andyque b8826d9de4 improve the enum naming 2015-06-16 09:42:06 +08:00
andyque c1108db31e Improve ui::Slider 
1. Add two APIs to gain big precision
2. Add three type events in Slider's callback.
 2015-06-15 18:31:21 +08:00
andyque 56b7037c5f optimize uislider memory usage 2015-06-05 17:16:10 +08:00
andyque 94e35d8d95 fix slider scale9 render 2015-01-22 15:53:33 +08:00
andyque 7f7506fb99 fix progress bar render issue when switch scale9 2015-01-21 13:41:40 +08:00
Liam 902fba0638 fix slider and loadingbar scale9 error 2015-01-20 20:57:54 +08:00
Liam a42d213d16 update for ui object scale9 state refresh 2015-01-20 17:24:04 +08:00
andyque d8f726bc4f modify widget default behavior 2014-12-23 15:03:31 +08:00
andyque b11e3d74cc restrict capInsets of ui::ImageView, ui::Slider and ui::LoadinbBar 2014-12-17 16:46:48 +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
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 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
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 cdb2b9f59f fixed Widget's Children reload textures change RGBA issue 2014-08-11 15:04:00 +08:00
Nite Luo ac20f51f7b Fix formatting 2014-08-05 16:53:00 -07:00
Nite Luo e0855d64df Merge branch 'v3' into patch-12 
Conflicts:
	cocos/ui/UISlider.cpp
 2014-08-05 16:51:02 -07:00
andyque d7b17c598d fix potential crash when user remove self in widgets callback 2014-08-01 20:58:42 +08:00
andyque e6b85fbd77 fix minor bugs of UISlider and remove unused header include in ListView 2014-07-30 16:55:16 +08:00
andyque c5d2585049 refactor Slider control 2014-07-30 15:52:27 +08:00
andyque 1daaea1410 remove extension::Scale9Sprite dependency 2014-07-29 16:24:27 +08:00
andyque 2a2184331e fix opacity issue when replace Widget textures 2014-07-08 11:30:27 +08:00
Pisces000221 1596848979 Also cascade the colours 2014-07-03 14:08:00 +08:00
Pisces000221 1cf2910f73 Cascade slide ball's opacity and the Slider's 2014-07-02 18:27:01 +08:00