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
Vincent Yang b4559a005b Fix bug taken from pr12602: scroll view can't scroll if pressed the button on it. 2015-07-07 10:42:04 +08:00
XiaoFeng 214684b3be Fix 2015-07-06 16:45:04 +08:00
XiaoFeng 9fab1e7702 Change to use auto & for each to enum sub items 2015-07-06 16:39:00 +08:00
XiaoFeng d6fc8ecc94 Fix when use percentage size & position to a UIWidget which parent is a layout component, when change simulator screen size, layout won't effect correctly. 2015-07-06 16:02:19 +08:00
Neo Kim c4dc9b04fd Add a guard filtering tries to set same value. 2015-07-06 14:54:28 +09:00
Neo Kim 0ff7aaef95 Modify loop iteration codes 2015-07-06 11:30:24 +09:00
Neo Kim 43308e258a Fix an issue of not releasing Texture instance in ScrollViewBar 2015-07-06 11:29:39 +09:00
Neo Kim a4803c6713 Remove unnecessary commented out code. 2015-07-05 21:30:13 +09:00
Neo Kim 3ab4285960 Refactor code 2015-07-04 16:06:05 +09:00
Neo Kim 6264f7fefb Correct include-related build errors in some platforms 2015-07-04 15:03:05 +09:00
Neo Kim ceeca575f3 Replace 'margin' of scroll bar with 'positionFromCorner' 2015-07-04 14:05:47 +09:00
Neo Kim f667b085b8 Change not to show scroll bar when the scroll view is initiated. 2015-07-04 09:59:22 +09:00
Neo Kim 9548d85f08 Fix radio button group clear issue 2015-07-04 09:57:54 +09:00
Neo Kim 3b6cd4dffc Modify indentation to comply with the convention 2015-07-04 09:56:53 +09:00
Neo Kim 86cbd59bfd Add UIScrollViewBar.cpp into CMake and Windows project configuration. 2015-07-04 09:56:53 +09:00
Neo Kim 60c32f6fb5 Refactor some codes 2015-07-04 09:56:53 +09:00
Neo Kim ec45be699d Add UIScrollViewBar class documentation 2015-07-04 09:56:52 +09:00
Neo Kim c093bb18e2 Add scroll bar manipulation methods into ScrollView 2015-07-04 09:56:52 +09:00
Neo Kim 9a11cfd496 Add a way of changing scroll bar width 2015-07-04 09:56:52 +09:00
Neo Kim 2cae17b462 Add scroll bar feature into ScrollView 2015-07-04 09:56:52 +09: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
子龙山人 5b971ee93d Merge pull request #12607 from neokim/add_radio_button_and_group 
Add RadioButton and RadioButtonGroup widgets
 2015-07-02 17:12:59 +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
Neo Kim 61df7bc827 Add class documentation 2015-07-02 15:20:06 +09:00
Neo Kim ec589c8d6f Correct the wrong comment for lua 2015-07-02 15:19:50 +09:00
Neo Kim 0e35ee597a Add logic for not belonging radio button checking. 2015-07-02 15:01:24 +09:00
Neo Kim c4aa5a6274 Remove the code related to becoming parent node of radio buttons. Radio button group is not a parent node of radio buttons anymore. 2015-07-02 11:50:50 +09:00
Neo Kim 6550a9ccc2 Replace all tabs to 4 spaces to comply with the convention 2015-07-02 11:30:14 +09:00
XiaoFeng 9a905ede56 Fix check box front cross texture expand to normal size when change status between normal and disable frequency 2015-07-02 10:29:53 +08:00
Neo Kim 4b2bff4674 Change RadioButtonGroup not to be a node-parent of radio buttons but just a grouping node. And add one more test case. 2015-07-02 11:28:14 +09:00
Vincent Yang d26c08de46 Merge branch 'v3_scene3d_fixvisitingcamera' into v3_scene3dtest 2015-07-01 14:47:42 +08:00
yangxiao 269feeb1f9 remove stencil from Renderstate 2015-07-01 14:06:37 +08:00
Neo Kim a64e50688e Add the new files into CMake and Windows project configurations. 2015-07-01 12:21:42 +09:00
Vincent Yang 96b49277cc [ci skip] add comment for UIWidget::_hittedByCamera. 2015-07-01 11:03:09 +08:00
Neo Kim 3f05ad2b98 Replace all tabs to 4 spaces to comply with the convention 2015-06-30 20:31:31 +09:00
Neo Kim f5e7184f0b Add new cpp files into Android.mk 2015-06-30 18:50:13 +09:00
Neo Kim bed90606d3 Add RadioButton feature and a test case for it. 2015-06-30 18:50:13 +09:00
Neo Kim a37015d083 To create radio button feature which uses almost same logic with CheckBox, extract the common logic from CheckBox and make it as AbstractCheckButton class. 2015-06-30 18:50:13 +09: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
子龙山人 950cb840c2 Merge pull request #12582 from super626/listview 
fix camera mask of listview
 2015-06-30 10:25:57 +08:00
子龙山人 c997284825 Merge pull request #12352 from andyque/add-two-events-to-ui-slider 
Improve ui::Slider
 2015-06-29 17:01:27 +08:00
yangxiao a56a5d24b6 fix camera mask of listview 2015-06-29 14:41:03 +08:00
andyque 60834e6f0c Merge branch 'v3' into v3-finish-android-9-patch-image-format 
Conflicts:
	cocos/2d/libcocos2d_8_1/libcocos2d_8_1/libcocos2d_8_1.Shared/libcocos2d_8_1.Shared.vcxitems.filters
 2015-06-29 12:05:52 +08:00
andyque 30d2129f0c improve indent and getTime function 2015-06-29 11:52:53 +08:00
pandamicro 4b34963329 Merge pull request #12537 from andyque/fix-v3.7-scrollView-dpi 
use inch for childFocusCancelOffset in UIScrollView
 2015-06-26 08:11:00 +08:00
pandamicro 3136bef9e3 Fix convertDistanceFromPointToInch logic (add x, y) 2015-06-25 21:34:00 +08:00
pandamicro e29284374b Fix convertDistanceFromPointToInch logic 2015-06-25 20:57:23 +08:00
samuele3hu 3a654b4615 Fix the compile error of js-template by using android-studio compile param. 2015-06-25 17:44:51 +08:00
andyque d83f528327 use inch for childFocusCancelOffset in UIScrollView 2015-06-25 16:57:00 +08:00
andyque 7fff2bd3c4 fix nine patch image parser error on Windows. 2015-06-23 15:42:58 +08:00
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