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

10655 Commits

Author SHA1 Message Date
pandamicro 6a975fe641 Merge pull request #13599 from perminovVS/winrt-mouse-support 
WinRT support mouse
 2015-09-18 17:26:15 +08:00
hanxi b1ed1a8a51 add UIEditBox support linux platform. 2015-09-18 17:11:58 +08:00
pandamicro 13f3d46ad4 Merge pull request #13897 from super626/v3 
SkyboxBrush : Make the shader parameter take effect at once
 2015-09-18 16:14:06 +08:00
CocosRobot 79a7878687 [ci skip][AUTO]: updating luabinding & jsbinding automatically 2015-09-18 07:41:46 +00:00
WenhaiLin a17a702cd1 Refine components to improve performance 2015-09-18 14:34:02 +08:00
yangxiao 36d4f5564d merge cocos 2015-09-18 14:08:33 +08:00
fusijie 23246b006b fixed region x,y scale bug. 2015-09-18 13:39:22 +08:00
CocosRobot fe41739584 [ci skip][AUTO]: updating luabinding & jsbinding automatically 2015-09-18 04:07:18 +00:00
pandamicro 3f5df0ccc3 Merge pull request #13647 from super626/motionstreak3d 
Motionstreak3d
 2015-09-18 11:59:33 +08:00
偶尔e网事 eb480fb021 Revert "remove CCClippingRectangleNode transform error support." 2015-09-18 11:31:37 +08:00
yangxiao 6f1b04fd89 merge cocos 2015-09-18 09:37:26 +08:00
Vladimir Perminov fdacdcae07 FileUtilsWin32 removeDirectory correct remove file begins with point 
Need check fileName . and .. for delete folders and files begin name.
 2015-09-17 22:36:43 +03:00
Vladimir Perminov 583e780e29 Correct all templates 2015-09-17 22:09:41 +03:00
pandamicro ded9a9e6d4 Merge pull request #13893 from yangws/downloader 
Remove AssetsManager dependence with CRUL.
 2015-09-17 22:18:56 +08:00
yangxiao 757209e59e make the shader parameter take effect at once 2015-09-17 18:14:17 +08:00
pandamicro 1f0006efe8 Merge pull request #13859 from geron-cn/v3bugfixs 
fix bug: ReEntry a same frameindex after scaled action's speed.
 2015-09-17 17:48:06 +08:00
pandamicro 5f3a2bb000 Merge pull request #13874 from super626/light 
Fix shader light parameter bug
 2015-09-17 17:46:46 +08:00
pandamicro 4aaf017e4c Merge pull request #13890 from jianglong0156/addsetUniformLocationWithMatrix 
add CCGLProgram function binding setUniformLocationWithMatrix
 2015-09-17 17:45:16 +08:00
Vincent Yang 5eafc93d86 Remove AssetsManager dependence with CRUL. 2015-09-17 16:52:31 +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
江龙 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 572ee3adb2 merge cocos 2015-09-17 14:24:01 +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 d8289ca676 Merge pull request #13843 from yangws/issue_13551 
Fixed #13551 : MenuItemImage Camera Issue.
 2015-09-17 00:08:54 +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
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
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
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
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
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
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
CocosRobot c9b30bd391 [ci skip][AUTO]: updating luabinding & jsbinding automatically 2015-09-15 05:45:47 +00:00
andyque 2fea4db9fc fix ui::Button title location issue 2015-09-15 13:37:32 +08:00
pandamicro dbe3e062bc Merge pull request #13801 from chengstory/OptimizateDoLayout 
Move "ui::Helper::DoLayout"  to "CreateNode"。
 2015-09-15 13:37:00 +08:00
zhangcheng fb104189d4 Multiplexing ccs.load. 2015-09-15 13:04:45 +08:00
zhangcheng fa7f97b26e Adjustment spaces. 2015-09-15 11:35:43 +08:00
子龙山人 02eca21b78 Merge pull request #13701 from seivan/patch-3 
Don't call release() before retain() #13656
 2015-09-15 11:28:56 +08:00
