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

968 Commits

Author SHA1 Message Date
pandamicro d6045fdbea Merge branch 'v3.8' of github.com:cocos2d/cocos2d-x into v3 
Conflicts:
	cocos/audio/winrt/Audio.cpp
	cocos/platform/winrt/CCCommon.cpp
	cocos/platform/winrt/CCWinRTUtils.cpp
	cocos/platform/winrt/CCWinRTUtils.h
 2015-08-27 10:40:04 +08:00
andyque 7f73415189 fix Scale9Sprite draw extra pixels in spritesheet 
Fixed https://github.com/cocos2d/cocos2d-x/issues/13564
 2015-08-26 16:15:00 +08:00
andyque 6cea66f932 fixed Scale9Sprite default capInset bug. 
Fixed https://github.com/cocos2d/cocos2d-x/issues/13560
 2015-08-25 23:31:34 +08:00
子龙山人 734388d2bd Merge pull request #13556 from zilongshanren/fix-listview-intial-position 
fix ListView innerContainer initial position error
 2015-08-25 16:50:02 +08:00
andyque 65b78d4a49 fix ListView innerContainer initial position error 2015-08-25 15:15:18 +08:00
子龙山人 b0561749bd Merge pull request #13537 from neokim/fix_issue_13516 
Fix issue 13516
 2015-08-25 10:01:03 +08:00
Neo Kim edd9fecf39 Update scroll bar when the inner container's size changes 2015-08-24 18:47:12 +09:00
Neo Kim 9f693ef8f3 Enhance readability 2015-08-24 18:46:43 +09:00
Neo Kim e1ed3ecb09 Add a method to change selected radio button without event dispatch. 2015-08-24 17:39:49 +09:00
Neo Kim 887efdca1b Add 'removeAllRadioButtons()' 2015-08-24 17:39:48 +09:00
Neo Kim 202b549073 Add getters for the internal renderer instances 2015-08-24 17:39:47 +09:00
Neo Kim da85b16292 Change not to dispatch event when add radio buttons 2015-08-24 17:39:46 +09:00
andyque 29f97d63ed fix scrollview innerContainer initial position. 2015-08-21 11:56:19 +08:00
Vladimir Perminov 24d06bb1c9 More use StringUtf8ToWideChar and PlatformStringFromString 2015-08-17 23:04:05 +03:00
andyque d45897ec53 fix RadioButton disallow selection issue. 2015-08-14 18:07:13 +08:00
andyque f9385d1604 fix iOS EditBox Chinese input maxLength issue. 
https://github.com/cocos2d/cocos2d-x/issues/12519
 2015-08-13 15:01:14 +08:00
andyque 68a90743c7 Sync PR: https://github.com/cocos2d/cocos2d-x/pull/13303 2015-08-12 18:09:32 +08:00
andyque 82f597ce98 Merge branch 'v3.7.1' into v3 
# Conflicts:
#	cocos/scripting/lua-bindings/auto/api/CheckBox.lua
#	cocos/ui/UICheckBox.cpp
#	cocos/ui/UICheckBox.h
 2015-08-12 17:59:50 +08:00
andyque 763976d50c fix ui::TextField status error. 
1. Refactoring Cocos2dxEditText to reuse Cocos2dxEditBox.

2. Reorder the event handling in ui::TextField.
 2015-08-12 11:05:07 +08:00
pandamicro 6bcea5baee Fix issue described in #13284 by reorder state setting and event dispatching 
The real reason of #13284 is that the `_selected` state is set after touch events dispatching.
So I decided to override `onTouchEnded` function to set the `_selected` state.
 2015-08-10 22:27:59 +08:00
pandamicro c54a204bad Synchronize enable state and bright state for Widget 
Fix issue: https://github.com/cocos2d/cocos2d-x/issues/8137
 2015-08-10 07:42:35 +08:00
pandamicro 1f52f0971a Fix CheckBox cross renderer state not updated correctly 
Issue description: When checkbox checked, its renderer adaptation may not be updated.

Reported http://punchbox.info:3000/issues/21630
 2015-08-09 20:57:37 +08:00
andyque a35e89225e Re-implement Editbox on Android platform. 
This PR also fixed issue:

https://github.com/cocos2d/cocos2d-x/issues/9572

For the new EditBox:

1. Added a ResizeLayout for updating layout when soft keyboard is shown.
This is because some Android devices won't refresh the view and when
the view is panned, the native EditText will turn black. This is really
a hack, but it works for many Android devices from 2.3 to 5.0.

When keyboard is beginning to show, the ResizeLayout's doLayout
method will be called 24 frames per second. Once the keyboard is closed,
or the user begins to input, the doLayout method will be disabled.

2. EditText is working in a different UI thread, so all the data
are passed to GL thread via callbacks in UI thead.

