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

32777 Commits

Author SHA1 Message Date
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
pandamicro 5b99ada936 Merge pull request #13842 from yangws/issue_13818 
Fixed #13818 : Node:Text Input test in cpp-tests touch detection is wrong
 2015-09-17 16:23:25 +08:00
江龙 1b320ac248 add CCGLProgram function binding setUniformLocationWithMatrix 2015-09-17 15:34:41 +08:00
yangxiao 256832d000 replace genGLProgramState to genMaterial 2015-09-17 14:45:16 +08:00
yangxiao 7e4e54b0a5 reset 2015-09-17 14:28:33 +08:00
yangxiao 572ee3adb2 merge cocos 2015-09-17 14:24:01 +08:00
pandamicro dd7a8d2628 Merge pull request #13883 from dumganhar/lua-webview-fix 
[lua] Wrong callback setting for webview:setOnDidFailLoading
 2015-09-17 11:41:27 +08:00
pandamicro d95edeee17 Merge pull request #13882 from pandamicro/v3 
Fix performance issue in AssetsManagerEx due to object copy
 2015-09-17 11:40:16 +08:00
Vincent Yang 4b83240bed Fix bug: in ui::Widget::isClippingParentContainsPoint, _hittedByCamera may be null. 2015-09-17 11:20:36 +08:00
James Chen 0eaf4c6866 [lua] Wrong callback setting for webview:setOnDidFailLoading 2015-09-17 10:52:17 +08:00
pandamicro 20d9442167 Fix performance issue in AssetsManagerEx due to object copy 
Reported in #13513
 2015-09-17 10:00:02 +08:00
pandamicro 9c782b6386 Merge pull request #13880 from zilongshanren/bump-deps-version-v3 
bump external version to 73
 2015-09-17 09:48:55 +08:00
pandamicro d8289ca676 Merge pull request #13843 from yangws/issue_13551 
Fixed #13551 : MenuItemImage Camera Issue.
 2015-09-17 00:08:54 +08:00
pandamicro a3cf5c7794 Merge pull request #13879 from CocosRobot/update_cocosfiles_1442413600 
[AUTO][ci skip]: updating cocos2dx_files.json
 2015-09-16 23:46:06 +08:00
andyque fefbbb6ffa bump external version to 73 2015-09-16 23:07:28 +08:00
CocosRobot 0ccb92a10c [AUTO][ci skip]: updating cocos2dx_files.json 2015-09-16 14:26:42 +00:00
子龙山人 f7a8d8cf9c Merge pull request #13819 from zilongshanren/addiOSMultiline-support 
add iOS EditBox multiline support
 2015-09-16 22:24:40 +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
子龙山人 9ee660a2c7 Merge pull request #27 from Mazyod/addiOSMultiline-support 
UIEditBox iOS changes
 2015-09-16 21:21:17 +08:00
yangxiao fb7ade6578 reset set material 2015-09-16 18:08:23 +08:00
yangxiao b5e69930cd fix shader light parameter 2015-09-16 18:04:52 +08:00
pandamicro 67cf8f950a Merge pull request #13845 from CocosRobot/update_cocosfiles_1442383397 
[AUTO][ci skip]: updating cocos2dx_files.json
 2015-09-16 15:59:16 +08:00
geron-cn e6fb2f8924 fix ReEntry a same frame when scale action's speed. 2015-09-16 15:44:43 +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
CocosRobot 0f3e43344b [AUTO][ci skip]: updating cocos2dx_files.json 2015-09-16 06:03:19 +00:00
pandamicro 0479cca364 Merge pull request #13832 from yangws/downloader 
Restructure CCDownloader implement on iOS and Android don't use libcurl.
 2015-09-16 14:01:28 +08:00
Vincent Yang 36337ad694 Fixed #13551 : MenuItemImage Camera Issue. 2015-09-16 11:24:55 +08:00
Vincent Yang c85dc71846 Fixed #13818 : Node:Text Input test in cpp-tests touch detection is wrong. 2015-09-16 11:07:37 +08:00
pandamicro e53ae5a18b Merge pull request #13841 from natural-law/v3 
[ci skip] Update the reference of submodule cocos2d-console.
 2015-09-16 11:05:18 +08:00
zhangbin aaabe42e75 Update the reference of submodule cocos2d-console. 2015-09-16 11:01:52 +08:00
yangxiao ea538cd9da merge cocos 2015-09-16 10:37:24 +08:00
Vincent Yang ea585f4b7d Fix compile problems. 2015-09-16 09:34:24 +08: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
子龙山人 c535c9df3f Merge pull request #13833 from CocosRobot/update_lua_bindings_1442313090 
[ci skip][AUTO]: updating luabinding & jsbinding automatically
 2015-09-15 21:23:40 +08:00
CocosRobot ae8a35a726 [ci skip][AUTO]: updating luabinding & jsbinding automatically 2015-09-15 10:36:16 +00:00
Vincent Yang 848fa2c0d0 Merge cocos2d. 2015-09-15 18:30:45 +08: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
子龙山人 6eece55e80 Merge pull request #13828 from CocosRobot/update_lua_bindings_1442298458 
[ci skip][AUTO]: updating luabinding & jsbinding automatically
 2015-09-15 16:55:14 +08:00
子龙山人 2157059fef Merge pull request #13826 from zilongshanren/enableSliderBodyTouch 
Enable tapping Slider bar to scroll
 2015-09-15 16:55:00 +08:00
Neo Kim ade2611cfe Merge pull request #3 from zilongshanren/testFixIssue13668 
fix ui::Button title location issue
 2015-09-15 15:35:33 +09:00
CocosRobot 19561ca84b [ci skip][AUTO]: updating luabinding & jsbinding automatically 2015-09-15 06:32:52 +00:00
子龙山人 73d2c5d1b8 Merge pull request #13577 from fusijie/fix_13454 
Fixed sprite debug draw.
 2015-09-15 14:24:23 +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
pandamicro 5e037c9ad8 Merge pull request #13806 from xiaofeng11/v3 
Fix 1.6 version bone animation crash when perform getBoneAtPoint(0,0)
 2015-09-15 14:05:02 +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
子龙山人 5e7270be16 Merge pull request #13824 from CocosRobot/update_lua_bindings_1442295639 
[ci skip][AUTO]: updating luabinding & jsbinding automatically
 2015-09-15 13:51:05 +08:00