Vincent Yang bf477c6bfb Restructure AssetsManagerEx. 2015-09-15 11:23:46 +08:00
zhangcheng 83f5f85f56 add loadWithVisibleSize js function. 2015-09-15 11:16:02 +08:00
CocosRobot 4b3e71e353 [ci skip][AUTO]: updating luabinding & jsbinding automatically 2015-09-15 01:35:59 +00: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
pandamicro 89d81bd959 Merge pull request #12281 from lijinlong/v3 
luabinding enumerateChildren bug
 2015-09-14 22:32:56 +08:00
pandamicro dd6c1bc611 Merge pull request #13802 from geron-cn/v3bugfixs 
fix crash recall a cached timeline after exit scene
 2015-09-14 22:12:06 +08:00
XiaoFeng 12f0f7f580 Fix 1.6 version bone animation crash when perform getBoneAtPoint(0,0) 2015-09-14 17:36:19 +08:00
zhangcheng 224f392a9c Add createNodeWithVisibleSize to CSLoader. 2015-09-14 16:51:58 +08:00
Vincent Yang ebf308d88c Test case Downloader Test restructured. 2015-09-14 15:33:34 +08:00
Neo Kim c224a81497 Rectify typos 2015-09-14 15:27:51 +09:00
geron-cn c800d0d824 fix crash recall a cached timeline after exit scene 2015-09-14 14:24:42 +08:00
pandamicro 1fd2e65b48 Merge pull request #13799 from CocosRobot/update_lua_bindings_1442203019 
[ci skip][AUTO]: updating luabinding & jsbinding automatically
 2015-09-14 13:12:36 +08:00
zhangcheng f88b23f52b Move "ui::Helper::DoLayout" to "CreateNode". 2015-09-14 13:07:15 +08:00
CocosRobot a4cb98d993 [ci skip][AUTO]: updating luabinding & jsbinding automatically 2015-09-14 04:01:38 +00: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
James Chen 6073456f23 [Lua] Life control fix for XMLHttpRequest 2015-09-12 17:49:30 +08:00
pandamicro 4022fb65e1 Merge pull request #13760 from super626/materialfix2 
fix material clone
 2015-09-11 18:24:05 +08:00
子龙山人 0e9ae83376 Merge pull request #13782 from CocosRobot/update_lua_bindings_1441965150 
[ci skip][AUTO]: updating luabinding & jsbinding automatically
 2015-09-11 18:06:47 +08:00
CocosRobot e79678454b [ci skip][AUTO]: updating luabinding & jsbinding automatically 2015-09-11 09:59:04 +00:00
pandamicro 2795d0a488 Merge pull request #13779 from pandamicro/v3 
Fix Chipmunk setCollisionType issue by initializing variables
 2015-09-11 17:58:48 +08:00
子龙山人 96d6221daf Merge pull request #13723 from neokim/add_scroll_to_item_and_magnetic_scroll_into_listview 
Add scrolling to item and magnetic scroll into ListView
 2015-09-11 17:48:40 +08:00
pandamicro 5a918608c1 Fix Chipmunk setCollisionType issue by initializing variables 2015-09-11 15:23:29 +08:00
yangxiao ca24e6eba3 fix clone 2015-09-11 15:08:59 +08:00
Neo Kim f39644d129 Remove default arguments in APIs and rename the parameter 'time' to 'timeInSec'. 2015-09-11 16:00:53 +09:00
yangxiao 6fd9784fce setParent for RenderState 2015-09-11 11:47:36 +08:00
geron-cn 966e568051 add ActionTimeline Frame End Call Back and Animation Clip End Call Back 2015-09-10 18:29:09 +08:00
CocosRobot cfe0be269b [ci skip][AUTO]: updating luabinding & jsbinding automatically 2015-09-10 10:14:45 +00:00
pandamicro f281ae31b0 Merge pull request #13725 from WenhaiLin/v3-comonent-refine 
Refine ComponentContainer to  improve performance
 2015-09-10 18:04:26 +08:00
Vincent Yang bd80eb6f46 CCDownloader-android implements Data Task Download. 2015-09-10 18:03:15 +08:00
Seivan Heidari ea12b601d9 Don't call release() before retain() 2015-09-10 11:09:17 +02:00
pandamicro 7611f99ee4 Merge pull request #13746 from WenhaiLin/v3-menuitemtoggle-refine 
Uncoupling the implementation of MenuItemToggle dependence on tag.
 2015-09-10 16:15:18 +08:00
