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

941 Commits

Author SHA1 Message Date
Neo Kim 9757be0f81 Remove debugging logs 2015-06-22 14:49:30 +09:00
Neo Kim 71c98da2aa Apply ease out action on inertia scroll 2015-06-22 14:30:45 +09:00
Neo Kim c4fa99444c Simplify the inertia scroll implementation 2015-06-22 14:30:36 +09:00
Neo Kim c70c923674 Separate the inertia scroll from auto scroll. And implement auto scroll and bounce back as one logic. The bounce back movement is one of auto scroll feature. 2015-06-22 14:30:30 +09:00
Neo Kim 7422b20da9 Refactor some functions 2015-06-22 14:27:19 +09:00
Neo Kim 85fc5b3f89 Change to comply to Cocos2d-x convention 2015-06-22 14:27:11 +09:00
Neo Kim 6c212a7ddb Replace the existing bounce back feature with another one like iOS bounce-back. The inner container moves smoother when bouncing back. 
It does what the existing code did including scroll event dispatching and attenuating.
 2015-06-22 14:27:00 +09:00
Neo Kim 1058ab9172 Add necessary member variables and methods 2015-06-22 14:26:51 +09:00
Neo Kim a8f77710f5 Refactor some functions and remove redundant codes 2015-06-22 14:10:25 +09:00
Neo Kim 876c94f352 Remove the boundary of bouncing and apply half-movement when out of boundary like iOS bounce back. 2015-06-22 14:05:53 +09:00
Neo Kim ff3f990142 Add isOutOfBoundary() functions 2015-06-22 14:05:53 +09:00
Neo Kim c3c6eeb6c1 Refactor some functions 2015-06-22 14:05:52 +09:00
Neo Kim a3ff9573b0 Remove duplicated logic in bounceScrollChildren() 2015-06-22 14:05:51 +09:00
Neo Kim 1971b01280 Make the event dispatch functions into one function after removing duplicated logic. 2015-06-22 14:05:50 +09:00
Neo Kim 31bf9f714d Merge bouncing and non-bouncing logics as one. 2015-06-22 14:05:50 +09:00
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
Vincent Yang 187437068f Fixed bug: wrong usage of isVisitableByVisitingCamera, which should only effect draw call. 2015-06-18 10:32:30 +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
Ricardo Quesada c17da7e90d Removes not-needed draws 2015-06-15 10:40:47 -07:00
andyque a880dc86e9 improve comments 2015-06-15 19:36:20 +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
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
子龙山人 7a9b48bd83 Merge pull request #12214 from andyque/optimize-ui-memory-usage 
Optimize ui memory usage
 2015-06-12 10:11:21 +08:00
子龙山人 57e92df8ee Merge pull request #12099 from stari4ek/v3-12097-video-android-search-path 
Fixed: #12097 VideoPlayer on Android ignores search paths
 2015-06-08 17:22:14 +08:00
andyque 1954f6c55c fix enum class wrong indentation 2015-06-05 17:23:32 +08:00
andyque 56b7037c5f optimize uislider memory usage 2015-06-05 17:16:10 +08:00
andyque 6390f063fe optimize UILoadingBar memory usage 2015-06-05 15:57:39 +08:00
andyque a7141bab38 improve imageView memory usage 2015-06-05 14:19:05 +08:00
andyque 91ddb802e1 optimize ui::CheckBox memory consumption 2015-06-05 10:32:22 +08:00
Michael Sotnikov b430353cd8 Fixed: #12097 VideoPlayer on Android ignores search paths 2015-05-29 10:17:40 +03:00
Dale Stammen 2a71407501 fixed double to float conversion compiler warning 2015-05-28 15:00:49 -07: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
子龙山人 616ac0058c Merge pull request #12016 from namezero111111/v3 
ui::TextField::getTextColor() missing
 2015-05-27 15:53:09 +08:00
子龙山人 b2132eb127 Merge pull request #11921 from felixjingga/uibutton-support-bmfont 
Uibutton support bmfont
 2015-05-27 11:19:46 +08:00
