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

1266 Commits

Author SHA1 Message Date
zilongshanren ab77e8c520 Revert "loading bar use new scale9 feature" 
This reverts commit a671bf7ce9.
 2015-12-22 19:53:24 +08:00
Liam 98a6558018 add interface for BMFont 2015-12-21 18:49:46 +08:00
ArisLittle 68e166568e fix some minor typos in the comments 
change spelling from "a item" to "an item", "a event" to "an event", "a index" to "an index" in cocos/ui/UIListView.h
 2015-12-21 14:26:50 +08:00
mogemimi aac1558b75 Fix typos in documentation, comments and strings 2015-12-21 08:22:41 +09:00
pandamicro 022bcc24f1 Merge branch 'v3.10' of github.com:cocos2d/cocos2d-x into v3 
Conflicts:
	cocos/scripting/js-bindings/manual/chipmunk/js_bindings_chipmunk_manual.cpp
	cocos/scripting/js-bindings/manual/component/CCComponentJS.cpp
	cocos/scripting/js-bindings/manual/js_bindings_opengl.cpp
 2015-12-20 22:56:33 +08:00
zilongshanren 94ee0734a5 Merge pull request #14721 from newnon/v3.10_slider_missprint 
slider misprint fix
 2015-12-19 17:06:26 +08:00
zilongshanren 4fda883c3b Merge pull request #14742 from xiaofeng11/v3.10 
Fix TextField won't show security text when first time set password enable
 2015-12-19 17:01:43 +08:00
Liam 8bf7908e93 fix loadingbar direction changed error 2015-12-19 15:59:27 +08:00
XiaoFeng d8817f3cbb Fix TextField won't show security text when first time set password enable 2015-12-19 15:44:39 +08:00
zilongshanren b480e9191d Merge pull request #14729 from newnon/v3.10_scale9sprite_cropped_spriteframes_support 
Scale9Sprite cropped sprite frames support
 2015-12-19 13:07:25 +08:00
Sergey 9e6657d6b2 fix scale9error error 2015-12-18 22:40:12 +03:00
mogemimi 12ece31121 Mark the old functions as CC_DEPRECATED_ATTRIBUTE 2015-12-19 01:21:56 +09:00
mogemimi 689ee1081a Fix spelling of function name 2015-12-19 01:07:08 +09:00
pandamicro 4d9beb9d77 Merge pull request #14699 from WenhaiLin/v3-new-nothrow 
Adds `std::nothrow` to the `new` statements
 2015-12-18 14:38:28 +08:00
Sergey 98fe1d46cc Scale9Sprite now fully support cropped sprite frames in both mode simple & slice 2015-12-18 00:32:59 +03:00
XiaoFeng 6c08dd920e Fix TextField missing default password style text setting 2015-12-17 18:29:23 +08:00
Sergey 3e049f8049 slider misprint fix 2015-12-17 12:06:39 +03:00
Sergey 89f4a1208b fix font for EditBox in iOS & Mac 2015-12-17 12:02:39 +03:00
Xpol Wan 41d4a41920 crystax-ndk-10.3.0 needs <stdint.h> to be included here. 2015-12-17 12:08:14 +08:00
Wenhai Lin dfdc202171 refine 2015-12-16 15:08:48 +08:00
Wenhai Lin 4fa58602a8 Adds `std::nothrow` to the `new` statements 2015-12-16 14:02:55 +08:00
Wenhai Lin e5952ad440 Improved robustness in release mode 2015-12-16 11:53:59 +08:00
Liam 508d54ec3c fix pageview child size 2015-12-14 15:29:02 +08:00
zilongshanren 0dd4433104 Merge pull request #14669 from zilongshanren/fixCustomSize 
fix #12249
 2015-12-14 13:56:50 +08:00
zilongshanren 6781c96fe0 Merge pull request #14661 from zilongshanren/v3.10 
fix scale9sprite global zorder issue.
 2015-12-14 13:56:29 +08:00