Vincent Yang 7e2fe05050 CCDownloader-android implements File Task Download. 2015-09-10 15:56:06 +08:00
pandamicro 98f29e4dee Merge pull request #13764 from fusijie/fix_autopolygon_comments 
[ci skip]Fixed autopolygon comments
 2015-09-10 15:22:55 +08:00
fusijie d957e0c032 Fixed auto polygon comments out of date. 2015-09-10 15:18:04 +08:00
pandamicro 941cd3c9de Merge pull request #13717 from jianglong0156/assetsmanagerContinue 
fix the AssetsManagerEx can not continuous transmission
 2015-09-10 11:34:03 +08:00
yangxiao d5fab0bd38 merge cocos 2015-09-10 10:44:09 +08:00
yangxiao 8f5cd6cdc8 remove setParent 2015-09-10 09:28:01 +08:00
yangxiao 64471fab85 fix material clone 2015-09-10 09:23:02 +08:00
CocosRobot b164ac059d [ci skip][AUTO]: updating luabinding & jsbinding automatically 2015-09-09 10:45:05 +00:00
pandamicro d03b100ec1 Merge pull request #13706 from WenhaiLin/v3-ios-phonecall-fix 
[IOS platform]AudioEngine:Fixed audio can not resume if it is interrupted cause by an incoming phone call.
 2015-09-09 18:37:13 +08:00
pandamicro f31ebfe331 Merge pull request #13748 from jianglong0156/uniformConversion 
add uniform conversion
 2015-09-09 18:04:07 +08:00
江龙 4509a316cc add uniform conversion 
relate issue:https://github.com/cocos2d/cocos2d-x/issues/13747
relate pr:https://github.com/cocos2d/bindings-generator/pull/191
 2015-09-09 16:03:57 +08:00
WenhaiLin e251866d23 Uncoupling the implementation of MenuItemToggle dependence on tag. 2015-09-09 15:32:44 +08:00
CocosRobot b3976cdd63 [ci skip][AUTO]: updating luabinding & jsbinding automatically 2015-09-09 06:08:45 +00:00
WenhaiLin 34be2065e4 Refine ComponentContainer to improve performance 2015-09-09 11:53:55 +08:00
Martin Taylor e592a1a02d fix typos 2015-09-09 11:37:41 +08:00
yangxiao 153bdb7170 add comment 2015-09-09 11:11:17 +08:00
pandamicro f7f8a42ecf Merge pull request #13722 from NatWeiss/patch-17 
Fix crash in FrameBuffer if no DepthStencil
 2015-09-09 10:46:58 +08:00
子龙山人 ae7b45a569 Merge pull request #13732 from CocosRobot/update_lua_bindings_1441765845 
[ci skip][AUTO]: updating luabinding & jsbinding automatically
 2015-09-09 10:42:04 +08:00
CocosRobot 2423f05024 [ci skip][AUTO]: updating luabinding & jsbinding automatically 2015-09-09 02:37:17 +00:00
子龙山人 20531061a2 Merge pull request #13728 from CocosRobot/update_lua_bindings_1441765050 
[ci skip][AUTO]: updating luabinding & jsbinding automatically
 2015-09-09 10:36:54 +08:00
pandamicro 9814851355 Merge pull request #13659 from seivan/patch-2 
EventListenerMouse will dispatch EventMouse events
 2015-09-09 10:34:12 +08:00
pandamicro dc607a1784 Merge pull request #13726 from jianglong0156/actionExtendSquash 
support custom action, and rewrite update function
 2015-09-09 10:25:56 +08:00
CocosRobot a78f5e3dcc [ci skip][AUTO]: updating luabinding & jsbinding automatically 2015-09-09 02:23:01 +00:00
江龙 badd80bf3a support custom action, and rewrite update function 
support custom action in js, and developer can rewrite the update function in custom action class.
useage:
// custom action sample code
var customMoveBy = cc.MoveBy.extend({
    ctor:function (duration, deltaPos, deltaY) {
        this._super(duration, deltaPos, deltaY);
    },
    update:function (dt) {
        this._super(dt);

        if (this.getTarget()) { // rand color
            this.getTarget().setColor(cc.color(cc.rand()%255, cc.rand()%255, cc.rand()%255));
        }

    }
});
 2015-09-09 10:08:07 +08: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