Namezero 9808f6aa91 Update UITextField.h 2015-05-26 12:55:57 +02:00
Namezero 8bc7d08d3f added alignment getters 2015-05-26 09:34:13 +02:00
Namezero 2be136dc8e alignment getters added 2015-05-26 09:33:11 +02:00
Namezero 4c380bfaf0 Update UITextField.cpp 2015-05-25 21:06:27 +02:00
Namezero dfb479d480 Update UITextField.h 2015-05-25 21:05:49 +02: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
andyque 0352a7a3ea add Android 9-patch image format support 
commit c214c4a7a457275785d6377031b5a267d543ffbb
Author: andyque <guanghui8827@126.com>
Date:   Mon May 18 17:16:09 2015 +0800

    Add Android 9-patch format support.

    Squashed commit of the following:

    commit a5a5a7a8f25b5bddae0ba21c56676a3f8d84102a
    Author: andyque <guanghui8827@126.com>
    Date:   Mon May 18 17:08:05 2015 +0800

        finish refactoring

    commit 730bf817f833de56999c616779fc0279890e14bf
    Author: andyque <guanghui8827@126.com>
    Date:   Mon May 18 11:47:08 2015 +0800

        refactoring 9-patch

    commit b45be6d54ac6e70a3fb9aa3eb700b252e4e72a54
    Author: andyque <guanghui8827@126.com>
    Date:   Mon May 18 09:42:06 2015 +0800

        refactor

    commit 384110193f1d581c4a0fb7a2c771c55f1db63cbf
    Author: andyque <guanghui8827@126.com>
    Date:   Fri May 15 17:59:21 2015 +0800

        fix lua and Android compile error

    commit 2877538fb3a436f95400b2ad637ea147b9df81d7
    Author: andyque <guanghui8827@126.com>
    Date:   Fri May 15 11:32:43 2015 +0800

         Add Android 9-patch image format support.

        The 9-patch format is used for creating Scale9Sprite.
 2015-05-21 16:04:37 +08: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
felixjingga 2d0fc637fc add BMFont FontType to support BMFont 2015-05-20 15:50:20 +07:00
dkorchinskiy 03aa73d68f Feature #11886 add title alignment for button 2015-05-18 13:33:48 +03:00
andyque be62b3a8e2 Copy missing text color property of ui::Text. 2015-05-15 16:04:34 +08:00
minggo 3d0c7705f7 Merge pull request #11763 from Dimon4eg/v3 
Fix web view leak on iOS
 2015-05-13 17:02:50 +08:00
Dale Stammen 351a898a70 removed CC_PLATFORM_WP8 2015-05-08 09:19:13 -07:00
dkorchinskiy a71ef98275 Fix web view leak on iOS 2015-05-08 15:19:14 +03:00
samuele3hu 037c17fe5d Remove vs2012 support in v3 2015-05-05 16:11:26 +08:00
andyque 6fb29ad1b0 remove uishader settings 2015-04-20 17:04:49 +08:00
andyque e02dad3489 fix ui grayscale shader memory release issue 2015-04-20 17:00:40 +08:00
samuele3hu 9477e89723 Fix the compile error on the win32 2015-04-20 11:46:48 +08: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 3c7d5afce2 Merge pull request #11465 from WenhaiLin/v3-videoplayer-iosfix 
Fix crash when play streamed MP4 file.
 2015-04-16 18:16:28 +08:00
WenhaiLin fc75f46abb Fix crash when play streamed MP4 file. 2015-04-16 16:27:09 +08:00
minggo 408d164fea Merge pull request #11458 from andyque/fix-a-side-effect-of-button-memory-optimization 
fix side effect of ui::button clone
 2015-04-16 16:15:25 +08:00
andyque 8a9f420735 fix side effect of ui::button clone 2015-04-16 14:38:00 +08:00
minggo 97f150a89f Merge pull request #11452 from MSOpenTech/v3-remove-wp8 
V3 remove WP8 project files
 2015-04-16 14:32:11 +08:00
minggo 29de9d397f Merge pull request #11445 from andyque/improve-the-arguments 
make scrollview time arguments more meaningful
 2015-04-16 10:14:11 +08:00