3. It also overrides onKeyDown method in Cocos2dxEditBox.
When the EditText got the focus, users could press back key to exit
the game. This behavior is not allowed. We give developer the choice to
handle back key event manually.
 2015-08-07 17:27:15 +08:00
andyque 211dde38e9 Fix improper touch intercept event propagation. 
When the container widget is disabled, it shouldn't intercept touch.

https://github.com/cocos2d/cocos2d-x/issues/8316
 2015-08-06 22:50:53 +08:00
andyque 2427c15b60 modify vertical scroll direction 2015-08-03 11:38:23 +08:00
andyque 63822566d2 refactor PageView implementation 2015-08-01 23:33:25 +08:00
andyque 5f34c1f072 add PageView vertical scroll support 2015-08-01 18:18:46 +08:00
pandamicro aa1a3bb6b7 Merge pull request #13137 from yangws/issue_9507 
Fixed #9507 : logic error in isMaxLengthEnabled handling in UITextFie…
 2015-07-31 15:43:46 +08:00
pandamicro aed6b0719e Merge pull request #13089 from yangws/issue_12692 
Fixed #12692 : UILayout viewing area cutting position calculation error
 2015-07-31 12:02:00 +08:00
pandamicro c9d23805e7 Merge pull request #12978 from yangws/issue_12249 
Fixed #12249 : Button touch doesn't work with setScale9Enabled.
 2015-07-31 09:54:38 +08:00
pandamicro 6b9ca70e02 Merge pull request #13051 from yangws/issue_9400 
Fixed #9400 : Widget::setHighlighted does not work after setBright
 2015-07-31 09:50:20 +08:00
pandamicro 16eb88bf57 Merge pull request #13055 from yangws/issue_10082 
Fixed #10082 : Label and Text have different types for fontSize
 2015-07-31 09:49:48 +08:00
Vincent Yang e1d4d22353 Fixed #12692 : UILayout viewing area cutting position calculation error 2015-07-29 18:43:11 +08:00
pandamicro 16b03f0ebe Merge pull request #13065 from pandamicro/widget_onEnter 
Ensure C++ classes onEnter, onExit can be safely override in JS
 2015-07-29 15:36:12 +08:00
pandamicro cca95c3c51 Merge pull request #13041 from yangws/issue_10386 
Fixed #10386 : ui::TextField hitTest not working as expected.
 2015-07-29 09:52:06 +08:00
pandamicro 9fea134de1 Use sendNodeEventToJSExtended instead of sendNodeEventToJS in sub classes 2015-07-28 18:24:03 +08:00
pandamicro 66b21fb2a8 Merge pull request #12972 from yangws/issue_12145 
Fixed #12145 : formarRenderers in RichText doesn’t update container s…
 2015-07-28 17:13:26 +08:00
pandamicro 89c722ed4b Add script invocation for onEnter, onExit etc in other classes 2015-07-28 16:07:14 +08:00
pandamicro 0a31199a5b Fix widget onEnter override in JS may cause infinite recursion 2015-07-28 16:04:28 +08:00
Vincent Yang c6fc51a2d9 Fixed #10082 : Label and Text have different types for fontSize 2015-07-28 14:48:01 +08:00
Vincent Yang b92733c402 Add items as protected children. 2015-07-28 11:38:21 +08:00
Vincent Yang 14145e29a8 Fixed #9400 : Widget::setHighlighted does not work after setBright 2015-07-28 11:09:21 +08:00
fusijie 651d877e28 set minimum display length to 1. 2015-07-27 17:55:32 +08:00
Vincent Yang 19b3822d87 Fixed #9507 : logic error in isMaxLengthEnabled handling in UITextField::setString 2015-07-27 17:25:48 +08:00
Vincent Yang 2f996b24ef Fixed #10386 : ui::TextField hitTest not working as expected. 2015-07-27 16:59:35 +08:00
Vincent Yang 35040e7bb1 Fixed #12249 : Button touch doesn't work with setScale9Enabled. 2015-07-23 17:27:04 +08:00
Vincent Yang 57943b41b1 Fixed #12145 : formarRenderers in RichText doesn’t update container size. 2015-07-23 14:59:24 +08:00
子龙山人 bb9500769f Merge pull request #12885 from zilongshanren/add-jumpToPage-api 
Fix PageView scrollToPage bug and the curPageIndex bug
 2015-07-22 15:01:57 +08:00
pandamicro 85d4ce0d5a Merge branch 'v3.7-release' of https://github.com/cocos2d/cocos2d-x into v3 
Conflicts:
	cocos/scripting/lua-bindings/auto/lua_cocos2dx_ui_auto.hpp
	docs/RELEASE_NOTES.md
	tools/cocos2d-console
	tools/tojs/cocos2dx.ini
 2015-07-21 11:39:24 +08:00
Vincent Yang cb5e2d59c3 Fixed #9382 : ui::ListView->getCurSelectedIndex() is out of range. 2015-07-20 17:50:02 +08:00