Neo Kim 90891f9efb ScrollView - Add a utility function 'flattenVectorByDirection()' 2015-09-09 10:28:46 +09:00
Neo Kim ea79d92aa1 ScrollView - Fix an issue which occurs when auto scroll is started during already bouncing back. 2015-09-09 10:28:46 +09:00
Neo Kim 7394b3f467 ScrollView - Rename 'startAutoScrollChildrenWithDestination()' to 'startAutoScrollToDestination' and 'duration' to 'time'. 2015-09-09 10:28:46 +09:00
Neo Kim c037769e62 ScrollView - Correct auto scroll direction 2015-09-09 10:28:45 +09:00
Neo Kim 2dec85e175 ScrollView - Fix that the last touch when release was not considered for inertia scroll 2015-09-09 10:28:45 +09:00
Neo Kim 5f469264fc ScrollView - Refactor auto scroll for simpler implementation 
- Remove auto scroll callback
 2015-09-09 10:28:45 +09:00
Neo Kim ad01bc7699 ScrollView - Add startAttenuatingAutoScroll() 2015-09-09 10:28:44 +09:00
Neo Kim 3cff03e8ed ScrollView - Remove movement callback from auto scroll. 2015-09-09 10:28:44 +09:00
Neo Kim 0c4414625a ScrollView - Rectify wrong indentations 2015-09-09 10:28:44 +09:00
Nathanael Weiss 14b9c2e75c Fix crash in FrameBuffer if no DepthStencil 
This fixes a debug-config crash if a FrameBuffer has no `RenderTargetDepthStencil`.
 2015-09-08 13:13:38 -07:00
江龙 d6934cfc4b rename var resumeDownloaded to resumeDownloaded. 2015-09-08 16:38:02 +08:00
江龙 8daf026c6c fix the AssetsManagerEx can not continuous transmission for large zip file. 
the testcase is extension/assetsmanager
 2015-09-08 16:34:02 +08:00
yangxiao f944750627 add material cache 2015-09-08 15:29:54 +08:00
pandamicro d60eb21d59 Merge pull request #13710 from minggo/implement-function-in-cpp 
fix crash on xiaomi2 if cocos2d-x is built as a dynamic library
 2015-09-08 13:28:19 +08:00
pandamicro eab6dbe6fd Merge pull request #13711 from minggo/crash-in-dynamic-library 
don't define static variable in header file or each dynamic lib will have a copy
 2015-09-08 11:45:12 +08:00
minggo d86b256396 don't define static variable in header file or each dynamic lib will have a copy 2015-09-08 11:04:51 +08:00
minggo bbe5861367 fix crash on xiaomi2 if cocos2d-x is built as a dynamic library 2015-09-08 10:26:37 +08:00
minggo 8326ed6535 add physics component 2015-09-08 09:54:01 +08:00
Seivan Heidari 2f02690394 EventListenerMouse will dispatch EventMouse events 2015-09-07 20:05:51 +02:00
子龙山人 75882e64a0 Merge pull request #13646 from neokim/refactor_scrollview_inertia_scroll 
Refactor scroll view's inertia scroll
 2015-09-07 22:38:20 +08:00
pandamicro 00abec6c2c Merge pull request #13707 from pandamicro/fix_layerrgba 
[ci skip] Fix compile error in __LayerRGBA
 2015-09-07 17:27:46 +08:00
TheCodez d77045818c Fix compile error in __LayerRGBA 2015-09-07 17:25:56 +08:00
WenhaiLin e500b960f3 AudioEngine:Fixed audio can not resume if it is interrupted cause by an incoming phone call. 2015-09-07 16:29:57 +08:00
pandamicro 0eee625788 Merge pull request #13697 from pabitrapadhy/patch-1 
Updated spelling and grammar mistakes
 2015-09-07 15:02:27 +08:00