Dale Stammen 01135f892f fixed typo 2015-04-15 09:19:17 -07:00
Dale Stammen 911f8f6f8a removed WP8 UIEditBox project files 2015-04-15 07:16:39 -07:00
jianglong0156 8f8599a49b uiWebView constructor add CC_CONSTRUCTOR_ACCESS 2015-04-15 17:54:09 +08:00
andyque 96f8842ee1 make scrollview time arguments more meaningful 2015-04-15 16:37:11 +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 10c90b06aa fix ui::Text outline don't change content size 2015-04-10 15:33:48 +08:00
andyque c8d8a0d220 add disableEffect API for ui::Text 2015-04-10 14:18:16 +08:00
minggo 00c0e4c432 Merge pull request #10909 from babcca/webview_ios_load_data_fix 
Webview ios load data fix
 2015-04-08 14:34:42 +08:00
VisualSJ a29becb185 [ci skip] Add javascript notes... 
cocos/ui/UIHBox.h
  cocos/ui/UIHelper.h
  cocos/ui/UIImageView.h
  cocos/ui/UILayout.h
  cocos/ui/UIText.h
  cocos/ui/UITextAtlas.h
  cocos/ui/UITextBMFont.h
  cocos/ui/UITextField.h
  cocos/ui/UIVBox.h
  cocos/ui/UIVideoPlayer.h
  cocos/ui/UIWebView.h
  cocos/ui/UIWidget.h
 2015-03-30 21:38:32 +08:00
samuele3hu 6c528c4a42 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_5_test 2015-03-30 15:51:01 +08:00
samuele3hu c3ad458a26 Update comment for Lua 2015-03-30 15:47:47 +08:00
andyque b5d10fb246 Merge branch 'v3' into fix-remaining-missing-comments 
Conflicts:
	cocos/base/CCIMEDelegate.h
 2015-03-30 10:56:42 +08:00
minggo 73279e3b3f Merge pull request #11205 from WenhaiLin/v3-doxygen 
[ci skip]Update comments.
 2015-03-30 09:31:36 +08:00
VisualSJ 875b5d95f4 [ci skip] Add javascript notes... 
cocos/ui/UIListView.h
  cocos/ui/UILoadingBar.h
  cocos/ui/UIPageView.h
  cocos/ui/UIRelativeBox.h
  cocos/ui/UIRichText.h
  cocos/ui/UIScale9Sprite.h
  cocos/ui/UIScrollView.h
  cocos/ui/UISlider.h
 2015-03-28 16:02:47 +08:00
andyque e3fc9b082e Finish the missing comments 2015-03-27 20:56:12 +08:00
Wenhai Lin ff3777dfd1 [ci skip]Update comments. 2015-03-27 18:26:14 +08:00
minggo b03900bbbf fix doxygen comment 2015-03-27 17:09:54 +08:00
minggo 033a3e09b9 Merge pull request #11191 from fusijie/cocosapi 
[ci skip]update comments.
 2015-03-27 14:33:49 +08:00
Jacky 4edf9e76fd update comments. 2015-03-27 12:07:19 +08:00
andyque bc2ffe4e19 remove unneeded js & lua NA and remove deprecated list from navtree 2015-03-27 11:02:04 +08:00
andyque 42cd63fe01 fix group error 2015-03-26 15:47:14 +08:00
minggo 52d53fd7ee Merge pull request #11148 from andyque/finish-v3-comments 
Add missing comments for UI modules
 2015-03-26 10:02:42 +08:00
andyque 86c3e60254 fix merge issue 2015-03-25 22:16:41 +08:00
andyque f32b59d565 ignore GUIDefine.h 2015-03-25 18:24:35 +08:00
andyque 248325d055 Add missing comments for UI modules 
Squashed commit of the following:

commit eb23bf8972d1a580db537f3d341091eaeb99d626
Author: andyque <guanghui8827@126.com>
Date:   Wed Mar 25 17:08:07 2015 +0800

    finish all the documents

commit a64ec4196eb1b41771ac2f7b2ba48845d22b6211
Author: andyque <guanghui8827@126.com>
Date:   Wed Mar 25 09:49:33 2015 +0800

    finish scrollview

commit 4ff76623230f19dd25c4de29e2816754524570b2
Author: andyque <guanghui8827@126.com>
Date:   Tue Mar 24 21:40:26 2015 +0800

    add UIScale9Sprite comments

    Conflicts:
    	cocos/ui/UIScale9Sprite.h

