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

1046 Commits

Author SHA1 Message Date
dimon4eg 27d5ad920e Update comment 2015-10-21 16:55:45 +03:00
dimon4eg 82bcbb0325 Revert: Fix crash in web view on android 2015-10-21 16:54:41 +03:00
dimon4eg d317cd75e1 Improved code a bit 2015-10-16 11:28:34 +03:00
dimon4eg ee3c000b43 Fix crash in web view on android 2015-10-15 16:43:53 +03:00
XiaoFeng a6a3e24fdd Fix when image size of variable button status texture are different, Helper::restrictCapInsetRect result may cause pressed & disabled status picture won't display. 2015-10-14 13:58:58 +08:00
mogemimi daa29752db Fix typo in UIEditBox 2015-10-12 13:57:50 +09:00
pandamicro c2571f950c Merge pull request #14003 from zilongshanren/fixWebViewCallback 
fix ui::WebView callback operate OpenGL issue.
 2015-10-10 11:32:02 +08:00
pandamicro 27fc6b24ee Merge pull request #14080 from 1scaR1/v3 
Fixed enabling of scale9 background in ccui.Layout
 2015-10-10 09:39:09 +08:00
mogemimi 5993304e06 Fix typos 2015-10-09 17:59:11 +09:00
子龙山人 cdf6fa8a54 Merge pull request #14052 from neokim/fix_listview_center_magnetic_issue 
Fix an issue that list view's Magnetic::CENTER is not working well when non-bounceable.
 2015-10-09 08:27:18 +08:00
pandamicro e32e8b95a4 Merge pull request #14055 from Dimon4eg/fix-crash-in-LoadingBar 
fix crash in LoadingBar
 2015-10-08 11:22:43 +08:00
Nikita 0042f9f5cd Fixed background size if scale9 enabled in Layout 
Fixes for issue: cocos2d#14001
 2015-10-06 16:14:47 +03:00
pandamicro 1e298a2c1a Merge pull request #14064 from MSOpenTech/v3-win10-fix 
V3: fixed Windows 10 UWP app manifest by correcting image asset paths
 2015-10-04 10:53:52 +08:00
Dale Stammen 32eeb560c3 clean up include files for WINRT platforms 2015-10-02 18:49:41 -07:00
mogemimi 9f768bc1ab Add missing override keyword 2015-10-02 18:18:23 +09:00
dimon4eg ec20b48775 fix crash in LoadingBar 2015-09-30 13:04:13 +03:00
Neo Kim 423cbb83a9 Fix an issue that list view's Magnetic::CENTER is not working well around boundaries if it is non-bounceable. 2015-09-30 16:55:48 +09:00
zilongshanren bee52e378d fix ui::WebView callback operate OpenGL issue. 
All the OpenGL operations should be in OpenGL thread.
This PR wraps the callbacks in OpenGL thread.
 2015-09-23 11:22:36 +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
pandamicro eec67ea13b Merge pull request #13975 from zilongshanren/fixIssue11259 
don't change Text's dimension when label scale.
 2015-09-22 01:49:20 +08:00
子龙山人 f2190c79b9 Merge pull request #13835 from neokim/add_jump_to_item_to_listview 
Add a feature of jumping to a specific item in list tview
 2015-09-21 18:36:05 +08:00
zilongshanren fd8cfd8ccb don't change Text's dimension when label scale. 
Fixed issue: https://github.com/cocos2d/cocos2d-x/issues/11259
 2015-09-21 17:03:29 +08:00
Neo Kim b09a0bd0e3 Add a missing parameter in comment for document. 2015-09-21 17:07:32 +09:00
hanxi b1ed1a8a51 add UIEditBox support linux platform. 2015-09-18 17:11:58 +08:00
pandamicro 1eeafed072 Merge pull request #13884 from yangws/v3 
Fix bug: in Widget::isClippingParentContainsPoint, _hittedByCamera may be null.
 2015-09-17 16:32:56 +08:00
Vincent Yang 4b83240bed Fix bug: in ui::Widget::isClippingParentContainsPoint, _hittedByCamera may be null. 2015-09-17 11:20:36 +08:00
andyque 1be5402050 Merge branch 'v3' into addiOSMultiline-support 
# Conflicts:
#	build/cocos2d_libs.xcodeproj/project.pbxproj
 2015-09-16 21:49:55 +08:00