pandamicro 4fb34ba190 Merge pull request #13703 from cocos2d/v3.8 
Sync v3.8 to v3
 2015-09-07 14:56:37 +08:00
yangxiao c3ac446f35 resolve conflict 2015-09-07 14:45:09 +08:00
yangxiao 97c59c87ac built in material for sprite3d 2015-09-07 13:59:38 +08:00
yangxiao 137d180dc9 fix material clone 2015-09-07 13:59:08 +08:00
Vincent Yang 9b4fe5b5a1 Add CCDownloader-android class frame to android project. 2015-09-07 11:55:00 +08:00
pandamicro 2739be06bb Update COCOS2D_VERSION 2015-09-07 11:45:04 +08:00
WenhaiLin 42b24a9c5b Rename AVAudioPlayer to CCAudioPlayer for avoid conflicting with system framework 2015-09-07 11:12:13 +08:00
Vincent Yang 3a078540a0 Modify CCDownloader-apple.mm support continuly download. 2015-09-07 10:08:28 +08:00
Pabitra Padhy d4c60144f0 Updated spelling and grammar mistakes 2015-09-06 15:29:36 +05:30
Vincent Yang 0afa2bdfc6 Modify CCDownloader-curl.cpp to support continue download. 2015-09-06 15:57:51 +08:00
子龙山人 f9eef5ceed Merge pull request #13636 from zilongshanren/refactorEditBox 
refactor EditBox iOS&Android implementation
 2015-09-06 10:03:54 +08:00
pandamicro 2dfd22dfef Merge pull request #13690 from pandamicro/v3.8 
[ci skip][JS] Add common APIs for compatibility with web engine
 2015-09-06 08:59:27 +08:00
pandamicro 86fb0fc3bc [JS] Add common APIs for compatibility with web engine 2015-09-06 08:57:43 +08:00
Dale Stammen 030157ded0 update libcococs2d name to v3.9 for WinRT platforms 2015-09-04 08:46:08 -07:00
pandamicro f9c20caa67 Merge pull request #13603 from perminovVS/correct-key-code 
Desktop and WinRT use correct keyboard codes
 2015-09-04 14:39:44 +08:00
Aaron 59fab25804 Removed innerContainer pointer copy when cloning 
Copied pointer becomes invalid when model widget destructs. Instead we simply copy the position.
 2015-09-03 11:29:58 +01:00
pandamicro ab5b634976 Merge pull request #13625 from frranck/patch-4 
Update CCImage.cpp
 2015-09-03 00:10:16 +08:00
Vladimir Perminov 527e254617 Remove glfwError 2015-09-02 18:41:23 +03:00
Vladimir Perminov c1ac27fffb glfwError no static member 2015-09-02 15:02:23 +03:00
Vincent Yang ea580ed2ee Restructure CCDownload Interface and implements with curl. 2015-09-02 18:26:42 +08:00
andyque c0f40ad4a5 fix Android EditBox font size issue 2015-09-02 18:25:30 +08:00
songchengjiang addce6c565 add CC_DLL 2015-09-02 15:55:58 +08:00
linguofeng 7fc382055b lua add UPDATE_FAILED ERROR_DECOMPRESS 
add
cc.EventAssetsManagerEx.EventCode.UPDATE_FAILED
cc.EventAssetsManagerEx.EventCode.ERROR_DECOMPRESS
 2015-09-02 11:27:47 +08:00
子龙山人 4530043d9b Merge pull request #13649 from WenhaiLin/v3-string-empty-check 
Use string::empty() to check whether string is empty.
 2015-09-01 18:04:41 +08:00