zilongshanren 838bd242ce fix #12249 2015-12-14 11:53:09 +08:00
zilongshanren 3e64e09e69 fix memory leaks of stencileStateManager 2015-12-14 10:40:09 +08:00
zilongshanren 0f5aac5754 fix typo 2015-12-14 10:14:39 +08:00
zilongshanren 8c9b03112e fix scale9sprite global zorder issue. 
1. it also fix the positiong issue when call setScale9Enabled(false)
 2015-12-14 10:09:06 +08:00
zilongshanren d75767bfc4 Merge pull request #14639 from liamcindy/v3_ui_text 
update for text effect clone
 2015-12-11 13:54:46 +08:00
Liam 4c5c6e6d9b update for code format 2015-12-11 12:04:54 +08:00
Liam 8c2b4c78db fix scrollview render error 2015-12-10 13:37:07 +08:00
Liam e92db43e14 update for text clone 2015-12-10 13:17:31 +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 df44b164ef change layout scale9 rendering type to simple 2015-12-09 14:38:53 +08:00
zilongshanren 4c99bdf04f change imageview non-s9 to simple rendering type 2015-12-09 14:26:12 +08:00
zilongshanren df2ebfbc9c change uibutton nons9 to simple rendering mode 2015-12-09 14:21:26 +08:00
zilongshanren 9fd5985581 add simple rendering mode to slider 2015-12-09 11:32:52 +08:00
zilongshanren a671bf7ce9 loading bar use new scale9 feature 2015-12-09 10:41:31 +08:00
zilongshanren ea5dacedd0 Merge pull request #14608 from xiaofeng11/v3_310fix 
Bug fix & make test case more clear.
 2015-12-08 18:05:36 +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
Liam 15072a6dd3 revert error changes 2015-12-07 16:21:12 +08:00
enh a318e31222 We should not intercept touch event if scrollview's _direction is NONE 2015-12-06 22:51:22 +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
pandamicro 1820a006ba Merge pull request #14502 from xiaofeng11/v3_combine_2d 
Combine Studio change for 2d components
 2015-12-04 16:05:24 +08:00
XiaoFeng 6fb65b5610 Editing code as comment. 
Move CocosStudioExtension path and update related files.
 2015-12-04 10:43:39 +08:00
zilongshanren 73d00b9262 fix scale9sprite be culled unexpectedly 
tickets: https://github.com/cocos2d/cocos2d-x/issues/14564
 2015-12-03 17:53:02 +08:00
fnz 8c691430c1 conflicts resolved 2015-11-27 13:19:10 +03:00
fnz c4b995fe59 updates to JniHelper, refactoring of existing JNI calls 2015-11-27 12:00:33 +03:00
zilongshanren c50d686319 Merge pull request #14493 from xiaofeng11/v3_button 
Fix button texture loaded mark has set to wrong value bug
 2015-11-26 21:45:47 +08:00
zilongshanren c3604aa865 Merge pull request #14470 from zilongshanren/fixListViewClippingIssue 
Fix list view clipping issue
 2015-11-26 13:51:51 +08:00
XiaoFeng d744c167b7 Fix button texture loaded mark has set to wrong value bug 2015-11-26 13:49:32 +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
zilongshanren b1490c96b6 Merge branch 'v3' into fixListViewClippingIssue 2015-11-25 18:25:40 +08:00
zilongshanren b0d88a552a Merge pull request #14419 from xiaofeng11/v3_combine_ui 
Combine Studio change for UI components
 2015-11-25 17:19:54 +08:00
zilongshanren 759c0bbf31 rename CCStencilBitsManager to StencilStateManager 2015-11-25 14:24:27 +08:00
zilongshanren 5fef088695 refactor stencil state management code 2015-11-25 14:14:17 +08:00
XiaoFeng 27f6d6a6ba Remove condition macro check. 2015-11-24 19:17:38 +08:00
zilongshanren 9c2130e88a fix Layout and ClippingNode nested rendering issue 2015-11-24 18:01:50 +08:00
zilongshanren 8d1f1a9933 Merge pull request #14457 from zilongshanren/testEditBoxScaleSize 
Fix edit box setPlaceholderFontName and scale font size issue
 2015-11-24 11:33:52 +08:00
François Dupayrat 12df5ae1cc Fix wrong variable use for setPlaceholderFontName 
1. fix editbox scale not affect native font size
 2015-11-23 11:49:22 +08:00