commit e82a17b4e3cd07a03d4bfc906b0dc94d1fa08757
Author: andyque <guanghui8827@126.com>
Date:   Tue Mar 24 18:05:02 2015 +0800

    add comments for UIRichText

commit 7cbbcc6883ace0ef60a060f6c5808f4c296af4df
Author: andyque <guanghui8827@126.com>
Date:   Mon Mar 23 22:08:26 2015 +0800

    add comments for UIPageView and UIRelativeBox

commit 6fcf32a40d5407aefcba39e76aea5fb93a1a4e4a
Author: andyque <guanghui8827@126.com>
Date:   Mon Mar 23 21:12:27 2015 +0800

    finish loadingbar comments

commit 58e16b81dee833788018d913aef80e2ddd33d408
Author: andyque <guanghui8827@126.com>
Date:   Mon Mar 23 20:51:30 2015 +0800

    finished UiListView

commit 8278b3f1ee905c34dbd9c461975b1b4491eb7977
Author: andyque <guanghui8827@126.com>
Date:   Mon Mar 23 20:06:10 2015 +0800

    add comments for LayoutManager and LayoutParameter.

commit b2edfa06b83fbb0cdaf2f567c0d6f8d72e6f90c5
Author: andyque <guanghui8827@126.com>
Date:   Mon Mar 23 17:09:17 2015 +0800

    finish comments for UILayoutComponent

commit 730b5bc9c1a18139fbdef331b16c58b928cf999f
Author: andyque <guanghui8827@126.com>
Date:   Fri Mar 20 14:07:58 2015 +0800

    add missing comments

commit cecd97e830492e58dd07a2b1f5d0e87f19144856
Author: andyque <guanghui8827@126.com>
Date:   Fri Mar 20 09:31:51 2015 +0800

    add comments

commit ca0a6033bf61c7fc9caf70719ee5ea651953f580
Author: andyque <guanghui8827@126.com>
Date:   Thu Mar 19 21:02:36 2015 +0800

    add missing docs for UIButton, UILayout, UIIMageview and UIWidget

commit df98454583553e80d2ef4f72cc58de4b433f43c7
Author: andyque <guanghui8827@126.com>
Date:   Thu Mar 19 14:02:05 2015 +0800

    add missing comments for UIHbox and UIHelper

commit 4baf76dd92672b745d3d84e47e5fed8c680b01c7
Author: andyque <guanghui8827@126.com>
Date:   Thu Mar 19 11:28:32 2015 +0800

    add comments for UICheckbox

commit 77c4080b3c70268b6a07cfa12d1e9319c86a2f38
Author: andyque <guanghui8827@126.com>
Date:   Thu Mar 19 00:01:42 2015 +0800

    update coments

commit 4506327ace5b7786ee8b490aab1653462a834418
Author: andyque <guanghui8827@126.com>
Date:   Wed Mar 18 20:32:57 2015 +0800

    add comments for UIEditbox

commit 4937f30adb8912a02ab10353b6cc5fe2eed9d4bf
Author: andyque <guanghui8827@126.com>
Date:   Wed Mar 18 10:51:20 2015 +0800

    add missing comments for UIEditBox

commit 64a48c6b09f4eaf6b84cc8446ef59d382cf8767b
Author: andyque <guanghui8827@126.com>
Date:   Wed Mar 18 10:12:08 2015 +0800

    fix indentation problem

commit b38c921c114bb4a707be0f29dcdf8c46e43a445a
Author: andyque <guanghui8827@126.com>
Date:   Wed Mar 18 10:08:46 2015 +0800

    add missing comments for CCIMEDispatcher

commit 4412cf52429f22351a5c9fbb7c392bca64c2a2c6
Author: andyque <guanghui8827@126.com>
Date:   Wed Mar 18 09:57:52 2015 +0800

    add missing documents for CCIMedelegate

commit 53d3242f2cafde2bebedebe8353c6be625e5ce84
Author: andyque <guanghui8827@126.com>
Date:   Wed Mar 18 09:43:33 2015 +0800

    add missing documentation for CCTilemapatlas

commit 1f6183086b6e21557e5b05bf4cede43d472611a1
Author: andyque <guanghui8827@126.com>
Date:   Wed Mar 18 09:38:59 2015 +0800

    add missing comments for CCTextfieldttf