Neo Kim 3656ce99bd Fix an issue regarding non-bouncing scroll view 2015-09-01 15:13:18 +09:00
yangxiao 5cabc592e0 add motionstreak3d to cocos2d header 2015-09-01 11:34:35 +08:00
WenhaiLin 5fdb041856 Use string::empty() to check whether string is empty. 2015-09-01 11:26:09 +08:00
yangxiao c23805889f add motionstreak3d 2015-09-01 11:02:22 +08:00
Neo Kim 129f4b3186 Implement the inertia scroll using auto scroll feature. Consolidate them into one. 2015-09-01 11:52:05 +09:00
Neo Kim ecd947d9f4 Change auto scroll feature to receive callbacks to remove dependencies. 2015-09-01 11:45:42 +09:00
Neo Kim 137a05a2aa Rectify the wrong indentations in switch statements 2015-09-01 11:45:42 +09:00
Neo Kim 69d23eb00c Extract the touch move speed calculation logic from inertia concept. 2015-09-01 11:45:42 +09:00
Neo Kim 81795f6d73 Add a guard statement in setInnerContainerPosition(). 2015-09-01 11:45:42 +09:00
Neo Kim 96a78f687c Remove redundant codes 2015-09-01 11:45:42 +09:00
子龙山人 2e9e660cbb Merge pull request #13220 from zilongshanren/testEditBoxWin32 
Improved EditBox implement for platform win32
 2015-09-01 10:40:11 +08:00
yangxiao b6c4f4cf50 add comment 2015-09-01 10:39:14 +08:00
pandamicro 7f04a191c7 Merge pull request #13635 from super626/v3.8 
Enable depth write for transparent object
 2015-09-01 10:30:50 +08:00
子龙山人 59c1b21d0b Merge pull request #13634 from WenhaiLin/v3.8-textreader-refine 
This is a small optimization about TextReader.
 2015-09-01 09:40:52 +08:00
Jeff Wang b8105349c7 revert to the original state when user cancel input 2015-09-01 00:06:18 +08:00
WenhaiLin a3b5becb45 Sync v3.8 to v3 2015-08-31 22:05:37 +08:00
andyque 367a105a48 refactor EditBox iOS&Android implementation 
Fixed issue: https://github.com/cocos2d/cocos2d-x/issues/13616#issuecomment-135742727
 2015-08-31 18:36:27 +08:00
yangxiao 030ab8858d enable depth write for transparent object 2015-08-31 18:34:09 +08:00
WenhaiLin df383de894 This is a small optimization about TextReader. 2015-08-31 17:06:11 +08:00
geron-cn e7c7b248d6 fix bug: bone can be see by other cameras 2015-08-31 16:04:17 +08:00
pandamicro 8f6f5c1191 Update engine versions 2015-08-31 13:52:15 +08:00
frranck 8e195723e6 Update CCImage.cpp 
When you're creating a sprite (e.g. with Sprite* Sprite::create(filename))
There's no way to test the file before, without getting "a unsupport image format!" thrown.
 2015-08-30 09:40:15 +02:00
yangxiao bc07d7954a fix render state 2015-08-28 23:00:45 +08:00
Vincent Yang cf664800ac refine #22483 : Restructure CCDownload Interface and implements on iOS. 2015-08-28 16:40:11 +08:00
pandamicro 9d72d6a924 Merge pull request #13496 from ZhangMenghe/v3-notification 
[ci rebuild] Notification effect enhancement
 2015-08-28 14:10:42 +08:00
yangxiao 6fa6f1f0da enable depth write 2015-08-28 11:46:11 +08:00
yangxiao bc2e66d03b add motionstreak3d 2015-08-28 11:40:12 +08:00
子龙山人 4fe9517ec7 Merge pull request #13592 from neokim/fix_13591 
Fix #13591
 2015-08-28 10:19:20 +08:00
pandamicro 1264863b2f Merge pull request #13598 from zilongshanren/fixSliderConstructor 
fix Slider create missing res type.
 2015-08-28 09:28:19 +08:00
Liam 69da65d7a4 update for jsb_opengl_constants 2015-08-28 08:42:55 +08:00
Vladimir Perminov b5688f504c Desktop and WinRT use correct keyboard codes 
Desktop:
GLFW_KEY_ENTER equals KEY_ENTER ( GLFW_KEY_KP_ENTER = KEY_KP_ENTER)
WinRT:
VK_PRIOR equals KEY_PG_UP ( not KEY_KP_PG_UP )
 2015-08-27 23:46:24 +03:00
Vladimir Perminov 104013aebe commit v3.8 overwrite this unused code 
From commit #13397
 2015-08-27 23:19:30 +03:00