XiaoFeng 23d8b63fca update header file to fix studio UI js binding compile error 2015-11-23 11:41:42 +08:00
zilongshanren 689c0f4af3 Merge pull request #14327 from wohaaitinciu/editbox-win32 
Fix a fatal bug in EditBox implement for platform win32
 2015-11-23 11:35:40 +08:00
zilongshanren 9328a7c1d0 fix scalesprite opacity issue. 
Ref: https://github.com/cocos2d/cocos2d-x/issues/14436
 2015-11-20 17:35:29 +08:00
Neo Kim 4829a037f7 Fix #14440 2015-11-20 15:57:26 +09:00
zilongshanren 7ea90c2d41 Merge pull request #14033 from m-yukio/feature/fixed-richtext 
Support the new line element. Fixed a problem of UIRichText.
 2015-11-19 11:05:08 +08:00
Jeff Wang 9cbcd00798 some properties should be set 2015-11-18 22:47:26 +08:00
zilongshanren 02b59f020e Fix onEndEditing issue in script. 
Issue: https://github.com/cocos2d/cocos2d-x/issues/14332
 2015-11-18 15:05:13 +08:00
XiaoFeng bb83fe4596 Combine Studio change for UI components 2015-11-18 13:38:29 +08:00
zilongshanren 5d8cfa889c Merge pull request #14252 from neokim/change_pageview_to_derive_from_listview 
Change PageView to derive from ListView
 2015-11-17 12:02:10 +08:00
zilongshanren 0b3a342222 Merge pull request #14053 from Dimon4eg/Set-focus-for-widgets 
Set focus for widgets
 2015-11-17 11:24:27 +08:00
zilongshanren a5b7674b4d Merge pull request #14263 from zilongshanren/improve-scale9sprite-v4 
improve scale9sprite
 2015-11-17 10:48:09 +08:00