commit a7fe234153cebc4113cc97064d20dfd3515f9611
Author: andyque <guanghui8827@126.com>
Date:   Tue Mar 17 22:03:31 2015 +0800

    supplement comments for ProtectedNode

commit 3b02d22850b6a9e99e779ca09e5ce0b5bf24d602
Author: andyque <guanghui8827@126.com>
Date:   Tue Mar 17 21:55:03 2015 +0800

    add comments to CCMenuitem.h

commit 58e054c5cd28986e4420c2ae44af7e9a2beab4ce
Author: andyque <guanghui8827@126.com>
Date:   Tue Mar 17 21:36:14 2015 +0800

    add comments to Menu
 2015-03-25 18:17:58 +08:00
minggo d67bd549f1 Merge pull request #11135 from fusijie/cocosapi 
[ci skip]add comments.
 2015-03-25 11:10:31 +08:00
Jacky 8b57b66f16 add comments. 2015-03-25 10:13:17 +08:00
minggo bed7746459 Merge pull request #11120 from fusijie/cocosapi 
[ci skip]add comments.
 2015-03-25 09:49:52 +08:00
WenhaiLin 9dd778edb0 [ci skip]Update comments 2015-03-24 20:23:51 +08:00
Jacky 32f37b8701 [ci skip]add comments. 2015-03-24 18:22:52 +08:00
WenhaiLin 2caff4e64d [ci skip]Update comments 2015-03-24 14:12:58 +08:00
WenhaiLin e528531b4b [ci skip]Update document 2015-03-19 10:38:12 +08:00
minggo f7d5a16734 Merge pull request #10873 from konopka/fix_compiler_override_warnings 
Fix compiler override warnings
 2015-03-17 10:38:19 +08:00
Petr Babička fa245c44b9 Spaces instead of tabs 2015-03-16 17:22:17 +01:00
Alok Sahay 80576b5903 Don't set scale and loadHTMLString on nil. 2015-03-16 17:00:01 +01:00
Dale Stammen ef5e6fc473 fixed use of Color4B 2015-03-16 02:17:05 -07:00
minggo d0753674b2 Merge pull request #10514 from cpascal/uiEditBox_Win32 
Fixed missing ui::EditBox functionalities on Win32
 2015-03-16 14:56:49 +08:00
minggo 1916bc1f1f Merge pull request #10693 from Mazyod/editbox-text-alpha-support 
Support Color4B for editbox text
 2015-03-16 14:52:36 +08:00
minggo ebe5dff7a6 Merge pull request #10737 from newnon/v3_scale9_blend_func 
blending function for Scale9Sprite
 2015-03-16 14:45:08 +08:00
Martin Konopka cd12d08a52 Get rid of compiler warnings: 'func' overrides a member function but is not marked 'override' [-Winconsistent-missing-override] 2015-03-14 19:33:15 +01:00
Mazyad Alabduljaleel ce377c4a1e Fix compilation issues on Android and Win 2015-03-06 16:05:05 +04:00
Sergey 8270355ad6 blending function for Scale9Sprite 2015-03-05 11:13:51 +03:00
cpascal db9985d7cd Added new line with the left curl bracket. 2015-03-03 20:39:25 +09:00
cpascal a6ee1451f4 changed one more indentation. 
I made mistake, (now replacing the spaces to tab)
 2015-03-03 13:44:43 +09:00
