Commit Graph

39192 Commits

Author SHA1 Message Date
CocosRobot 7230593be0 [ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically (#17910) 2017-06-08 17:06:05 +08:00
minggo 61386b0a40 fix the issue the sequence action will not be invoked (#17906)
* fix the issue the sequence action will not be invoked

* add comment

* update _done in update() function
2017-06-08 14:52:36 +08:00
Satoshi 84463dbab4 fix CCLabel line height is reset (#17902) (#17903) 2017-06-07 16:56:02 +08:00
CocosRobot 12db177f5c [ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically (#17905) 2017-06-07 16:54:36 +08:00
Undume 72ad341d24 Webview opacity and background transparency (#17831)
* Added three new methods for UiWebView. SetOpacityWebView(float), getOpacityWebView(), setBackgroundTransparent() in IOS

* Implemented methods for UiWebView. SetOpacityWebView(float), getOpacityWebView(). They only work using android sdk +11.

* New methods not implemented for Tizen.

* Added new button for testing the opacity in the cocos2d-x test application.

* Added setBackgroundTransparent to android, and his UI-Test.

* Added setBackgroundTransparent to android, and his UI-Test.

* Added keyword const to the getters.

* Android sdk reflection. +11sdk for chaging the opacity.

* Reflection used for the webview.setLayerType, webview.setAlpha, webview.getAlpha

* Unified exceptions.
2017-06-07 16:12:32 +08:00
CocosRobot 421bd16cb7 [ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically (#17904) 2017-06-07 13:44:00 +08:00
minggo c7899de857 only create gles 2 context (#17901) 2017-06-07 13:34:07 +08:00
minggo 4ca29ac1cf Merge v3.15.1 (#17897)
* remove APP_SHORT_COMMANDS setting (#17722)

some developers report it will cause error on Windows though i can not reproduce it. It is strange, the setting is used to resolve command length limitation on Windows.

* Particle font size should be a const value (#17676)

* Particle font size should be a const value

* Minor fix: CCStencilStateManager.hpp -> CCStencilStateManager.h in xcode project.

* JSB SocketIO.connect supports to pass a CA cert file (#17736)

* JSB SocketIO.connect supports to pass a CA cert file

* The second parameter of SocketIO.connect function is probably a `option` object. JSB just ignores it.

* The optimization for huawei. (#17832)

* The optimization for huawei.

* setAnimationInterval fix for all platforms.

* disable debug

* include fix.

* Uses better configuration for huawei optimization (#17838)

* Uses better configuration for huawei optimization

* Updates jar file and uncomment fps controlling code

* [ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically (#17840)

* update release not and version (#17845)

* [android] Removes an unused variable sRegistered in Cocos2dxActvity.java. (#17861)

* Updates jar to resolve warning while packaging APK file. (#17863)

* update release date (#17870)

* fix compiling error
2017-06-05 13:37:50 +08:00
minggo 8fcf0d7fd9 fix gradle setting (#17896) 2017-06-05 11:35:48 +08:00
Wilson E. Alvarez 41cafe836e Calling PhysicsWorld::setDebugDrawMask(false) will no longer crash when DebugDrawMask was already set to false (#17875) 2017-06-05 10:56:52 +08:00
Miigon fc541e706a Fix a typo in README.md (#17872) 2017-06-05 10:39:48 +08:00
Tyler Dauch 01714514fa Update CCNode.cpp (#17890) 2017-06-05 10:39:25 +08:00
saumyamukul 0a69031db3 [Windows]Fix edit box spacing and alignment (#17807)
* Fix windows edit box crash, spacing, and alignment

Signed-off-by: saumya.mukul <saumya.mukul@mx.com>

* Cleanup

* Reset file attributes
2017-05-31 08:57:11 +08:00
newnon 639737286f before draw event (#17669) 2017-05-26 11:09:24 +08:00
Nick Dong afcffc7b3a Handle auto layout with scaled widget (#17822)
* handle auto layout with scaled widget

* add test for UILayout for Scaled Widget

* add test for UILayout - Scaled Widget - JS
2017-05-26 10:09:57 +08:00
hellobody 92e713bb1c fix to problem with updating APK in Google Play keeping old OBB (#17689)
* fix to problem with updating APK in Google Play keeping OBB from previous version

This patch fixes the problem when we are unable to keep OBB from previous version when we are uploading new .apk to Google Play.
It was discussed here:
http://discuss.cocos2d-x.org/t/problem-with-updating-apk-in-google-play-keeping-obb-from-previous-version-because-versioncode-changes/36039

* check for null pointer added

Found an issue which could lead to a crash because of null pointer exception.
If pathToOBB doesn't exist then File.list will return null which will cause fileNames array be null.
Now it is fixed.
2017-05-26 09:37:29 +08:00
minggo fb7a2fd3fe update console to fix compiling issue on with Xcode 8.3+ (#17862) 2017-05-25 14:59:33 +08:00
dadi 3eadc05d36 Fix iskindof (#17785)
* Fix iskindof logic error

* fix iskindof

* No need to deal metatables in function iskindof_
2017-05-23 16:13:37 +08:00
CocosRobot dd880eedf7 [ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically (#17857) 2017-05-23 10:17:48 +08:00
minggo 69da862f12 fix action running times for instant actions (#17849) 2017-05-23 08:46:44 +08:00
minggo 013d8525ca make fps stable on iOS (#17852) 2017-05-23 08:46:13 +08:00
CocosRobot a857ebe831 [ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically (#17848) 2017-05-22 16:47:08 +08:00
minggo 54962ee509 LayerRadialGradient works on mac and iOS (#17826)
* LayerRadialGradient works on mac and iOS

* fix radius

* finish LayerRadialGradient and add test case

* use local coordinate in shader

* adjust function attributes

* implement getCenter()

* add some comments
2017-05-22 13:42:00 +08:00
David DeSimone 2f3a7df55a Fixing serious XMLHTTP leak when CC_ENABLE_GC_FOR_NATIVE_OBJECTS enabled (#17844)
* Fixing issue where XMLHttpRequests would not have their destructor fire if CC_ENABLE_GC_FOR_NATIVE_OBJECTS was set. This was due to mismanagement of JSHeap object tracing.

* Removing unused variables in js_add_object_root.
2017-05-22 13:40:07 +08:00
James Chen 474491a5d6 Call 'update' method in 'stop/stopAll' to cleanup immediately (#17846) 2017-05-22 11:12:17 +08:00
Atsumu Ono 85529eaa56 Add const keyword to Node::isScheduled (#17841) 2017-05-22 09:25:18 +08:00
Carlos Madrazo 5a52189821 small BillBoard optimizations (#17825)
* small BillBoard optimizations

-Quick return in visit if it is not visible and has no children.  
-Comment out getNodeToWorldTransform because it is death code (doesn't do anything)

* remove unused rotationQuaternion
2017-05-22 08:59:55 +08:00
Carlos Madrazo a24b40ac47 Allow visit Sprite without camera for render to texture (#17824)
* Allow visit sprite without camera for render to texture

A fix to allow render to texture like this 
'''
        Director::getInstance()->setProjection(Director::Projection::_2D);
        m_renderTarget->beginWithClear(1, 0, 0, 0.2, m_depthClear, 0);
        m_sprite->visit(Director::getInstance()->getRenderer(), Mat4::IDENTITY, 0);
        m_renderTarget->end();
        Director::getInstance()->setProjection(Director::Projection::_3D);
'''

* NULL -> nullptr
2017-05-22 08:58:42 +08:00
Atsumu Ono 08467be5a8 Add const keyward to Node::isScheduled and Scheduler::isScheduled (#17833) 2017-05-19 17:24:05 +08:00
James Chen 95baff7086 fixed #17835: pauseEventListenersForTarget doesn't work correctly while in dispatching event (#17836)
* add test.

* fixed #17835: pauseEventListenersForTarget doesn't work correctly while in dispatching event

* remove a unneeded check
2017-05-19 14:03:51 +08:00
CocosRobot 1bfbf35026 [ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically (#17830) 2017-05-19 09:41:55 +08:00
Vladimir Perminov 52b35acf95 [Win32,WinRT] Fix listFiles and listFilesRecursively use unicode. (#17813)
* [Win32,WinRT] Fix listFiles and listFilesRecursively use unicode.

1. Incorrect convertation to unicode
if (length != fullpath.size()) correct only ASCII char.
2. For convert unicode exist api, to avoid errors.
3. Equal first char on '.' - error
Need check full name file on "." and "..", otherwise exclude file and
folder begin '.'

Now not use macro UNICODE, for easy use unicode convert api(Otherwise,
you need to connect different versions WinRT and Win32).

* Fix minggo remark.

* Move to specific platform section.
2017-05-18 09:18:18 +08:00
xbpiao 4e92bcad19 [tolua]Lua bindings-generator support android-ndk-r9d android-ndk-r10d android-ndk-r10e (win32 support android-ndk-r9d android-ndk-r10d android-ndk-r10e android-ndk-r11c android-ndk-r13b android-ndk-r14b) (#17820)
* [tolua]Lua bindings-generator support android-ndk-r9d android-ndk-r10d android-ndk-r10e
(win32 support  android-ndk-r9d android-ndk-r10d android-ndk-r10e android-ndk-r11c android-ndk-r13b android-ndk-r14b)

* [tojs]Javascript bindings-generator support android-ndk-r9d android-ndk-r10d android-ndk-r10e (win32 support android-ndk-r9d android-ndk-r10d android-ndk-r10e android-ndk-r11c android-ndk-r13b android-ndk-r14b)
2017-05-17 17:10:27 +08:00
子龙山人 48f6d1c0e5 Refactoring editbox and system label on win32 platform (#17828)
* refactoring windows editbox

* refactoring win32 system label

* fix jenkins ci issue

* remove unneeded function call
2017-05-17 16:20:21 +08:00
Vladimir Perminov dac7030017 [Win32,WinRT] Fix old bag, Manifest not save. (#17814)
Manifest::saveToFile not save, if path contains not asii chars.
std::ofstream not use unicode api.

Now use FileUtils api for write file.
2017-05-17 16:18:58 +08:00
Vladimir Perminov 4fccfb2102 [Win32] Fix AudioDecoder fopen unicode. (#17815)
If use fopen to need convert utf8 string FileUtils::getSuitableFOpen.
ov_fopen and mpg123_open use fopen.
2017-05-16 09:45:33 +08:00
André Sousa 9ed89680bb Set camera type accordingly in Camera's init methods (#17809) 2017-05-16 09:17:15 +08:00
Vladimir Perminov 6753c6e98b [WinRT] Fix removeDirectory unicode. (#17812)
CCFileUtilsWinRT::removeDirectory need ut8 string.
temp is wstring(unicode).
2017-05-15 17:10:36 +08:00
子龙山人 9c2782f80a Merge pull request #17786 from AIGRIND-LLC/patch-1
Fix issue #15926
2017-05-15 11:37:21 +08:00
minggo c23330e528 webview supports https in jsb (#17805) 2017-05-11 10:25:43 +08:00
子龙山人 71bb11804d Merge pull request #17802 from zilongshanren/fixAndroidDisplayIssue
fix editbox invisible on some Android devices
2017-05-11 09:52:48 +08:00
Joshua Meng cc21ff32bf Issue #16188: Fix lua-script Sprite:playAnimationOnce(animation, args) blink bug (#17583) 2017-05-10 17:37:38 +08:00
zilongshanren 7695269e44 fix invisible issue 2017-05-10 17:32:58 +08:00
zilongshanren ad614a2952 remove unused variable declare 2017-05-10 16:54:09 +08:00
zilongshanren c609aec95d fix editbox invisible on some Android devices 2017-05-10 15:51:29 +08:00
子龙山人 6e718caa29 Merge pull request #17796 from mxenabled/saumya/android_edit_box_fixes
[Android] Fix edit box font size and alignment
2017-05-10 15:24:16 +08:00
Saumya Mukul 96ae677bb9 Missed padding for default vertical alignment 2017-05-09 09:38:01 -06:00
Saumya Mukul 11a43c0d91 Fixup 2017-05-09 09:36:16 -06:00
Saumya Mukul e24a8f1f8e Fix alignment flags 2017-05-08 16:55:44 -06:00
Saumya Mukul 662b98933c Fix edit box font size and padding 2017-05-08 16:30:46 -06:00