XiaoFeng e3c120eef4 Combine Studio change for compatible with 32 bit Mac System 2015-11-16 18:25:26 +08:00
Neo Kim 603d788fbf PageView - Fix that page indicator was not working well in vertical page view. 2015-11-15 22:49:42 +09:00
Neo Kim b0ae23d567 PageView - Add more comments 2015-11-15 22:49:42 +09:00
Neo Kim ad134a6363 PageView - Fix that the indicator's direction is not appropriate when `PageView::setDirection()` is called before `PageView::setIndicatorEnabled(true)`. 2015-11-15 22:49:42 +09:00
Neo Kim 94637bef2f PageView - Change to keep some of the original API names because it makes more sense. 2015-11-10 21:35:01 +09:00
Neo Kim 9cbbd283c7 PageView - Deprecate the APIs related to custom scroll threshold. 2015-11-10 21:35:01 +09:00
Neo Kim 049607b5d8 Replace tab indents to 4 spaces. 2015-11-10 21:03:51 +09:00
Jeff Wang c1a64e9243 new implementation of EditBoxImpl-win32 2015-11-06 02:14:34 +08:00
mogemimi a31cce9a80 Fix minor grammar and typo in documentation 2015-11-04 17:14:00 +09:00
zilongshanren 3e2094981f add scale9sprite rendering type test 2015-10-30 14:01:01 +08:00
zilongshanren f84c2de1e2 add sprite and scale9sprite batch test 2015-10-30 09:58:02 +08:00
zilongshanren 1417534194 add rendering type to scale9sprite 2015-10-29 23:13:36 +08:00
zilongshanren 7c82f9fe88 cache slice sprite calculation 2015-10-29 21:53:58 +08:00
zilongshanren 9a14ad5b14 fix a small bug related to non slice anchorPoint 2015-10-29 14:27:27 +08:00
zilongshanren ccf4cb5a74 improve scale9sprite 2015-10-29 10:41:58 +08:00
Neo Kim e59b7b74be PageView - Add `scrollToItem()` having only one parameter. 2015-10-28 16:57:54 +09:00
Neo Kim 69b794d284 PageView - Remove `_indicatorEnabled` flag. Null `_indicator` means that it is disabled. 2015-10-28 16:57:53 +09:00
Neo Kim 9ed617c978 PageView - Add API descriptions 2015-10-28 16:56:36 +09:00
Neo Kim b72e4118f0 PageViewIndicator - Add `PageViewIndicator.cpp` to build configuration files. 2015-10-28 16:56:36 +09:00
Neo Kim e3fcd6722a PageViewIndicator - Add some getter and setters. 2015-10-28 16:56:36 +09:00
Neo Kim 8abd1ab600 PageView - The indicator should be created before `ListView::init()` 2015-10-28 16:56:36 +09:00
Neo Kim 2d2d17172c PageViewIndicator - Fix that indexes were upside down in vertical view. 2015-10-28 16:56:36 +09:00
Neo Kim 1897051664 PageView - Add `setDirection()` and `setIndicatorEnabled()` methods. 2015-10-28 16:56:36 +09:00
Neo Kim eefdffc032 PageViewIndicator - Add `setDirection()` method. 2015-10-28 16:56:36 +09:00
Neo Kim 368a3048c4 PageView - Add `setIndicatorPosition()`. 2015-10-28 16:56:36 +09:00
Neo Kim fc0fe976f7 PageView - Complete `handleReleaseLogic()` method. 2015-10-28 16:56:36 +09:00
Neo Kim b19ed5a3b5 ScrollView - Change `moveInnerContainer()` to virtual method. 2015-10-28 16:56:36 +09:00
Neo Kim b3f33de071 ListView - Change `calculateItemDestination()` to a class method. 2015-10-28 16:56:35 +09:00
Neo Kim c684016ee6 PageView - Implementing page view indicator 2015-10-28 16:56:35 +09:00
Neo Kim 4dbfb79110 Add `onItemListChanged()`method. 2015-10-28 16:56:35 +09:00
Neo Kim 0ee09fcfce PageView - Implement the page indicator 2015-10-28 16:56:35 +09:00
Neo Kim 30e2e46f20 PageView - Add `PageViewIndicator` which indicates current page among total pages. 2015-10-28 16:56:35 +09:00
Neo Kim 76acb91861 Move `createSpriteFromBase64()` from `UIScrollViewBar.cpp` to `ccUtils.h` in order to use it in other places. 2015-10-28 16:56:35 +09:00
Neo Kim a2bc0d4859 ScrollViewBar - Change wording in comment. 2015-10-28 16:56:35 +09:00
Neo Kim b9a4449494 PageView - Add `handleReleaseLogic()` for page view. 2015-10-28 16:56:35 +09:00
Neo Kim 46c0a43105 ScrollView - Use a vector in `scrollChildren()` instead of two floats. 2015-10-28 16:56:35 +09:00
Neo Kim 84d0625b93 ScrollView - Remove redundant codes. 2015-10-28 16:56:34 +09:00
Neo Kim 5de6aa78ec ScrollView - Remove the return value of `scrollChildren()`. 2015-10-28 16:56:34 +09:00
Neo Kim 30d39af5fa Refactor `jumpTo` methods to use `moveInnerContainer()`. 2015-10-28 16:56:34 +09:00
Neo Kim e67250e162 ScrollView - Create `moveInnerContainer()` to replace `moveChildren()` and `moveChildrenToPosition()`. All move related logic will be integrated into one. 2015-10-28 16:56:34 +09:00
Neo Kim 97acf52cc8 PageView - Replace the legacy methods of `PageView` with the ones of `ListView`. 2015-10-28 16:56:34 +09:00
Neo Kim e567259826 PageView - Change `PageView` to derive from `ListView` and use `ScrollView::Direction` instead of `PageView::Direction`. 2015-10-28 16:56:34 +09:00
mogemimi 9df30d2454 Fix typos in documentation 2015-10-23 16:59:51 +09:00
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
dimon4eg fe8c1a12b5 Fix for text field 2015-09-30 12:39:44 +03:00
dimon4eg 2785a4313f Set focus for widgets 2015-09-30 12:31:33 +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
Yukio Murakami bc4bd99863 Support the new line element. Fixed a problem that protrude from the drawing area. 2015-09-28 14:47:09 +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