Neo Kim d9be26cd98 Use another dirty flag for list view layout other than 'Layout::_doLayoutDirty' because 'Layout::onEnter()' forces '_doLayoutDirty' to be true always. List view should have a way not to do layout in 'onEnter()'. 2015-09-16 16:21:11 +09:00
Mazyad Alabduljaleel 3090599f83 Oops, committed duplicate code by mistake 2015-09-16 10:12:07 +03:00
Mazyad Alabduljaleel 61980d1a8b [refactor] Break down the file into separate files, because it exceeded 1 kLOC 🙀 
[refactor] Consolidate `UITextView` and `UITextField` APIs.
[refactor] rename classes that start with `UI` to `CCUI`, since that prefix is reserved by Apple.
[bugfix] setting the placeholder for `CCUISingleLineTextField` was missing in `createSingleLineTextField`
[bugfix] In `MultiLineTextView`, if `placeholder` changed, there doesn't seem to be a deterministic way of updating the `placeholderLabel`. We are relying on `drawRect:`. Instead, `placeholder` is now a computed property on top of `placeholderLabel.text`.
[bugfix] If the user wants multi-line secure input, we should set it, since it is possible, right?
[minor] `[viewWithTag:999]` was used instead of calling the property itself.
[minor] `drawRect:` was used to load properties, when it is normally in the getter.
[minor] fix ObjC code style
 2015-09-15 23:36:26 +03:00
Neo Kim 11d80f47f8 Refactor list view's layout refreshing logic. 2015-09-15 22:34:00 +09:00
Neo Kim f58cbad6c2 Add 'jumpToItem()' to list view. 2015-09-15 22:33:50 +09:00
子龙山人 f2bee23696 Merge pull request #13789 from neokim/fix-13668 
Fix for #13668
 2015-09-15 18:28:24 +08:00
子龙山人 f5848290a2 Merge pull request #13673 from Almax27/patch-3 
Removed ScrollView::_innerContainer pointer copy
 2015-09-15 17:42:20 +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 556175df1e add iOS EditBox multiline support 
When the inputMode is ANY, then we use TextView to input.
otherwise we use normal UITextField.

Fixed issue https://github.com/cocos2d/cocos2d-x/issues/13436
 2015-09-15 13:52:39 +08:00
andyque 2fea4db9fc fix ui::Button title location issue 2015-09-15 13:37:32 +08:00
子龙山人 1d7d283ee6 Merge pull request #13549 from neokim/add_getters_for_renderers_into_button 
Add getters for the internal renderer instances of Button
 2015-09-15 09:26:34 +08:00
Neo Kim c224a81497 Rectify typos 2015-09-14 15:27:51 +09:00
Neo Kim 3fff195c20 Override 'jumpToSomewhere' functions in list view to recalculate inner container's size if necessary. 2015-09-13 22:32:22 +09:00
Neo Kim 7f9c8acc2a ScrollView - Add a guard statement in setContentSize() to avoid resetting inner container's position if not necessary. 2015-09-13 21:43:34 +09:00
Neo Kim f39644d129 Remove default arguments in APIs and rename the parameter 'time' to 'timeInSec'. 2015-09-11 16:00:53 +09:00
Neo Kim 586af44fe6 ListView - Add getter / setter for magnetic out of boundary flag. 2015-09-09 10:29:19 +09:00
Neo Kim b28b8146e7 ListView - Add the logic for magnetic bounce back. 2015-09-09 10:29:19 +09:00
Neo Kim 3085e1385c ListView - Add 'startMagnetScroll()' for non-inertia scroll. 2015-09-09 10:29:18 +09:00
Neo Kim e58c073186 ListView - Apply magnetic to inertia scroll. 2015-09-09 10:29:18 +09:00
Neo Kim ca3ea53ffd ListView - Add enum for magnetic type and test cases for magnetic scroll. 2015-09-09 10:29:18 +09:00
Neo Kim d8fc04d109 ListView - Add 'scrollToItem' method and its test cases. 2015-09-09 10:29:18 +09:00
Neo Kim 2599271410 ListView - Add APIs which return the closest item in specific position in current view. 2015-09-09 10:29:17 +09:00
Neo Kim a4e5f7c0a8 ScrollView - Refactor the logic about getting out of boundary amount. 2015-09-09 10:28:47 +09:00