cpascal 4058e16f16 Added line break & removed function call in compare operator. 2015-03-03 13:40:40 +09:00
Mazyad Alabduljaleel 9d5fdcb973 Support Color4B for editbox text 2015-03-02 15:31:59 +04:00
Mazyad Alabduljaleel 4387844176 Fix editbox on Mac 2015-03-01 23:56:18 +04:00
yangxiao f13237c013 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3 2015-02-26 17:27:42 +08:00
pandamicro 9bf22a51ea Fix ListView::setDirection issue 2015-02-25 16:17:43 +08:00
cpascal 8d9da362e5 changed indentation. 2015-02-23 11:55:27 +09:00
cpascal e7a39287f1 Fixed missing ui::EditBox functionalities on Win32 
1. There was 100-byte input limit at ui::EditBoxImplWin::openKeyboard()
2. Implemented MaxLength as LengthFilter, not ByteFilter. (same as
Android's InputFilter - LengthFilter)
3. Users can input unicode characters that is not supported by CP_ACP.
 2015-02-16 18:21:26 +09:00
lvlong ee03bb8eea setCameraMask for cocostudio-ui 2015-02-12 09:24:04 +08:00
minggo 8d681dfe7d Merge pull request #10218 from andyque/fixIssue10183 
fixed "call ui::TextField getContentSize in insert or delete event callback ,the result is wron"
 2015-01-28 09:57:34 +08:00
minggo 880abfe814 Merge pull request #10209 from andyque/fixLoadingBarReloadTexture 
Fix loading bar reload texture issue
 2015-01-27 13:50:38 +08:00
minggo e1afb7c789 Merge pull request #10226 from andyque/removeDuplicateCode 
remove unused code
 2015-01-27 13:50:15 +08:00
andyque 7b81f3a811 remove unused code 2015-01-27 10:17:41 +08:00
cpascal d857164768 Added override of ui::EditBox::getDescription() 2015-01-27 11:10:04 +09:00
andyque 95e8072afa fixed issue #10183 2015-01-26 18:26:59 +08:00
andyque 732050d940 don't release the scale9Image when updateSprites 2015-01-26 16:04:43 +08:00
andyque 0e67cfcbff improve loading Bar Test 2015-01-26 14:39:44 +08:00
minggo cba0e19252 Merge pull request #9922 from joshuastray/fix-order-of-detach-atach-of-textfield 
Change the order of detach and attach of TextField::upadate
 2015-01-26 14:00:58 +08:00
minggo 4ac50f2c26 Merge pull request #10200 from Dhilan007/v3-webview-baseurlfix 
Fixed sets the page's base URL for WebView doesn't work.
 2015-01-26 13:51:08 +08:00
andyque fdbf84a118 add uploading switch scale9 tests 2015-01-26 13:49:54 +08:00
Wenhai Lin 81198583f1 Fixed sets the page's base URL for WebView doesn't work. 2015-01-23 18:30:12 +08:00
minggo 516c6f1387 Merge pull request #10187 from joshuastray/fix-win32-editbox-clip 
Fix win32 editbox content not clipped correctly
 2015-01-23 16:16:00 +08:00
Jialong Zhai b295c8e817 fix indentation 2015-01-23 14:13:36 +08:00
Jialong Zhai 7ef80e9dae Update UIEditBoxImpl-win32.cpp 2015-01-23 14:11:22 +08:00
andyque 94e35d8d95 fix slider scale9 render 2015-01-22 15:53:33 +08:00
minggo 72fb059aeb Merge pull request #10144 from andyque/fixButtonPressActionIssue 
fix button pressAction scale issue
 2015-01-21 16:37:59 +08:00
andyque d58426db99 fix button pressAction scale issue 2015-01-21 14:54:37 +08:00
andyque 7f7506fb99 fix progress bar render issue when switch scale9 2015-01-21 13:41:40 +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
minggo e8b6705d29 Merge pull request #10071 from liamcindy/Text_2.4 
fix uitext size error
 2015-01-21 09:40:34 +08:00
minggo eb2ca9eef5 Merge pull request #10069 from liamcindy/Button_2.4 
add function for ui button
 2015-01-21 09:36:35 +08:00
minggo 6870692cfe Merge pull request #10072 from liamcindy/TextBMFont 
BMFont need to refresh size by refresh the string
 2015-01-21 09:32:54 +08:00
minggo b61a28633e Merge pull request #10102 from andyque/addListViewReuseCell 
Refactoring bad coding style
 2015-01-21 09:24:56 +08:00
Liam 902fba0638 fix slider and loadingbar scale9 error 2015-01-20 20:57:54 +08:00
Liam a72e65b4de add function for uiText and uiTextField 2015-01-20 18:40:25 +08:00
Liam a42d213d16 update for ui object scale9 state refresh 2015-01-20 17:24:04 +08:00
andyque 9a43706db8 refactor variable names of ui::Scale9Sprite 2015-01-20 15:29:25 +08:00
minggo 7dee9d2356 Merge pull request #10074 from liamcindy/LayoutComponent_2.4 
update for lay out component
 2015-01-20 15:12:49 +08:00
andyque 38906dce45 refactor for scale9Sprite 2015-01-20 15:10:03 +08:00