Commit Graph

14015 Commits

Author SHA1 Message Date
CocosRobot 1fa0f3d237 [ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically (#18129) 2017-08-07 17:01:27 +08:00
minggo 5a3244511a use correct selector to fix crash (#18132) 2017-08-07 17:00:35 +08:00
Joel Besada efe95fd899 [ci skip]Add Chipmunk JS binding for segmentQuery (#18107) 2017-08-07 11:57:45 +08:00
ggggamer dc9abcc669 FontAtlas::prepareLetterDefinitions's memory leak. (#18114) 2017-08-07 11:13:56 +08:00
bulzipke b5d871d53c Hide virtual button by user control. (#18100)
* Hide virtual button by user control.
It want a lot of people, including me.

http://discuss.cocos2d-x.org/t/solved-android-navigation-bar/31760/3
http://discuss.cocos2d-x.org/t/android-cocos2d-v3-12-about-virtual-button/30811/5
http://joyplot.com/documents/2016/09/27/cocos2d-x-navigation-bar/
http://falstar.hateblo.jp/entry/2016/07/10/180112

* I also added the lua/js template.
Thank you for your work :)
2017-08-07 11:12:26 +08:00
minggo 4be6eb5325 correct usage of reference count of LabelAtlas (#18117) 2017-07-31 09:05:55 +08:00
minggo b9cd599657 fix crash because of error offset (#18108) 2017-07-28 09:09:41 +08:00
CocosRobot db79a5ea6f [ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically (#18102) 2017-07-26 17:03:19 +08:00
kepler-5 12fc75790b Fix pageview iterator invalidation (#18091)
* allow setting and getting of pageview indicator opacity. fix some documentation comments

* don't draw the indicator the selected indicator is currently overlapping

* add a tweaked opacity to one of the test cases

* remove unused variable

* convert tabs to whitespace

* change constexpr to static const

* fix iterator invalidation when adding or removing pages from the pageview
2017-07-25 20:11:02 +08:00
minggo b77c29f750 make RichText supports img tag with Sprite Frame name (#18087) 2017-07-24 10:35:52 +08:00
Felippe Durán 681e9aa752 Fix polygon sprite bug of resetting flip and color information in setSpriteFrame. (#18085) 2017-07-19 11:08:12 +08:00
minggo cdac595a68 fix iOS deltatime (#18084)
* fix ios delta time when resumes from background

* remove debug codes
2017-07-18 14:01:53 +08:00
Felippe Durán 78818ca275 Fix AudioEngine thread concurrency crash between myAlSourceNotificationCallback and _play2d iterating over _audioPlayers. (#18083) 2017-07-18 11:12:20 +08:00
minggo a6773f408a fix crash if there are more than 10 touches (#18082) 2017-07-18 09:47:12 +08:00
CocosRobot 54586d06a4 [ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically (#18081) 2017-07-17 16:51:50 +08:00
kepler-5 d42d969b46 Allow customizing opacity of PageView indicator nodes (#18059)
* allow setting and getting of pageview indicator opacity. fix some documentation comments

* don't draw the indicator the selected indicator is currently overlapping

* add a tweaked opacity to one of the test cases

* remove unused variable

* convert tabs to whitespace

* change constexpr to static const
2017-07-17 15:55:43 +08:00
子龙山人 0b99ba35f2 Fix ui slice issue (#18065)
* add tests to reproduce sprite slice issue

* fix scale9sprite change texture losing slice info

* fix tilemap crash issue
2017-07-17 15:52:01 +08:00
minggo 7da188734d use VAO/VBO to improve performance (#18066) 2017-07-17 15:16:42 +08:00
Wilson E. Alvarez bdfb71b05b Moved GLFWEventHandler to its corresponding header (#18063) 2017-07-13 17:34:28 +08:00
Wilson E. Alvarez 717bd1c248 Fixed typo. Added comments about GLFW 3.3 controller support. (#18064) 2017-07-13 17:29:54 +08:00
minggo 78e2bf5f93 do not use custom EGLContextFactory (#18062)
it will crash on some devices
2017-07-13 17:21:25 +08:00
CocosRobot 17f2a12a28 [ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically (#18061) 2017-07-13 11:13:38 +08:00
kepler-5 876e4222a9 More useful events and getters in UIScrollView (#18054)
* add begin and end events to UIScrollView

* add new state to copySpecialProperties

* functions to find what percent scrolled in a scrollview we are
2017-07-13 10:35:29 +08:00
James Chen f4bf68610c fixed #18055: [android] urlConnection.getResponseCode may trigger exception which needs to be handled. (#18056) 2017-07-13 09:53:54 +08:00
minggo 2fbbdef58d do not initialize VBO with big size for performance issue on some Android devices (#18060) 2017-07-13 09:52:07 +08:00
CocosRobot 81d70adece [ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically (#18052) 2017-07-12 09:50:15 +08:00
halx99 18f173e3e6 Fixed vsnprintf compatibility with vc12 and vc14 (#18040)
* Fixed vsnprintf compatibility with vc12 and vc14

see reference: https://github.com/halx99/cocos2d-x/pull/30

* Update CCConsole.cpp

* Add comment.
2017-07-10 10:30:49 +08:00
Wilson E. Alvarez 5dd81e758a Add controller support for Linux and Win32 (#17990)
* Add controller support for Linux and Win32

* Fix iOS and Mac linker issue

* Fixed documentation. Removed unnecessary whitespace.
2017-07-10 10:30:04 +08:00
Ole Herman Schumacher Elgesem 1c55ad104d Use cocos2d::Rect to avoid ambiguity (#18048)
Signed-off-by: Ole Herman Schumacher Elgesem <oleherman93@gmail.com>
2017-07-10 10:29:30 +08:00
minggo e7c69e253a fix invalid dt at start on iOS release mode (#18041) 2017-07-10 10:06:25 +08:00
Tiago Martines 74a6fd3293 Do not define VERY_VERY_VERBOSE_LOGGING by default. (#18036) 2017-07-06 14:57:02 +08:00
halx99 78e0cbfc5f Use CurrentDirectory as defaultSearchRoot on Win32 (#18017)
Default, CurrentDirectory equals to ExeDir, but it's more  flexible, and will not break compatible.
2017-07-06 10:24:18 +08:00
CocosRobot#Set 012e9982d8 [ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically 2017-07-05 01:32:25 +00:00
kepler-5 d3eb857482 horizontal alignment support in RichText (#18027)
* horizontal alignment support in RichText

* split lambda into separate function

* tweak shadow test's content size so horizontal aligment doesn't give the illusion of behaving incorrectly

* fix alignment when the last char of a line is whitespace

* fix errors from merge

* fix bug in setting of size of image elements. scaling was applied effectively twice.

* removed debugging code. whoops
2017-07-05 09:25:12 +08:00
kepler-5 c8fc2dc3ef arithmetic operators for Color4F (#18028)
* arithmetic operators for Color4F

* remove template functions
2017-07-05 09:05:03 +08:00
halx99 f2e9785132 Export cocos2d::utils::findChild to lua-bindings (#18013) 2017-07-04 14:37:44 +08:00
kepler-5 bbe84f8d7a Remove unnecessary dynamic allocation (#18014)
* don't dynamically allocate PointArray's internal vector. take advantage of move semantics where possible.

* don't dynamically allocate RichText's _elementRenders vectors
2017-07-04 14:31:29 +08:00
afpro fec74ac549 CCImage.cpp misuse CC_USE_PNG (#18015) 2017-07-04 14:17:17 +08:00
minggo 6d9bd1bf65 fix stats of seconds per frame on iOS (#18025) 2017-07-04 13:38:03 +08:00
CocosRobot e7a2708812 [ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically (#18021) 2017-07-03 15:21:55 +08:00
minggo 84ccbde845 Sequence issue (#18009)
* fix SequenceWithFinalInstant test issue

* fix the issue that sequence will not finish for ever
2017-07-03 09:15:53 +08:00
halx99 795538ad9f Fix sourcePosition bug for ParticleSystem. (#18002) 2017-06-30 09:20:43 +08:00
Wu Zheng 41ef696019 luaoc static function return type fix (#17956)
* update remote repo

* Revert "update remote repo"

This reverts commit c92200d0ac4203c32048ea902e92535dcb4d0935.

* returnType BOOL

* luaoc return type encode
2017-06-26 14:04:55 +08:00
Wilson E. Alvarez eb85f190bd Add CCGLProgramStateCache header to cocos2d.h (#17976) 2017-06-26 13:53:17 +08:00
Wilson E. Alvarez 90af809b89 No need to get the Configuration and Director instances more than once in CCRenderer.cpp (#17978) 2017-06-26 13:52:49 +08:00
minggo 3208120ff9 fix warnings (#17971) 2017-06-23 17:47:20 +08:00
minggo 61839e7a5b fix warnings (#17970) 2017-06-23 17:46:37 +08:00
minggo 4ce443bac2 use prebuilt version of bullet (#17950)
* use prebuilt bullet

* prebuilt bullet work ok on linux

* update search path

* update search path

* fix compiling issue for lua/jsb projects

* prebuilt bullet work on windows

* update 3rd party lib version

* add bullet search path

* fix script bindings issue

* fix scripting binding
2017-06-21 13:39:38 +08:00
Wilson E. Alvarez 61815f57c0 Fixed Director memory leak (#17952) 2017-06-21 09:45:53 +08:00
Wilson E. Alvarez 0f75d3ac5a Added missing header for NDK v15 (#17943) 2017-06-20 09:04:51 +08:00
James Chen 567fa5b0a7 fixed #17800: [iOS] Streaming audio (normally a background music) maybe cut and may not be looped. (#17947)
* fixed #17800: [iOS] Streaming audio (normally a background music) may be cut and may not be looped.

* Updates including.
2017-06-20 09:04:04 +08:00
Wilson E. Alvarez a23924c95b Use const reference where possible. Dropped unnecessary namespace specifier (#17941) 2017-06-20 09:03:35 +08:00
Y-way 7894c5c4a3 Setting new texture for Sprite will reset the program state that is changed (#17938)
In my project:
1.set default texture.
2.set mine shader program
3.set new texture.

then, the sprite will reset my shader program.
2017-06-20 09:02:58 +08:00
Y-way e6210874dd Processing Lua file(UTF8+BOM) that is encrypted will crash,when free the buffer pointer that is changed pointer address. (#17937) 2017-06-20 09:02:40 +08:00
minggo 3e912ffee3 add a macro to stip fps related data and functions (#17934) 2017-06-20 09:02:13 +08:00
CocosRobot 78d5a809c8 [ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically (#17933) 2017-06-20 09:01:57 +08:00
shintaro.tanikawa f9c8bd4bc1 Add padding options to ListView (#17587)
* Add options to ListView for setting padding

* Add 'setPadding' method test cases.
2017-06-15 14:56:54 +08:00
minggo f79a138c2b revert updating flatbuffers (#17930)
* revert updating flatbuffers

* update external version
2017-06-15 13:42:50 +08:00
minggo 48c44d6a1a remove "system" usage (#17921)
* remove "system" usage
"system" is removed in iOS 11

* android uses old method
2017-06-15 11:07:08 +08:00
James Chen 5620e30f32 fixed #17922: [android] AudioEngine may crash while audio's over and stop state is triggered at the same time. (#17923)
* fixed #17922: [android] AudioEngine may crash while audio's over and stop state is triggered at the same time.
The Pull Request #17748 didn't resolve the issue since _track->getPrevState will be wrong while in scheduler callback. We need to capture it in lambda.
My Pull Request also merges PR #17716 to make filePath captured by lambda.

* Adds missing log tag in AudioEngine-inl.cpp
2017-06-13 17:44:04 +08:00
minggo 5c9ac37f50 initialize callback functions (#17918) 2017-06-12 10:43:45 +08:00
minggo 2b3baf4517 fix precision issue (#17908)
* fix precision issue

* fix shader error on mac
2017-06-12 08:57:40 +08:00
CocosRobot 992ac34a2d [ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically (#17913) 2017-06-09 09:54:03 +08:00
minggo f263a43336 Spawn issue (#17911)
* fix isDone() in spawn

* remove unneeded void keyword
2017-06-08 17:07:43 +08:00
James Chen 845e177885 Uses better configuration for huawei optimization and remove rapidjson dependence in EngineDataManager (#17909)
* Uses better configuration for huawei optimization (#17838)

* Uses better configuration for huawei optimization

* Updates jar file and uncomment fps controlling code

* Sync code from 2.x
2017-06-08 17:06:46 +08:00
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
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
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
子龙山人 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 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
David DeSimone ca0a7f313e Changing AsyncTaskPool/Scheduler to better leverage move semantics (#17727)
* Changing CCAsyncTaskPool and CCScheduler to better leverage move semantics, to avoid several lambda copy constructor calls. Chaning call sites in the cocos engine to better leverage move semantics.

* Editing binding generator to not generate bindings for AsyncTaskPool::enqueue. Bindings were not previously generated for this function due to it's type signature involving a template parameter.

* Adding missing std::move call in AsyncTaskPool to skip a copy constructor call.
2017-05-08 13:39:17 +08:00
AIGRIND bf1f7de9f7 Fix issue #15926 2017-05-05 16:52:15 +02:00
AIGRIND afaa9be826 Fix issue #15926 2017-05-05 16:50:04 +02:00
zilongshanren ae8e83b021 fix editbox textChanged call times on Android platform 2017-05-05 11:23:22 +08:00
CocosRobot e7a9ffb396 [ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically (#17780) 2017-05-05 11:11:06 +08:00
minggo 6dcaa9fe3a do not use ES3 context if using multi sample (#17778)
multi sample in ES3 needs to use GLES3 function
2017-05-04 16:25:35 +08:00
Dimon4eg a3cb7de101 Fix reschedule issue with same key (#17706)
* fix reschedule issue

* correct code formatting

* Fix isScheduled

* improve a bit performance of executing functions in cocos thread

* added test to verify reschedule issue

* re-init timer in schedule if timer exists and alive
2017-05-04 16:24:20 +08:00
子龙山人 55b14cbde5 Fix android edit box duplicated text (#17775)
* fix editbox textChanged event called after fragment loaded

* fix editbox duplicatd text when change text in textChanged callback

* revert changes of placeholder modification
2017-05-04 15:04:47 +08:00
Vladimir Perminov 973d6aa955 Added function for calculating md5 hash from Data. (#17762)
* Added function for calculating md5 hash from Data.

getFileMD5Hash now use getDataMD5Hash.

For example, AssetsManagerEx VerifyCallback.
Get Data from file, check equal size, if equal to get md5 hash.

* Data::isNull check size equal 0

* Build on linux and android.
2017-05-04 09:21:22 +08:00
子龙山人 5c3993836e Merge pull request #17756 from perminovVS/set-font-atlas-memory-leak
Memory leak in setFontAtlas, if set equal font in Label.
2017-05-03 17:23:28 +08:00
Eric Zhong 59f9c35f34 fix downloader will not be conitnue (#17761)
if already has started six data task, then start 7th task will suspend, it will not be run
2017-05-03 10:57:42 +08:00
Aaron Baumbach 58b8e77d74 Moved CC_SYNTHESIZE and CC_PROPERTY macros onto a single line (#17765)
This permits comments to be visible in tooltips for the variable and it's associated accessor functions

e.g.
//The health of the entity, when this reaches zero the entity is dead
CC_SYNTHESIZE(float, m_health, Health)

Previously the above comment would only be displayed in the tooltip for the member variable
2017-05-03 10:12:31 +08:00
sbrednikhin 07bb0b2393 Avoid crash on large file download. (#17735)
Downloading large file to memory could cause stack overflow and crash, because old code created buffer `char buf[buflen];` in stack.
New code creates buffer in heap.
2017-04-28 13:38:23 +08:00
Kameiha e45cb88ead Support ETC1 Alpha Channel in the Spine Library (#17692)
* Update SkeletonBatch.cpp

* Update SkeletonBatch.h

* Update SkeletonRenderer.cpp
2017-04-27 10:04:59 +08:00
James Chen 77f2f82b7a [android] Audio Engine crash on Android when playing and stopping some audios repeatedly. (#17748) 2017-04-27 09:48:13 +08:00
RickyZheng001 f8e325792b V3.15 (#17752)
* 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.
2017-04-27 09:25:20 +08:00
Vladimir Perminov afb95f2ced Memory leak, if set equal font in Label.
setCharMap, setBMFontFilePath and setTTFConfigInternal use getFontAtlas.
getFontAtlas retain font atlas always.
setFontAtlas not release, if atlas equal current.

For example call Label::setTTFConfig for equal ttfConfig.
2017-04-26 22:25:15 +03:00
子龙山人 1f1f1d8f1a fix ios label shrink overflow clamp letters issue (#17737) 2017-04-25 09:04:00 +08:00
CocosRobot ddb4dc893b [ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically (#17733) 2017-04-21 09:16:25 +08:00
David DeSimone 246406bda1 Adding additional async functions to FileUtils (#17634)
* Adding async functions for FileUtils::listFiles and FileUtils::listFilesRecursively.

* Updating CCFileUtils::listFiles and CCFileUtils::listFilesRecursively to not expose their async version to
the JS and Lua scripting layers, due to a bug in the binding generator code.

* Updating comments in CCFileUtils.h to prevent improper JS bindings to be generated.

* Editing the cocos2dx.ini files, to prevent bindings for listFilesRecursivelyAsync and listFilesAsync to be generated.
2017-04-19 09:14:06 +08:00
minggo ee84d9f12e update v3.15 2017-04-14 13:45:32 +08:00
James Chen 3c1e36c2c3 Cleanup AudioEngine resource after exiting NewAudioEngineTest. (#17675)
* Unschedules update in AudioEngine implementation while AudioEngine::end is called.

* Cleanup AudioEngine resource after exiting NewAudioEngineTest.
2017-04-13 17:58:49 +08:00
James Chen 57170200dd fixed #17685: [android] Audio in game couldn't be mute while a ring or a call is coming (#17686)
* fixed #17685: [android] Audio in game couldn't be mute while a ring or a call is coming

* Updates comments in AudioEngine-inl.cpp and removes extra empty line in javaactivity-android.cpp

* Puts audio focus relative code to another java file named Cocos2dxAudioFocusManager.java
Renames setAudioFocusLost to setAudioFocus.

* Renames JNI function.

* Register audio focus in onResume and unregister it in onPause.
2017-04-13 10:44:08 +08:00
pandamicro 8acf8f84ed Merge pull request #17660 from ricardopetrere/patch-1
cc.Follow not working on mobile
2017-04-10 15:19:41 +08:00
James Chen 4dac6b3f36 Fixed WebSocket.cpp memory leaks (#17672) 2017-04-10 14:16:55 +08:00
James Chen 97adaabefb Don’t link with libGLESv1_CM.so (#17673) 2017-04-10 14:16:36 +08:00
James Chen 56ae741124 fixed #17665: [android] Crash while launching on the devices only support OpenGL ES 2. (#17671)
* fixed #17665: [android] Crash while launching on the devices only support OpenGL ES 2.
Fixes that egl.eglCreateContext may return non-null but EGL10.EGL_NO_CONTEXT value.
It will cause create a EGL env with a EGL_NO_CONTEXT egl context which will cause crash.

* Don’t link with libGLESv1_CM.so
2017-04-10 11:49:33 +08:00
Wilson E. Alvarez 21f51f0f48 Fixed WebSocket.cpp memory leaks (#17653) 2017-04-10 10:28:05 +08:00
Andrey 1c697796ea Fixed FileUtils::getFileSize() on android platform (#17632) 2017-04-10 10:16:21 +08:00
Steve Tranby e3e00906e3 Fix can't open URLs that have '&' character. (#17633)
See discussion: http://discuss.cocos2d-x.org/t/small-fix-for-application-openurl-linux/35993
2017-04-10 10:15:29 +08:00
James Chen 1f39fd5fdf CocosDenshionTest, unload doesn't work for android 5.0.1 devices (#17662) 2017-04-10 10:14:47 +08:00
newnon ad260980c7 projection fixes (#17487) 2017-04-10 09:15:40 +08:00
Ricardo Petrére c69823ba6f cc.Follow not working on mobile
When using a cc.Follow action, I've tested on mobile devices (Android & iOS) and it's not working. This changed fixed the problem.
2017-04-06 08:45:06 -03:00
minggo ea8ffa3c1c Merge pull request #17630 from minggo/merge-v315
Merge v315
2017-04-05 15:42:53 +08:00
Dale Stammen ce8a513c73 fixed build properties for compiling md5.c (#17638) 2017-04-05 10:28:57 +08:00
James Chen acc97516d8 Sensor timestamp fix, tizen uses micro-seconds as timestamp unit. (#17629) 2017-04-01 17:20:48 +08:00
minggo 9ed5127edc synchronize v3.15 2017-04-01 17:16:45 +08:00
minggo 1f57542d68 match the logic to unbind vao (#17628) 2017-04-01 15:37:22 +08:00
James Chen a924e29c2c Adds libmd5-rfc third-party library for calculating MD5 since the functions in <openssl/md5.h> aren’t exported in win10, plus <openssl/md5.h> seems to be private header. (#17625)
* Adds libmd5-rfc library since the functions in <openssl/md5.h> aren’t exported in win10, plus <openssl/md5.h> seems to be private header.

* Adds libmd5-rfc library for win32 and win10.

* Removes json/msinttypes folder from xcode since it’s only needed for win32 | win10.
2017-04-01 11:43:17 +08:00
pandamicro 4fe75a99b5 Update engine version (#17624) 2017-03-31 16:09:20 +08:00
James Chen 439f371758 fixed #17619: [android] Crash if uncache audio in the finished callback (#17620) 2017-03-31 09:38:45 +08:00
James Chen 2b3087ffc5 Fixes ConsoleUploadFile test could not work on android. (#17607)
* Should not use fread to read file from assets, uses FileUtils::getDataFromFile instead.
* Client socket should not be closed immediatelly after ::send. Otherwise, sever may will receive “Connection reset by peer - Errno 104” error on some platforms. It could be 100% reproduced on Android.
2017-03-29 14:23:33 +08:00
CocosRobot 31c0e27b4b [ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically (#17606) 2017-03-29 14:23:15 +08:00
James Chen 1eea499466 fixed #17603: Connection error in Console uploadFile test. (#17604)
* fixed #17603: Connection error in Console uploadFile test.

* tab -> spaces

* tab -> spaces

* tab -> spaces
2017-03-29 09:17:37 +08:00
minggo 63a81b1f7e add 'virtual' for ActionManager functions (#17594) 2017-03-28 09:25:48 +08:00
minggo aa3bff6c12 fix comment and explicitly initialize _anchorPoint (#17597) 2017-03-28 09:25:25 +08:00
pandamicro d25cd8ddf4 [ci skip] Fix QA issues (#17596)
* Fix RenderTexture#clear API inconsistency

* Improve js-tests desktop page

* Fix issues in js test cases
2017-03-27 18:03:20 +08:00
James Chen 6217d8c5ca fixed #17591: [ios, mac, win32] Audio could not be played in the callback of AudioEngine::setFinishedCallback (#17593)
* Moves the implementation of AudioEngine::AudioInfo to cpp file.

* fixed #17591: [ios, mac, win32] Audio could not be played in the callback of AudioEngine::setFinishedCallback

* fixed #17591: Adds test case.
2017-03-27 17:28:39 +08:00
fred 790237bce1 Update CCNode.cpp (#16947)
The _transform property of CCNode would not be restored on setAdditionalTransform(nullptr)
causing in my project a rotation run away ...
2017-03-23 11:51:51 +08:00
minggo cab5195ad4 find .luac first (#17572) 2017-03-23 10:43:39 +08:00
blackcruiser 1b46096b15 unify sensor timestamp units in Android / iOS / Tizen (#17532) 2017-03-23 10:04:18 +08:00
mogemimi 8a327c77fa Fix various minor typos (#17570) 2017-03-23 09:30:42 +08:00
James Chen 85ded40a98 fixed #17497: Win32 performance is bad. (#17556)
* fixed #17497: Win32 performance is bad.
The 'Sleep(1)' in FPS controlling code isn't precise enough. Windows sets timer precision from 1ms to 15ms, we need to set the precision to the highest one (1ms). Although it's still not enough, we need to make some tricks in the FPS controlling code, that is, don't sleep if the interval is equal or less than 1 millisecond.

* Untabify code.
2017-03-22 15:03:00 +08:00
CocosRobot 72d47c7f39 [ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically (#17566) 2017-03-22 14:56:45 +08:00
j-jorge 168ffa639c Flag the end of ActionInstant and ActionInterval. (#17557) 2017-03-22 14:17:49 +08:00
James Chen ab9104f3ce Updates templates for switching AudioEngine in AppDelegate.cpp. (#17555) 2017-03-22 11:19:25 +08:00
minggo b0179340be Gles3 support (#17537)
* ios supports gles 3.0

* android supports gles 3
2017-03-21 09:41:55 +08:00
CocosRobot 95921836ca [ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically (#17549) 2017-03-20 09:39:41 +08:00
rh101 f8eccb9608 Added VS2017 support in project files (#17548)
* [libcocos2d.vcxproj, libcocos2d.vcxproj.filters] Removed entries for non-existent files that were causing "Build is out of date" issues in Visual Studio
[project.pbxproj] Removed entries for non-existent file

* [libcocos2d.vcxproj.filters] Renamed CCStencilStateManager.h extension to .hpp.

* [libcocos2d.vcxproj, libcocos2d.vcxproj.filters] Removed entry for file CCDownloaderImpl.h which does not exist.

* Changed extension of CCStencilStateManager.hpp to .h

* Added support for VS2017 in project files.
2017-03-20 09:36:07 +08:00
minggo b5a1360a17 revert #17437 (#17545)
* revert #17437

* fix resource path
2017-03-20 09:28:12 +08:00
Tyler Dauch 39f264d5c3 Update Cocos2dxDownloader.java (#17528) 2017-03-17 10:47:39 +08:00
mogemimi 8be22ce55c Fix typos in comments and strings (#17534) 2017-03-17 10:44:38 +08:00
minggo 8f66d5465a [ci skip]Update version (#17525)
* update version

* update readme

* update english release note

* add some information
2017-03-16 14:14:43 +08:00
pandamicro 0e0987d337 Support notify progression in XMLHTTPRequest (#17509)
* Support notify progression in XMLHTTPRequest

* Fix indent

* Fix issues

* fix issue
2017-03-16 14:09:51 +08:00
rh101 27935acd64 VS and XCode project files have non-existent file references (#17512)
* [libcocos2d.vcxproj, libcocos2d.vcxproj.filters] Removed entries for non-existent files that were causing "Build is out of date" issues in Visual Studio
[project.pbxproj] Removed entries for non-existent file

* [libcocos2d.vcxproj.filters] Renamed CCStencilStateManager.h extension to .hpp.

* [libcocos2d.vcxproj, libcocos2d.vcxproj.filters] Removed entry for file CCDownloaderImpl.h which does not exist.

* Changed extension of CCStencilStateManager.hpp to .h
2017-03-16 13:54:50 +08:00
pandamicro 68fc0dbfa9 Add utils::getMD5Hash (#17520)
* Add FileUtils::getMD5Hash

* Improve name
2017-03-16 13:47:45 +08:00
blackcruiser e8c752126d fix an Accelerometer second to microsecond convertion error in Android platform (#17519)
1 second = 1000000 microsecond
2017-03-16 12:00:58 +08:00
James Chen 1f8eb3b7f5 fixed #17494: Adds setTimeout to wrap NSTimer since ‘timerWithTimeInterval:repeats:block’ is only available from iOS 10, macOS 10.12. (#17518)
* fixed #17494: Adds setTimeout to wrap NSTimer since ‘timerWithTimeInterval:repeats:block’ is only available from iOS 10, macOS 10.12.

* Sets _timeoutCallback to nullptr if onTimeoutCallback is called.
2017-03-16 11:04:36 +08:00
pyrosphere e3bff6452d Support for the tvOS micro gamepad as a CCController (#17517)
* Fixes cocos2d build for tvOS.

* Support for the tvOS micro gamepad as a CCController.
2017-03-16 10:33:36 +08:00
pandamicro 75383bdcde Jsb improvements (#17513)
* Cleanup ScriptingCore code

* Add jsb.ENABLE_GC_FOR_NATIVE_OBJECTS to indicate the memory model

* Use incremental GC

* Improve ScriptingCore::executeFunctionWithOwner performance

* Support ScriptingCore::executeGlobalFunction

* Reuse js objects for get_or_create_weak_jsobject reduce memory usage

* Fix sequence / spawn js object lost issue

* Improve wrappers with cppOwner system
2017-03-16 09:42:16 +08:00
James Chen 8c542d711d issue #17503: Avoid crash if initializing audio fails. (#17505)
* issue #17503: Avoid crash if initializing audio fails.

* Corrects logic of checking the return value of decodeMP3.
2017-03-15 16:46:19 +08:00
CocosRobot 87b4d7d54d [ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically (#17507) 2017-03-15 16:23:50 +08:00
pandamicro 0eec73ba43 Bindings fix and assets manger ex fix (#17115)
* Fix custom event being discard during event emission

* Fix tilemap black line issue

* Fix auto bindings config

* Adapt websocket to new memory model

* Improve cocos2d_specifics code stability

* Fix issue with get_or_create_js_object function

* Improve memory usage in function wrapper invocation

* Use JS Function bind to avoid memory tracking issues

* Support size parameter to collect total byte size before update process

* Fix download resuming issue on Android

* Remove temporary assets when temporary manifest is invalid or out of date

* Use version compare handle to compare manifests versions

* Support max concurrent tasks setting & download verify callback

* Add Manifest::Asset conversion

* Avoid crash caused by wrappers

* Sync implementation of tested and published AssetsManagerEx from Cocos Creator

* Fix linux compilation issues
2017-03-15 16:09:02 +08:00
James Chen 16e1bf47ac fixed #17494: [iOS] CrashIfClientProvidedBogusAudioBufferList (#17500) 2017-03-15 13:50:56 +08:00
pyrosphere 18d2cdbc75 Fixes cocos2d build for tvOS. (#17498) 2017-03-15 10:01:38 +08:00
minggo 7d3b9de866 update gradle version and build tool version (#17496) 2017-03-14 18:13:47 +08:00
James Chen b842202541 fixed #17395: OpenAL A003 error if doing AL invocation before alcMakeContextCurrent(s_ALContext); (#17492)
Pause director if Audio Session is still in interrupted state, resume director in interrupted ended.
2017-03-14 13:56:12 +08:00
Bin Zhang 769f7830f0 Improve the AndroidStudio configurations of tests & templates (#17495)
* Improve the AndroidStudio configuration of test projects to fit the new implementation of cocos compile.

* Improve the AndroidStudio configuration of templates to fit the new implementation of cocos compile.
2017-03-14 13:41:28 +08:00
James Chen 90403fc632 Fixes memory issues catched by Xcode Analyze Tool. (#17489) 2017-03-14 11:09:31 +08:00
James Chen 1dccd7b85b fixed #17395: AudioEngine alSourcePlay error code:a003 in lua-tests. (#17485) 2017-03-13 11:37:23 +08:00
James Chen 47694b0b28 fixed #17474: [Android] It may trigger ConcurrentModificationException in Cocos2dxSound.java. (#17479) 2017-03-09 18:11:28 +08:00
James Chen 5c0c6d2e1e More powerful Uri class, adds unit test for Uri class. Refactors some code in SocketIO & Websocket. (#17472)
* More powerful Uri class, adds unit test for Uri class. Refactores some code in SocketIO & Websocket.

* Adds missing header file stdint.h

* Exports Uri class

* Uri belongs to network group

* Updates the location of group comment

* Removes an unused include.

* Updates Uri comment.
2017-03-09 10:14:39 +08:00
mogemimi 98d2236914 Prevent signed/unsigned mismatch (#17468) 2017-03-08 14:32:23 +08:00
minggo 9335986c73 fix the issue that onEnterTransitionDidFinish() is not invoked at first scene change (#17466)
refer to https://github.com/cocos2d/cocos2d-x/issues/17442 for detail information
2017-03-08 14:26:58 +08:00
Owen.Cai 7aa74fa994 csbload error bug (#17465)
* csbload error bug

* csbload error bug

* csbload error bug
2017-03-08 10:14:38 +08:00
Alanmars 0cde5c6fc1 *Fix: GLThread and other threads access sDownloaderMap in a thread-unsafe way, which will result in crash in some occasion on Android. (#16326) 2017-03-07 17:00:52 +08:00
James Chen 1c0e56efef fixed #17416: Wrong default port of SocketIO connection. (#17459)
Supports SSL connection for SocketIO.
Avoid memory corruption while disconnecting SocketIO, _ws->close() has to be at the end of ‘SIOClientImpl::disconnect()’.
2017-03-07 15:49:38 +08:00
James Chen fc0ad058a5 fixed #17427: lws_parse_url has wrong behavior, it parses ’ws://domain.com/abc/d’ to ‘path: abc/d’ rather than ‘path: /adb/d’. (#17455)
* fixed #17427: lws_parse_url have wrong behavior, it parses ’ws://domain.com/abc/d’ to ‘path: abc/d’ rather than ‘path: /adb/d’.
Adds Uri class and parses Url to scheme, host, port, path in engine side.

* Moves Uri implementation to Uri.cpp, adds getter functions.

* Updates win32 project.

* Updates win10 project.

* Adds include header for atoi error on android.

* Updates tizen project configuration.
2017-03-07 13:35:59 +08:00
CocosRobot fb730b5395 [ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically (#17456) 2017-03-07 11:29:17 +08:00
j-jorge 67d16bee98 Prevent unexpected calls to unscheduled selector in long updates. (#17431)
If the delta time dt passed to cocos2d::Timer::update(float) is longer than the
interval of the timer, then the timer will be triggered several times even if
the selector is unscheduled during the call.

This commit adds a flag in cocos2d::Timer stop the update loop if the selector
has been unscheduled.
2017-03-07 11:16:30 +08:00
CocosRobot e08cbc1c39 [ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically (#17453) 2017-03-07 09:45:23 +08:00
Bin Zhang b7f8dacd7c Solve the error logic in spine runtime. (#17448)
Sync the runtime to the state of this commit (both js & cpp runtime):
3ced1e1daf
2017-03-07 09:36:42 +08:00
j-jorge 6cd7314497 cocos2d::Sequence::isDone() checks that the last action is actually done. (#17437) 2017-03-07 09:36:09 +08:00
James Chen ce2f4e892f Websocket bug fix after PR#17440 was merged. (#17450)
* Websocket bug fix after PR#17440 was merged.

* typo fix
2017-03-07 09:35:14 +08:00
CocosRobot b32c84f8c2 [ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically (#17449) 2017-03-06 18:28:58 +08:00
James Chen bdcacd0031 Some fixes for search paths: (#17435)
* Some fixes for search paths:
1. Adds ‘_originalSearchPaths’ variable, ’getSearchPaths’ returns the original values set by ‘setSearchPaths’  or ‘addSearchPath’.
2. Adds a getter function ‘getDefaultResourceRootPath’.
3. ‘setDefaultResourceRootPath’ should also update search paths and remove file path cache internally.
4. ‘setSearchPaths’  supports to pass self (_originalSearchPath), could be used in ‘setDefaultResourceRootPath’ to update the final ’_searchPathArray’ for searching full path.
5. ‘addSearchPath’ fix, the default resource root path should be the last element in ‘_searchPathArray’.

* Checks whether the parameter ‘searchResolutionOrder’ passed in is the same as ‘_searchResolutionsOrderArray’.

* Don’t break the compatibility, add a new method called ‘FileUtils::getOriginalSearchPaths’.
2017-03-06 16:59:43 +08:00
Tiffanyx 69d92bbe49 fixed #17433: [webSocket ] webSocket random crash in win32 (#17440) 2017-03-06 14:18:58 +08:00
Dale Stammen 13a438dbfd win10 uwp fix for new Mouse events (#17434) 2017-03-03 12:40:32 +08:00
CocosRobot 7dbfc85a8f [ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically (#17430) 2017-03-02 16:08:53 +08:00
radman0x c442275c8e 17357: Better encapsulate the definition of mouse buttons (#17358)
* 17357: Better encapsulate the definition of mouse buttons

Move definition of buttons from a list of #define's to an enum class and
make appropriate updates for successful compilation.

* 17357: Better encapsulate the definition of mouse buttons

Updates from code review:
* Removed changes to automatically generated files
* Removed std::ostream& convenience operator

* 17357: Fix mouse tests
2017-03-02 13:39:33 +08:00
James Chen eca39ba7aa fixed #17413: [Android] AudioEngine::play2d may still wait 2 seconds if preload is too fast. (#17414) 2017-02-27 15:11:39 +08:00
James Chen c86d7b0d2f fixed #17397: Updates CMakeList.txt for win32 audio module (#17401) 2017-02-23 16:13:26 +08:00
James Chen 619e012d9b [WebSocket] Adds support for getting url and server selected protocol (#17381)
* [WebSocket] Adds support for getting url and server selected protocol

* Adds const keyword for getter methods, and make LOGE also works in release mode.
2017-02-20 09:44:20 +08:00
CocosRobot#Set a3daaf3626 [ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically 2017-02-17 07:53:15 +00:00
Jeff Wang 26fe3def2f Refine editbox for issue 17346 --merge some member variables into EditBoxCommon (#17361)
* add some getters for EditBox and EditBoxImpl

* remove duplicate member variables from EditBox

* fix todo

* change to pure virtual methods for class EditBoxImpl
2017-02-17 15:45:19 +08:00
James Chen c553d418e4 [websocket] Pass nullptr for protocol parameter if there aren't any protocols are assigned. (#17379) 2017-02-17 11:18:13 +08:00
CocosRobot 126c983ca9 [ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically (#17375) 2017-02-17 10:17:46 +08:00
James Chen 41f135ec27 [Android] Software decoding while preloading audio files to avoid some crashes on some specific android devices, and it’s 5x - 15x faster than the old implementation. (#17233)
* [Android] Software decoding while preloading audio files to avoid some crashes on some specific android devices, and it’s 2x faster than the old implementation.

* Updates external/config.json to 126

* Updates library path, adds ‘android-specific’ prefix.

* Updates config.json to 127
2017-02-16 16:23:10 +08:00
minggo 8cb299eb2b fix lua binding string conversion (#17367)
* fix lua binding string conversion
In previous, the characters after \0 will be truncated.

* revert some unneeded modification
2017-02-15 09:27:10 +08:00
子龙山人 a8f7668b8c Fix glfw mac os 10.12.2 (#17351)
* remove hack code for glfw on 10.12.2

* bump external version to 125
2017-02-14 16:03:44 +08:00
CocosRobot 8fbf04ee28 Updates license year. (#17363) 2017-02-14 14:59:12 +08:00
CocosRobot d07794052f Update license to 2017 (#17362)
* Typo: CopyRight -> Copyright

* Copyright update: chukong-inc.com -> Chukong Technologies Inc.

* [js files] Copyright update: 2014 -> 2014-2017

* [cpp files] Copyright update: 2014 -> 2014-2017

* Copyright update: 2015 -> 2015-2017

* [js files] Copyright update: 2014 -> 2014-2017

* Copyright update: 2016 -> 2016-2017

* Copyright update: 2013 -> 2013-2017

* Copyright update: 201?-201? -> 201?-2017

* License year fixes.

* Liscene year fix in CCRay.cpp

* Updates license years in CCGLProgramState.h & CCGLProgramStateCache.h
2017-02-14 14:36:57 +08:00
minggo f54c41c074 Update flatbuffers to 1.5 (#17349)
* update flatbuffers to 1.5

* update windows projects setting

* fix compiling error on linux

* fix compiling error

* fix compiling error

* fix compiling error
2017-02-14 14:32:09 +08:00
子龙山人 56f0a790ba fix PageView related issues (#17354) 2017-02-14 10:24:55 +08:00
子龙山人 8bf29a493b fix label ttf line wrap (#17344)
* fix label ttf line wrap

* improve code style
2017-02-13 18:00:33 +08:00
James Chen 4237639dd6 Some fixes for websocket (#17342)
* libwebsockets & curl are dynamic libraries now, modify project configuration for win32.
Updates WebSocketTest.cpp to test wss connection.

* Corrects some logic in WebSocket.cpp. Adds wss test case. WebSocketTest suggests developers to use `WebSocket::closeAsync` method which will not block current thread.

* mutex unlock fix in WebSocket.cpp. Reverts TEST URL.

* Allows self-assign cert.

* Each ws connection will create a virutal host now. Supports self-signed cert and update test case to suggest developer use ‘closeAsync’.

* Updates deps to 123.
2017-02-13 15:15:23 +08:00
newnon f408cbfcca fix rendering font with not null line gap (#17175)
* fix rendering font with not null line gap

* test for line gap fix
2017-02-13 13:58:32 +08:00
minggo 1c763c2191 fix wrong result when time is 1 (#17340)
it will return 0.99995 when time is 1
2017-02-13 13:55:32 +08:00
CocosRobot ced1009291 [ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically (#17339) 2017-02-10 14:14:16 +08:00
James Chen 27e2012cf1 fixed #16871: Material second shader texture will be lost when removeUnusedTextures is invoked. (#16884)
* fixed #16871: Material second shader texture will be lost when removeUnusedTextures is invoked.

* issue #16871: Adds test case for issue #16871.

* issue #16871: Checks whether current texture is the same as which is passed in. And more comments for release stuffs.

* Removes unused nullptr check of _value.tex.texture

CC_SAFE_RETAIN will check it.
And some indention fixes.
2017-02-10 14:01:26 +08:00
minggo 34d4c65c86 fix crash on Android (#17338)
The crash is caused because of local reference table overflow
2017-02-10 13:51:29 +08:00
minggo c61cd9afe7 fix spine binding codes and test case (#17335) 2017-02-10 11:58:23 +08:00
mogemimi 19ffd3a5ff Remove `const T&` qualifiers from fundamental type arguments (#17334) 2017-02-10 10:34:47 +08:00
CocosRobot 85dbcc1638 [ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically (#17332) 2017-02-09 17:07:42 +08:00
minggo 8825a091bb update spine to 3.5.35 (#17331)
* update spine to 3.5.35

* fix jsb compiling error

* fix lua compiling error
2017-02-09 16:57:42 +08:00
Wilson E. Alvarez b672b94edc Removed unnecessary assignments (#17328) 2017-02-09 10:57:01 +08:00
mogemimi 24af4b3ddb Fix variable shadowing warning (#17329) 2017-02-09 10:55:24 +08:00
James Chen 55a97f6107 Wrong assert logic fix in HttpClient. (#17330)
* Wrong assert logic fix in HttpClient.

* Updates assert prompt
2017-02-09 09:56:24 +08:00
minggo 828fabdeb3 add uniform for mobile too (#17324) 2017-02-08 16:39:06 +08:00
Wilson E. Alvarez 5d748f941b Mitigate cppcheck message (#17323) 2017-02-08 15:32:01 +08:00
minggo 92704517bc remove unneeded assignment (#17320) 2017-02-08 13:58:11 +08:00
minggo e80f4bb9f6 use stable sort to keep order (#17321) 2017-02-08 13:57:41 +08:00
CocosRobot 3d51645d3d [ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically (#17319) 2017-02-08 10:42:18 +08:00
Dmitry 4bf1750cbd issue #17305 fix: cocos/audio/win32/AudioCache.h fixed include <AL/al.h> (#17306) 2017-02-08 10:22:05 +08:00
j-jorge 373e4a904a Assert that a node cannot be inserted as a child of itself. (#17296) 2017-02-08 10:02:10 +08:00
Jeff Wang ae60397472 add 'makeRef' for easier making a RefPtr (#17302) 2017-02-08 10:00:08 +08:00
Dale Stammen 9381152ef1 removed support for Windows 8.1 store and phone (#17311) 2017-02-08 09:46:47 +08:00
mogemimi 92dfdad12b Fix typo in ModelData: `matrial` to `material` (#17308) 2017-02-08 09:45:05 +08:00
Dale Stammen c0575311b7 V3 win10 websockets (#17310)
* add openssl to libwebsockets

* updated win10 version to v3.15

* clear any glErrors created by any not found uniforms
2017-02-08 09:44:06 +08:00
mogemimi 75d2e76095 Fix minor typos in comments and docs (#17294) 2017-02-07 09:41:52 +08:00
mogemimi e2ad8946cb Replace unsigned int with size_t to avoid implicit conversion (#17297) 2017-02-07 09:41:19 +08:00
newnon 88c3fcde67 Full unicode support (#17179)
* Full unicode support

* test for emoji
2017-02-06 16:41:52 +08:00
CocosRobot c1b4358d13 [ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically (#17290) 2017-02-06 16:31:09 +08:00
子龙山人 193518ed8b add opacity support to DrawNode (#17248) 2017-02-06 15:34:14 +08:00
newnon e33cc3b257 fix when new is zero (#17283) 2017-02-06 15:17:18 +08:00
mogemimi 9820748184 Fix variable shadowing warnings (#17282) 2017-02-06 15:15:16 +08:00
mogemimi c06612251c Use range-based for loops to avoid shadowing (#17281) 2017-02-06 15:14:18 +08:00
mogemimi df24911a23 Fix minor typos in naming (#17280) 2017-02-06 15:13:20 +08:00
minggo d37ac4007b fix memory leak (#17284) 2017-02-06 15:11:42 +08:00
minggo c4712936f3 fix the bug that ect1 texture lost on android (#17278)
the commit do the following things:
- reload ect1 related shaders when comes from background
- reload alpha texture when comes from background
2017-02-04 18:00:21 +08:00
mogemimi aa9ce3ccb3 Fix implicit conversion warnings (#17254) 2017-02-04 10:38:22 +08:00
mogemimi ccf6b99b6d Avoid variable shadowing (#17264) 2017-02-04 10:37:37 +08:00
mogemimi 1d47ae7e90 Fix typo in function name (#17253) 2017-02-04 10:35:56 +08:00
CocosRobot 4e6be0e9da [ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically (#17276) 2017-02-04 10:35:08 +08:00
mogemimi 777a97e141 Fix typo in AudioState (#17258) 2017-02-04 10:34:34 +08:00
Wilson E. Alvarez ca28af0113 Fixed variable order in initializer lists (#17274) 2017-02-04 10:33:58 +08:00
j-jorge c616d6d9ff Compilation fix (#17209)
* Fix various compilation issues.

Mostly errors on field initialization order but also missing files
in CMakeLists and missing include directives.

* Fix compilations issues with GCC 6.2

* Fix gitignore libs/ entry to not ignore the Android external libraries.
2017-02-04 09:46:32 +08:00
j-jorge 6bbf01537d Allow to unbind asynchronous texture loading callback with a custom key. (#17206)
* Allow to unbind asynchronous texture loading callback with a custom key.

In order to unbind the callback passed to
`cocos2d::TextureCache::addImageAsync(path, callback)`, one has to
call `cocos2d::TextureCache::unbindImageAsync(path)`. In the cases
where the loading of the same texture is requested from several sources
simultaneously, then none of the source can unbind its own callback
unambiguously.

This commit adds an overload of the `addImageAsync` function taking an extra
argument identifying the callback, thus allowing to unbind it unambiguously
in cases where the loading of path is requested by several sources
simultaneously.

* Add a test case for TextureCache::addImageAsync with a custom key.
2017-02-04 09:38:54 +08:00
CocosRobot#Set bdcf461dc3 [ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically 2017-01-23 01:32:57 +00:00
mogemimi 061122514c Fix typo in Sprite (strech -> stretch) (#17241) 2017-01-23 09:25:56 +08:00
mogemimi 323838242f Fix implicit conversion warning (#17242) 2017-01-23 09:24:36 +08:00
minggo 690db56f44 Merge v3.14.1 (#17231)
* update cocos console to fix compiling error with Android Studio projects (#17129) (#17145)

* fix crash if physics3d camera is not set (#17139) (#17144)

* fix linking error with vs2015 (#17146)

* fix issue #17116 & #17119 for v3.14.1

* tests cases

* better documentation

* doc: updates sprite doc

* Fix scale9sprite polygon info (#17161)

* add guard code to Scale9Sprite

* add new test code

* Glfw linux issue (#17166)

* purge glfw3 before installing glfw3.2

* purge glfw3 before installing glfw3.2

* Update web engine ref (#17169)

* update version and release note (#17170)

* issue ##17119 improved v3.14.1 (#17189)

* update version (#17230)
2017-01-20 09:59:30 +08:00
mogemimi 2b1d5768f0 Fix typo in RenderTexture: "Bufffer" -> "Buffer" (#17235) 2017-01-20 09:59:02 +08:00
mogemimi 87c29759f8 Fix typos in local variables (#17236) 2017-01-20 09:58:29 +08:00
CocosRobot 1bc016b354 [ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically (#17232) 2017-01-19 14:15:08 +08:00
James Chen b1f2a056b2 Refactor WebSocket to support SSL (wss) (#17172)
* Refactors WebSocket:
1. Supports wss protocol
2. Uses only one libwebsockets context, multiple wsi instances to avoid multi-thread issues
3. Uses lws_create_vhost to create multiple virtual host, different protocols works

* Adds openssl include path to xcode project configuration.

* mac doesn’t depend on curl

* ca file path should be full path.

* More bug fixes like which in https://github.com/cocos2d/cocos2d-x/pull/6986

* Remove curl dependence for mac

* Updates Andorid.mk

* [win32] Adds wss support for win32, and updates openssl, libcurl, libwebsockets libraries.

* Updates external/config.json to 118.

* [win32] Updates cocos/2d/libcocos2d.vcxproj to fix compilation error while building in release mode.

* Linux support websocket ssl connection.

* Updates external/config.json

* Updates install-deps-linux.sh

* Adds dependence of binutils, print ld version

* Updates travis scripts.

* Updates travis scripts.

* Updates travis script, don’t output log while extracting.

* update before-install.sh

* updates before-install.sh

* updates before-install.sh

* don’t output log for installing software.

* Updates config.json to 120.
2017-01-19 13:55:14 +08:00
Bin Zhang f6f7b2157a Solve the compile error when building platform tizen. (#17216) 2017-01-19 09:43:23 +08:00
mogemimi dad9929aad Fix warnings about implicit conversion loses integer precision (#17220) 2017-01-19 09:41:57 +08:00
mogemimi 86ef735e60 Fix misspelling of setFirstFocusedWidget function (#17219) 2017-01-19 09:41:12 +08:00
mogemimi fd10661050 Fix typo in variable name (#17218) 2017-01-19 09:40:35 +08:00
minggo c4d0d56f3a check pointer before using (#17215) 2017-01-19 09:32:58 +08:00
minggo 00b9dcd62e Lua custom handler (#17211)
* avoid crash if custom handler vector is empty

* simplify codes
2017-01-18 17:05:08 +08:00
Nakhyun Choi 42c77247cc Fixed Scheduler bug occured when unschedule target during update. (#17203) 2017-01-18 16:32:36 +08:00
mogemimi 8b9c89f6a9 Fix typos in comments and strings (#17201) 2017-01-18 15:41:18 +08:00
mogemimi efc3e5979b Fix typo in function name (#17202) 2017-01-18 15:40:46 +08:00
Aleksey Zolotov 0de81de721 fix #14936 (#17190)
* fix #14936

* #14936 testcases
2017-01-17 09:48:30 +08:00
minggo d9637f30b0 remove scheduler in time (#17198)
* remove scheduler in time

* fix compiling error

* add test case

* fix logic error
2017-01-16 17:37:59 +08:00
mogemimi 888b985e0e Fix variable name typo (#17195) 2017-01-16 11:21:34 +08:00
CocosRobot 21d57bfd39 [ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically (#17185) 2017-01-16 11:20:39 +08:00
mogemimi bebd11f853 Correct spelling of "intersect" (#17194) 2017-01-16 11:20:07 +08:00
Ricardo Quesada 88a1cd73fa improves fix for issue #17119 (v3) (#17188) 2017-01-16 09:30:08 +08:00
newnon 59403ad40d Propagate onTouchCancelled (#17174) 2017-01-13 18:09:01 +08:00
newnon 61c856679e getLetter function for Text (#17178) 2017-01-13 18:06:01 +08:00
newnon 7b430ce7c2 fix child removing from ListView (#17177) 2017-01-13 14:38:28 +08:00
newnon 15e56c06a4 outline to float (#17176) 2017-01-13 14:31:12 +08:00
CocosRobot f2114f36f8 [ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically (#17183) 2017-01-13 14:04:11 +08:00
minggo 1b6c8cc5c1 bind FileUtils:getDataFromFile() to lua (#17182) 2017-01-13 13:39:58 +08:00
David DeSimone c258b03f13 Adding async version of common CCFileUtil functions. This will allow engine users to interact with the file system, without blocking the main thread and disrupting rendering. (#17140) 2017-01-13 10:05:46 +08:00
danut007ro 84a3f73ecb Particle set display frame (#17163)
* Fix CCParticleSystemQuad::setDisplayFrame()

* Added tests
2017-01-12 11:48:30 +08:00
mogemimi 91beb8db86 Fix incorrect function name for calculateBillboardTransform (#17164) 2017-01-12 10:14:04 +08:00
mogemimi 71a82f0f0d Correct spelling of function name `getAncestorWidget` (#17158) 2017-01-11 05:36:13 -08:00
mogemimi 6e8ced6c8c Fix minor typos in function parameters (#17157) 2017-01-11 05:34:57 -08:00
Ricardo Quesada 21795b71b4 sprite: doc fixes (#17154) 2017-01-11 05:33:41 -08:00
minggo 3bcf8fc48a use std::stable_sort to keep order (#17156) 2017-01-11 15:47:36 +08:00
minggo afb55253f1 fix dutch language value and add missing languages (#17160) 2017-01-11 14:04:45 +08:00
CocosRobot 90e0ab0c2e [ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically (#17152) 2017-01-11 10:49:48 +08:00
mogemimi 1d2b73166e Fix typos in docs (#17132) 2017-01-11 09:31:45 +08:00
CocosRobot 91ae4b1c03 [ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically (#17143) 2017-01-10 16:59:15 +08:00
Dale Stammen e9a947b02a updated location of openssl dlls (#17133) 2017-01-10 16:50:22 +08:00
minggo 733799f4a1 fix crash if physics3d camera is not set (#17139) 2017-01-10 15:37:29 +08:00
Ricardo Quesada e100d02dff Sprite fixes: color + polygon (#17135)
* fixes issue #17119

and sanitizes the code a little bit

* more fixes

* fixes issue #17116

* restore xcode "none" sign profile

* code is cleaner

add more documentation in CCSprite.h

* missing assets

* anchor point works with batchnodes again
2017-01-10 15:28:47 +08:00
minggo 9d3d869c9d make webview can clean cached data (#17130)
* make webview can clean cached data

* add implementatoin
2017-01-10 11:30:11 +08:00
minggo 4574896dbb add some comments for key limitation (#17122) 2017-01-09 09:27:38 +08:00
DavidDeSimone 54c32fc669 Fix for issue #17114. Improves the ability to add placeholder color and font for single line text fields on iOS 2017-01-08 16:02:17 -08:00
Wilson E. Alvarez af503f4a65 Allow velocity to be applied to Chipmunk's kinematic bodies (#17094)
* Allow velocity to be applied to Chipmunk's kinematic bodies

* Added check for CP_BODY_TYPE_STATIC

Thanks to @minggo for the code review
2017-01-06 09:35:34 +08:00
kosmosR2 44fb4ba3bc To use some HTTP client library those use `send(null)` like `superagent`,`XMLHTTPRequest` should send a empty request instead of abort. (#16989) 2017-01-05 16:12:03 +08:00
CocosRobot#Set 69217f0e8b [ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically 2017-01-05 01:40:38 +00:00
Ricardo Quesada ff8e622b7a Slice9 Sprite with triangles, not quads (#17105)
* sprites: use triangles instead of quads

uses less memory

* oops, color should be white by default

* works with flipped sprites

* none for xcode
2017-01-05 09:27:13 +08:00
minggo 93d193dfcc Openssl adjust (#17106)
* change openssl search path

* copy libopenssl from openssl folder

* update external version
2017-01-05 09:22:38 +08:00
effolkronium f5a90765fc fix type conversion warnings (#17061)
* Fix conversion warning

from unsigned int to float

* Fix type conversion warning

* Fix type conversion warning

* change the return type of getOutlineSize to float

* fix typo
2017-01-04 12:01:07 +08:00
子龙山人 8e21738634 fix text input auto correction type (#17085) 2017-01-04 12:00:18 +08:00
minggo a0acaf5972 Merge pull request #17101 from minggo/merge-v314
Merge v314
2017-01-04 11:48:31 +08:00
CocosRobot 61170c69ee [ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically (#17103) 2017-01-04 11:47:58 +08:00
minggo 79126ea72a make ListView::setGlobalZOrder() work (#17098)
* make ListView::setGlobalZOrder() work

* revert modification of UIButton

* reset background color

* change global z order to test
2017-01-04 11:06:44 +08:00
minggo f63fad3e27 Merge branch 'v3.14' into merge-v314 2017-01-04 09:49:22 +08:00
Ricardo Quesada b3279bafa7 implements issue #17069 (#17090)
implemnts suggestion done by @three0s
2017-01-03 09:49:22 +08:00
Huabing.Xu 0564d43478 fix bug, do not add null bones (#16948) 2016-12-29 15:44:57 +08:00
James Chen e4e872a065 fixed #16849: Preload many audios may cause crash on devices those use Samsung Exynos CPU. (#17049)
* fixed #16849: Preload many audios may cause crash on devices those use Samsung Exynos CPU.

* Adds comment for __SLPlayerMutex variable.

* Fixes wrong comments in AudioDecoder.cpp
2016-12-29 15:41:47 +08:00
niu2x ce4685c64f vec4 operator < seems error (#17072)
* bug fix

* Vec4 operator <
2016-12-29 15:26:25 +08:00
子龙山人 4c5459660b Merge pull request #17038 from MrCapone/ui_touch_fixes
CheckBox touch fix
2016-12-29 14:20:15 +08:00
子龙山人 163e730849 Fix label disableeffect (#17075)
* add toggle rendering type test

* fix label additional kerning

* only substract additionalKerning when bold is enabled
2016-12-29 13:59:24 +08:00
James Chen 208d39151e Reverts create thread pool code, android doesn't need to create a thread pool in AudioEngine.cpp (#17081) 2016-12-29 10:22:45 +08:00
James Chen be43c4210f Fixes crash that playing long audio and then uncacheAll (#17079)
* Fixes crash of playing long audio then uncacheAll.

* update

* Updates comments in MciPlayer.h

* tab -> 4spaces

* include path fix.
2016-12-29 10:05:13 +08:00
pandamicro 41abefd082 Merge branch 'v3.14' of github.com:cocos2d/cocos2d-x into v3.14
# Conflicts:
#	CHANGELOG
#	cocos/scripting/js-bindings/manual/cocos2d_specifics.cpp
#	cocos/scripting/js-bindings/manual/spine/jsb_cocos2dx_spine_manual.cpp
2016-12-26 18:53:42 +08:00
pandamicro 88be66218b Small fix to CallbackWrapper 2016-12-26 00:08:59 +08:00
pandamicro 7c2ea03b00 Improve TrackEntry issue solution with internal unordered_map 2016-12-26 00:08:18 +08:00
Ricardo Quesada c4a20a032f creator c++ support bug fixes (#17051)
I need these 2 changes applied to v3.14 in order to
support C++ correctly in Creator.

Thanks!
2016-12-21 16:17:32 +08:00
Dmitry c071839e85 #17037 cocos/ui/UICheckBox.cpp fix: touch event logic 2016-12-21 13:21:40 +07:00
pandamicro a715e3169f Sync issue fixes from creator (#17041)
* Add EventDispatcher#hasEventListener (sync from creator)

* Fix function wrapper using js object during its gc

* Support more system languages

* Direct log/error for better understanding problems & add sys.now

* Synchronize Editbox APIs

* Synchronize Scheduler.PRIORITY_NON_SYSTEM const

* Upgrade web engine

* Upgrade test cases

* Manually bind EventDispatcher::addCustomEventListener to avoid memory issue

* Manual bind EventListeners’ create to avoid memory issue

* Fix compilation issue when COCOS_DEBUG = 2

* Unify function name of Texture2D::releaseTexture

* Fix compilation issues and update web & bindings-generator

* Fix lua compilation issue

* Use %ld instead of %zd

* Separate FinalizeHook for ref objects and non ref objects

* Fix spine TrackEntry recursive conversion issue by using getter

* Fix crash during Wrappers deallocation (possible to have leak)

* Increase default JS heap to 32 mb

* Update engine version

* Add change log of web engine

* Improve cc.formatStr

* Fix chipmunk crash issues when using setDefaultCollisionHandler

* Add change log for JSB and update web engine ref
2016-12-21 13:39:34 +08:00
pandamicro 100c027054 Fix chipmunk crash issues when using setDefaultCollisionHandler 2016-12-21 11:07:18 +08:00
pandamicro a3d6705b02 Improve cc.formatStr 2016-12-21 11:05:49 +08:00
pandamicro 24be2acde0 Merge branch 'v3.14' of github.com:cocos2d/cocos2d-x into v3.14
# Conflicts:
#	cocos/scripting/js-bindings/manual/cocos2d_specifics.cpp
#	cocos/scripting/js-bindings/manual/js_manual_conversions.cpp
#	cocos/scripting/js-bindings/manual/jsb_event_dispatcher_manual.cpp
#	tests/js-tests/src/SpineTest/SpineTest.js
2016-12-19 12:39:55 +08:00
pandamicro 149bdf125e Update engine version 2016-12-19 12:15:41 +08:00
pandamicro 51a09048bd Increase default JS heap to 32 mb 2016-12-19 11:51:43 +08:00
pandamicro a508b7d751 Fix crash during Wrappers deallocation (possible to have leak) 2016-12-19 11:51:23 +08:00
pandamicro 46dbb32fd9 Fix spine TrackEntry recursive conversion issue by using getter 2016-12-19 11:50:52 +08:00
pandamicro 2b6e84e9a2 Separate FinalizeHook for ref objects and non ref objects 2016-12-19 11:50:32 +08:00
Ricardo Quesada 57dffa3a12 fix issue #17022 (#17025)
for branch 3.14
don't re-flip the letters
2016-12-16 17:22:13 +08:00
James Chen 77cf6de2e5 [label] Fixes shadow is drawn incorrect while also enabling outline. (#17024) 2016-12-16 14:56:36 +08:00
CocosRobot 77d0e8292a [ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically (#17016) 2016-12-15 10:03:04 +08:00
Ruud Arentsen a66215916e Added support for larger tilemaps in CCFastTMXTiledMap (#17006)
* Added option to use 32 bit indices for large maps

* Added option to use 32 bit indices for large maps
2016-12-15 10:01:37 +08:00
James Chen effb6f077a [mac, ios] 'ExtAudioFileRead' may return 0 frame while it doesn’t reach the end of very short audio file. (#17011)
* [mac, ios] Adds AudioDecoder::readFixedFrames. And uses readFixedFrames to simply code.

* [mac, ios] ‘ExtAudioFileRead’ may return 0 frame while it doesn’t reach the end of very short audio file.

* [mac, ios] Adds test case for small file test.

* [mac, ios] Adds small audio file.

* [mac, ios] Macro ‘BREAK_IF’ logic fix.

* [mac, ios] Returns false of AudioDecoder::open if total frames is 0.
2016-12-15 09:58:47 +08:00
minggo cdcdaffe98 don't force write depth info for transparent mesh (#17013) 2016-12-14 18:10:08 +08:00
James Chen c0291afad7 Merge branch 'v3.14' into merge-v3.14 2016-12-14 17:03:58 +08:00
minggo 966d47c251 fix crash if create and delete downloader quickly (#17010) 2016-12-14 14:44:36 +08:00
Francesco Capano 9903de8f30 Inform eventdispatcher on node reordering (fixes #16992) (#17007)
When changing the order of a node associated to the scene graph priority listener, inform eventdispatcher of the change
2016-12-14 14:08:00 +08:00
子龙山人 3302781dae fix tizen compile issue (#17002)
* fix tizen compile issue

* fix linux compile issue
2016-12-14 11:55:38 +08:00
CocosRobot edca6862b9 [ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically (#17009) 2016-12-14 09:37:46 +08:00
pandamicro 5823f5792b Synchronize creator engine bug fixes and upgrade web engine (#17003)
* Add EventDispatcher#hasEventListener (sync from creator)

* Fix function wrapper using js object during its gc

* Support more system languages

* Direct log/error for better understanding problems & add sys.now

* Synchronize Editbox APIs

* Synchronize Scheduler.PRIORITY_NON_SYSTEM const

* Upgrade web engine

* Upgrade test cases

* Manually bind EventDispatcher::addCustomEventListener to avoid memory issue

* Manual bind EventListeners’ create to avoid memory issue

* Fix compilation issue when COCOS_DEBUG = 2

* Unify function name of Texture2D::releaseTexture

* Fix compilation issues and update web & bindings-generator

* Fix lua compilation issue

* Use %ld instead of %zd
2016-12-14 09:27:47 +08:00
pandamicro a73485a1bc Use %ld instead of %zd 2016-12-13 18:12:50 +08:00
pandamicro d89bde4e8e Fix compilation issues and update web & bindings-generator 2016-12-13 15:37:46 +08:00
pandamicro bedde74df5 Fix compilation issue when COCOS_DEBUG = 2 2016-12-13 14:29:25 +08:00
pandamicro 00b57c9565 Manual bind EventListeners’ create to avoid memory issue 2016-12-13 14:29:24 +08:00
pandamicro 3d6b1367cd Manually bind EventDispatcher::addCustomEventListener to avoid memory issue 2016-12-13 14:29:24 +08:00
pandamicro 6b25a73a93 Synchronize Scheduler.PRIORITY_NON_SYSTEM const 2016-12-13 14:29:24 +08:00
pandamicro d4618e60ef Synchronize Editbox APIs 2016-12-13 14:29:24 +08:00
pandamicro ae5ccd16f2 Direct log/error for better understanding problems & add sys.now 2016-12-13 14:29:23 +08:00
pandamicro b50ea4afce Support more system languages 2016-12-13 14:29:23 +08:00
pandamicro 197dac204b Fix function wrapper using js object during its gc 2016-12-13 14:29:23 +08:00
pandamicro 7ff5e8858b Add EventDispatcher#hasEventListener (sync from creator) 2016-12-13 14:29:23 +08:00
James Chen ed72691bc9 [ios/macOS] Fixed a compilation error after enabling ‘CD_USE_STATIC_BUFFERS’. (#16997) 2016-12-13 13:37:31 +08:00
James Chen 26f1ae813f [win32] Fixes crash of getSubStringOfUTF8String. (#16991) 2016-12-13 11:58:28 +08:00
James Chen a2603d70ef [android] Catches ‘NumberFormatException’ while invoking Integer.parseInt. (#16988)
* [android] Catches ‘NumberFormatException’  while invoking Integer.parseInt.

* [android] Catches ‘NullPointerException’ while converting Integer to int in Cocos2dxActivity.hideVirtualButton.
2016-12-12 11:44:31 +08:00
minggo 64994a2471 make it support .luac file too (#16981) 2016-12-09 17:52:45 +08:00
CocosRobot 77f5204877 [ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically (#16972) 2016-12-09 14:30:01 +08:00
David DeSimone 3b7ffcf5d0 unscheduleAll() does not unschedule scheduled with performFunctionInCocosThread. (#16856)
* Fixing issue where Scheduler::unscheduleAll() would not unschedule functions scheduled with Scheduler::performFunctionInCocosThread.

* Removing clear of _functionsToPerform from unscheduleAll, based on code review feedback. Adding a function removeAllFunctionsToBePerfomedInCocosThread, which will remove all pending functions scheduled with performFunctionOnCocosThread.

* Adding test case for Scheduler::removeAllFunctionsToBePerformedInCocosThread

* Adding proper cleanup code to Scheduler test for SchedulerRemoveAllFunctionsToBePerformedInCocosThread
2016-12-08 11:58:58 +08:00
minggo b288821bdd use GLsizei to avoid overflow (#16962) 2016-12-06 23:05:56 -08:00
minggo 3db39a27ea Vibrate test (#16966)
* only show vibrate test on iOS and Android device

* vibrate no matter it is silient or not
2016-12-07 11:12:38 +08:00
子龙山人 1b0a6c2c5c Sync editbox improvement from cocos creator (#16965)
* sync the changes from creator

* fix editbox vertical alignment

* improve android editbox multiline text vertical alignment
2016-12-07 09:21:17 +08:00
CocosRobot#Set 5ef072de03 [ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically 2016-12-05 01:43:54 +00:00
minggo 84a6ab312c use correct downloader implementation on mac (#16955) 2016-12-05 09:36:35 +08:00
Ricardo Quesada 2e0881e284 Scale9Sprite / Slider / LoadingBar fixes (#16949)
* WIP

* loadingbar issues fixed

* fixes clone in slider

* slider bug fixes

* slider: sets texturesize correclty before seting capsInsets

* sprite: scale9 avoid negativa values

* yeah! works!

* cloneIn -> copyTo

* restore xcode team: none

* fixes issue #16924

* correct issue number

* yeah! fixes issue #16928 and #16930
2016-12-03 07:35:22 -08:00
James Chen b80e316150 fixed #16938: Audio could not be played entirely on iOS/macOS. And refactored some code of decoding. (#16946)
* fixed #16938: Audio could not be played entirely on iOS/macOS. And refactored some code of decoding.

* Adds license header, removes unused macros.

* issue #16938: Corrects remaining frame count calculation.

* Updates include path.

* Adds comments for AudioDecoder class.

* Adds const for getter functions in AudioDecoder.

* issue #16938: Adds test case.

* Updates license years.

* Deletes trailing white spaces.
2016-12-02 13:52:37 +08:00
Dale Stammen 8791794f39 updated for v3.14 (#16942) 2016-12-01 10:37:04 +08:00
Ricardo Quesada c5a4e87d4a fix issue #16921 (#16932)
call setupScale9() always
2016-11-29 22:58:53 -08:00
minggo 56232a136b correct physics3d debug draw camera (#16927) 2016-11-30 14:38:18 +08:00
minggo fdb94d59d2 update engine version (#16929) 2016-11-30 11:53:53 +08:00
minggo 01f1bf88b4 use correct way to create spriteframe in clone (#16918) 2016-11-30 11:36:01 +08:00
CocosRobot f72b950465 [ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically (#16926) 2016-11-30 11:33:49 +08:00
James Chen 066adfe204 Adds missing Scale9Sprite::initXXX overrided methods after refactoring Scale9 logic. Otherwise, `setupSlice9` will not be invoked. (#16916)
* Adds missing Scale9Sprite::initXXX overrided methods after refactoring Scale9 logic. Otherwise, `setupSlice9` will not be invoked.
Test case is: 1. Node: Scene3D -> Description -> Scale9Sprite display is wrong.

* Some fixes:

* Call Sprite::initWithFile(filename) in Scale9Sprite::initWithFile(filename) rather than Scale9Sprite::initWIthFile(filename, Rect::ZERO). Otherwise content size will be zero which is incorrect.
* setCapInsets in updateCapInset only when it’s in slice mode.
* setCapInsets should reset _insetLeft, _insetTop, _insetRight, _insetBottom member variables.
* Remove _previousCenterRectNormalized, just updateCapInset while switching to SLICE mode.

* Fixes JSTest -> ExtensionTest -> EditBoxTest: no background of editbox.

* Avoids an unused `setCapInsets` invocation in setupSlice9.
2016-11-30 09:26:40 +08:00
minggo 575ed756d1 should check validation of _stencil (#16913) 2016-11-29 10:46:20 +08:00
Dmitry 964b65e44e Linux Application::openURL return fixed (#16903) 2016-11-28 10:41:36 +08:00
minggo ba321e3ecc fix opengl context conflict when multiple contexts coexist (#16904) 2016-11-28 09:59:04 +08:00
James Chen 48dd8c25c7 Avoids to creating element in map in SpriteFrameCache::getSpriteFrameByName & removeSpriteFrameByName. (#16910) 2016-11-28 09:57:18 +08:00
James Chen 0c06029532 fixed #16894: RenderTexture does not support Sprite3D (#16909) 2016-11-28 09:50:54 +08:00
James Chen b397c93b01 fixed #16894: RenderTexture does not support Sprite3D (#16908) 2016-11-28 09:50:45 +08:00
minggo 7556b60103 check VAO with correct way (#16901) 2016-11-25 09:33:20 +08:00
Ricardo Quesada fce13ba607 fix: Scale9Sprite test case 18 (#16897) (#16902)
* fix: Scale9Sprite test case 18

Bug calculating rotated frames.
the width was being used instead of the height and vice-versa

* fixes test cases 8 and 9
2016-11-25 09:27:20 +08:00
Ricardo Quesada 5848c02d16 fix: Scale9Sprite test case 18 (#16897)
* fix: Scale9Sprite test case 18

Bug calculating rotated frames.
the width was being used instead of the height and vice-versa

* fixes test cases 8 and 9
2016-11-24 01:06:56 -08:00
Ricardo Quesada 81f854e82e fix: Scale9Sprite test case 18 (#16898)
Bug calculating rotated frames.
the width was being used instead of the height and vice-versa
2016-11-24 15:35:57 +08:00
CocosRobot 129838d960 [ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically (#16896) 2016-11-24 11:39:02 +08:00
James Chen 2d35fda9eb fixed wrong display of rotating a 2d sprite by setRotation3D. (#16895)
Test case is Sprite3DRotationTest.
2016-11-24 11:38:37 +08:00
Ricardo Quesada e63a2d0dc2 Scale9Sprite refactor (#16891)
* Squashed commit of the following:

commit 026eee59c9ece7fc59d71fead41104f375f72eb5
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Tue Nov 22 21:45:12 2016 -0800

    yay!

    everything works!

commit a645c99d44f0d7674e6238afae7628d8d2a030b1
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Tue Nov 22 14:55:31 2016 -0800

    more fixes in Scale9Sprite

commit 3a688f4ea70c0abe311232c65ed14a7e9acc7611
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Mon Nov 21 23:06:45 2016 -0800

    rotated sprites

commit 45e2085df3aa4b52236c817f7db7c1f6602c1e95
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Mon Nov 21 17:10:44 2016 -0800

    android patch 9: fixes

    is not 100% backward compatible since the previous version
    had some artifacts. fixed the artifacts. now it renders ok

commit 4655d894387fa40a7e63b074a36bfed20e41d5f9
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Mon Nov 21 16:31:29 2016 -0800

    sprite: correct size for "fake scale9"

commit cb98aba27cc1c82a986268d5b74afb55b6cca2f3
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Fri Nov 18 21:55:51 2016 -0800

    sprite: adds setStrechEnabled for backward compatibility

    and other fixes

commit c0fe67aac54cd62e3846810d56f87133f3a7343b
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Fri Nov 18 18:49:42 2016 -0800

    implemts missing functions in scale9sprite

commit e471ef318725ccabc9eca2c062e285e9ca4f9a81
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Fri Nov 18 18:42:30 2016 -0800

    "batched" works

commit 33124bfb14d1f275d4b0ffca8989975625a8a76d
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Wed Nov 16 18:59:38 2016 -0800

    more fixes

commit 149f8206269843af63a1739885c00ed8d94c239c
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Wed Nov 16 18:37:12 2016 -0800

    scale 9 rotated not fixed yet.

    but making progress

commit 27f98275d94ce00c8d5ff0b6f74b5c22723cc3c3
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Wed Nov 16 15:32:57 2016 -0800

    sprite: streching works ok with normal sprites

commit 2519498cac8b77a32dee5bdf1805be56fbda5ed6
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Wed Nov 16 12:12:28 2016 -0800

    somes fixes... still not working

commit 43580d0b4aa976b0200717611a286bf1035c472d
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Tue Nov 15 23:15:22 2016 -0800

    more bug fixes related to untrimmed setCenterRect...

    ...in SCale9Sprite

commit 407247616e506afaa0415c58ad7fce38efed0cd9
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Tue Nov 15 22:13:38 2016 -0800

    spritecale9: untrimmed vs. trimmed capInsets

    WIP. there still a few bugs

commit 3d845b2af3500be287fabb04bb6ba0ec04dbb401
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Mon Nov 14 23:11:17 2016 -0800

    started progressbar

commit 0a44b00daf723869b7105689890f29cd53a62608
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Mon Nov 14 17:43:23 2016 -0800

    adds EditBox test

commit 330304bd9b2e762de95c2f27f1ae3ceee83b2fbf
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Wed Nov 9 16:57:08 2016 -0800

    adds elastic to scroll view

commit a06a35f8691ff56a143953c44acd947b519150b6
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Wed Nov 9 15:58:29 2016 -0800

    yay! scrollview works

commit 37748a885c62eca8c00d2c9c11ee103f1d95e71c
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Wed Nov 9 15:33:58 2016 -0800

    yet more scrollview fixes

commit a6e563b497adef7b141ac7c92c844d479b244c59
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Wed Nov 9 14:48:28 2016 -0800

    initial scroll view

commit 4243edd7548e5533ca03c26d5042f8dc5517445a
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Tue Nov 8 17:50:15 2016 -0800

    sanity check in frames.

    missing files

commit 159d88603ad22f3c01761b60bacec98d52b9041d
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Mon Nov 7 19:21:00 2016 -0800

    three buttons working

commit 6764cfc7937a1a81d6993d5e32a21f17457b8e0d
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Mon Nov 7 18:50:22 2016 -0800

    missing files

commit 11c1fa3812e706a7d34137fe2626f05ab73ee3e6
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Mon Nov 7 18:49:59 2016 -0800

    button works!

commit 26b6de4c28fc973e332dd51fcd763a6249c0b4c2
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Mon Nov 7 18:19:47 2016 -0800

    Scale9: more fixes.

    complies with odd Rect::ZERO behavior

commit ce561268096afe322f25034eeab3508a60027afd
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Mon Nov 7 11:50:42 2016 -0800

    label: setTitleLabel

commit 51b5536cd2af36896002621f75c7310960c3f5e7
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Wed Nov 2 17:41:08 2016 -0700

    UIButton kind of working

commit 7562a49a761ef70c383a99d2addefc63d77e279f
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Wed Nov 2 11:11:42 2016 -0700

    missing resoruces

commit a9890dee5da0104bff6872cc04e8786a6c0a9018
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Wed Nov 2 10:54:55 2016 -0700

    setCenterRect to .cpp file

commit c9c4bb55ed3fc55709eca46c43d1bfe5301c317f
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Wed Nov 2 00:19:51 2016 -0700

    removed unused paramter

commit e47732934cca79c08e6fe96e46ebdf075508e568
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Fri Oct 28 18:19:31 2016 -0700

    flipping works!

commit c9769bacd321aeddf84e1772dd270f12194d2f04
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Fri Oct 28 17:57:53 2016 -0700

    spirte flip fixes... not finished yet

commit 1cbdc8e12cc6d0d2728c06dfabaada001784a178
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Fri Oct 28 09:53:16 2016 -0700

    centerRect changes

commit aeb1b14c00331dabba640f52d79ab0e255fa3407
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Fri Oct 28 09:10:41 2016 -0700

    changes from v3

commit e7a61c4a20d786c2bc1d6f57e33bf3ac95cb6f21
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Wed Oct 26 17:01:15 2016 -0700

    sprite: rotated slice 9 works as expected

commit 91049389426051deb49a9d951364bf60abaf4532
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Wed Oct 26 15:39:54 2016 -0700

    more bug fixes in scale9sprite support

commit 9feb12449078441c439df16dc7bcfb4506c7a226
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Wed Oct 26 13:22:52 2016 -0700

    Android's Patch 9 works as expected

commit 1cf46afe3e7f7f5f714d30779caefc25a9bb1b3b
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Wed Oct 26 10:18:47 2016 -0700

    Sprite: uses capInsets instead of centerRect

    just to share the same API as Scale9Sprite

commit e944fa0248a7eb58012aacb229de1a9b814e0aef
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Tue Oct 25 18:59:42 2016 -0700

    scale9sprite support fixes

commit b08765740d480b6ae1491800161b40d88f458767
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Tue Oct 25 17:38:47 2016 -0700

    more scale9sprite fixes

commit 388a34d93de5e6007a2cecea959c929f26427cab
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Tue Oct 25 17:20:01 2016 -0700

    UI::Scale9Sprite refactoring

    subclass of Sprite... much cleaner!

commit c84ec8ee654f74d4b38be2d0a3d7ffe6adbc6faf
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Mon Oct 24 20:58:36 2016 -0700

    supports tiled sprites

commit d2b18eb47a647b29319488bd53edac9f304acb84
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Mon Oct 24 19:21:57 2016 -0700

    testing tiled sprite

commit b4832ab2facc01cbb624db587ede01fe7acf23e8
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Mon Oct 24 16:53:19 2016 -0700

    using correct top-left coordinates for setCenterRect

commit 29d8de86a71cc597b2338f59f7951a28ee0c93b2
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Mon Oct 24 16:46:13 2016 -0700

    fixes from scale_sprite9 branch

commit ccbe1063bea7db75397ecaf9046aac3dd977a621
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Thu Oct 20 19:01:50 2016 -0700

    updated example

commit 24f7f85d4eba80f8e543810dcbc1a02447900bdc
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Thu Oct 20 18:47:28 2016 -0700

    more fixes in nine slice

commit df3358fae68f2d81baf3a8cbe033a4c400ea50da
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Thu Oct 20 18:22:14 2016 -0700

    anchor point fixes

commit 4ac7409bc72425abb0dc747b956ec346fbd1b2fa
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Thu Oct 20 17:01:48 2016 -0700

    support for slice-9 from creator

commit a3221375d3a9defc2e03df0b1c2da1b36dfdd491
Merge: 73e5389 d7490d9
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Thu Oct 20 14:13:38 2016 -0700

    Merge branch 'sprite_scale9' into creator_cpp_support

commit d7490d94896ad0ce8705dc0695252cee34329b5e
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Thu Oct 13 14:34:52 2016 -0700

    Adds slice9 support for Sprite.

    how to use it:

    // points coords
    sprite->setCenterRect(Rect(x,y,w,h));

    // normalized coords
    sprite->setCenterRectNormalized(Rect(x,y,w,h));
    starts scale9sprite in sprite

    more slice 9 changes

    sprite 9 slice works?

    kind of works

    correct anchor point

    slice 9 works, at least with non-rotated atlases

    streched works ok

    better Y invert code.

    cleaner, compatible with the previous code

    yay, scaling workings...

    need a better api now

    sets scale correctly

    yay! works as expected!

    more fixes and tests

    better test for box

    setContentSize() changes size in non-9-slice mode sprites as well

    setCenterRect() -> setCenterRectNormalized()

    yet another test

    adds setPositionNormalized()

    adds setCenterRect() tests

    remove devel team from xcode

    tests: add one more tests

    fun test!

    improved test

    yet another test for slice 9

commit 73e5389ef719880096067d0f7d0bffd6e1f3cfd1
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Sun Oct 9 18:54:22 2016 -0700

    kind of ProgressBar support

commit 4db5e9e7369e93ceba1d9512ab88c26b843c43d5
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Fri Oct 7 16:23:54 2016 -0700

    new generatred ui files

commit 75aa06f3d39df8c6aa898d5e6810b3cd8015c07b
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Thu Oct 6 10:44:59 2016 -0700

    bette canvas support

commit 89beacac478fc7f58ef930963b6393f3da4a743c
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Wed Oct 5 21:47:11 2016 -0700

    sprites tests

commit 5fe930ad50c2c1b6d868982709c7b659176f9889
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Wed Oct 5 18:35:44 2016 -0700

    more label tests

commit d3f615a097d080d78f2ebd95f3e2388da45f92db
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Wed Oct 5 18:08:24 2016 -0700

    label tests

commit 2a4018922ce8d36117f7092fc324e37cf75fdeab
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Tue Oct 4 21:52:56 2016 -0700

    label fixes

commit 41fafbd023de63e376d014311605f2b156add307
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Tue Oct 4 19:14:58 2016 -0700

    updated test

commit 06919fc28fffbc5a20cd14bdcc2ad2ff997e0da1
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Tue Oct 4 18:50:45 2016 -0700

    creator tests: works

commit 6e362e7cc7f68dc216b569a7f7f90aaa110c0e4a
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Tue Sep 27 23:15:56 2016 -0700

    autogen: new data

commit e78078b2ad84b4e364827a66f1c459de7384a91d
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Mon Sep 26 18:18:57 2016 -0700

    fix: initial test for CPP support for Creator

* adds more documentation

* adds more documentation
2016-11-24 09:59:00 +08:00
Dmitry 1e1ac655b1 fixes for iOS 7 and earlier (#16879)
* initialize Director::_invalid on first init

* fix: Setting the GLView should be done after creating the RootViewController

* restore 2016 copyright on templates/cpp-template-default/proj.ios_mac/ios/AppController

* remove old iOS js and lua templates

* copy actual iOS templates from cpp to js and lua
2016-11-23 09:28:34 +08:00
Wilson E. Alvarez 3056269531 Various small performance tweaks (#16881)
* These variables can be accessed by reference

* Assign values in initialization list

* _range can also be in initialization list

* Prefixed ++ and added 'auto' to loops

Also removed extra whitespace

* Prefixed ++/--, and changed for-loop implementation to use 'auto' on some loops
2016-11-22 09:54:04 +08:00
yahont 0c664ebc99 some warnings fixed: unused variables, signed-unsigned comparison (#16878) 2016-11-21 15:03:41 +08:00
CocosRobot 18204c1e37 [ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically (#16880) 2016-11-21 15:00:00 +08:00
Wilson E. Alvarez 0d0dd05287 The return statement is not used in some cases (#16874) 2016-11-21 09:33:06 +08:00
minggo 88f6825c48 reset stencil program when alpha threshold is set to 1 (#16858) 2016-11-18 09:28:01 +08:00
minggo 8460fb53e7 remove duplicate codes (#16860) 2016-11-18 09:27:37 +08:00
CocosRobot 7c6f0598b2 [ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically (#16861) 2016-11-18 09:27:20 +08:00
Adrien de Sentenac 460c68125f Use resolved file name (through dictionary lookup) in font atlas creation (#16797)
* Use resolved file name (through dictionary lookup) in font atlas creation, to prevent creating multiple atlases for the same file.
Add font tests with and without font name replacement (through dictionary lookup).

* Fix cpp-tests xcode and cmake project

* Additional fix for cmake project
2016-11-18 09:23:44 +08:00
pyrosphere 663bb4d7ed No CC_UNUSED_PARAM (#16812)
* Added -Wno-unused-parameter and removed all uses of the CC_UNUSED_PARAM macro

* Commented unused parameter names in .cpp files which previously used CC_UNUSED_PARAM

* Reverted -Wno-unused-param flag.
Moved deprecated touch methods definitions to .cpp file.
Commented more unused parameter names.

* Fixed some errors and warnings caused by the previous commit.

* Commented remaining unused parameter names in .cpp files.

* Fixed unused parameter warnings in headers.

* Fixed some more unused parameter warnings.

* Fixed some more unused parameters warnings.

* Fixed mistake in previous commit, missing ComAudioReader:: in method. Other warnings.

* Fixed build errors.

* Added missing file to CMakeLists
2016-11-16 09:48:37 +08:00
pyrosphere ae48e0bf69 Android setMultipleTouchEnabled (#16830)
* Added method to switch between single and multitouch on Android.

* Moved variable definitions to the beginning of the class. Handle single touch for ACTION_MOVE and ACTION_CANCEL.

* Cleaner code by using if/else instead of break
2016-11-16 09:41:07 +08:00
子龙山人 ee8305ed52 fix editbox can't input on macos 10.12 (#16842)
* fix editbox can't input on macos 10.12

fix editbox can't input characters on mac os 10.12

* update external to 114
2016-11-16 09:38:42 +08:00
Tate Allen f99dae383f Fixed math error (issue #16837) in Lua function radian2angle (#16848) 2016-11-16 09:35:47 +08:00
James Chen e1e6ac1760 Removes unused rapjson includes. (#16839) 2016-11-14 14:13:33 +08:00
yahont a429469d62 required check for nullptr with new(std::nothrow) (#16822)
* tequired check for new

* check for init()'s return value too; deleting unused texture
2016-11-14 10:05:26 +08:00
UQ Times 0d2e58b9da fix compile error if "USE_STD_UNORDERED_MAP == 0". (#16831) 2016-11-14 10:00:55 +08:00
子龙山人 2e2b9b81e4 fix missing chinese characters when using ttf label (#16832) 2016-11-14 09:51:30 +08:00
Wilson E. Alvarez fd6e10f0f5 Let FMOD autodetect the best output mode for Linux (#16819)
Thanks to filippovdaniil for the suggestion
2016-11-10 11:30:30 +08:00
CocosRobot d0705d9e25 [ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically (#16828) 2016-11-09 17:33:47 +08:00
samael c6f98cd95b jsb.addRoot is not a function (#16509)
* jsb.addRoot is not a function

jsb.addRoot is not a function

* Update jsb_cocos2d.js

remove jsb._root
2016-11-09 15:19:32 +08:00
Josh Bodily c3c6681b9e Add Horizontal Text Alignment to UIEditBox (#16772)
* Add Horizontal Text Alignment to UIEditBox

* Fix compile error

* Fix win32 compile
2016-11-09 10:38:00 +08:00
yahont e9b39a99e2 cocos2dInternal cleaned of some warnings (#16818)
* cocos2dInternal cleaned of some warnings: unused parameters and signed-unsigned comparisons

* -Werror removed

* tab fixed

* indent fixed

* more warnings fixed
2016-11-09 10:34:50 +08:00
David DeSimone fb9c1f2de0 Fixed EditBox placeholder font not being set correctly for multiline text fields on iOS. (#16821) 2016-11-09 10:27:34 +08:00
Ce Zheng 4b3525f7a8 use STL emplace when possible (#16815)
* replaced some unordered_map::insert(std::make_pair(foo, bar)) with unordered_map::emplace(foo, bar)
* replaced some vector::push_back(std::make_pair(foo, bar)) with vector::emplace_back(foo, bar)

The old way will construct a std::pair first then call move constructor
when putting it into the container, while using emplace will construct
the pair in-place in the container. Also, the emplace way is shorter &
more concise.
2016-11-08 11:50:00 +08:00
CocosRobot 2d18d703a0 [ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically (#16810) 2016-11-04 14:07:25 +08:00
David DeSimone 9204c87cfc Adding performance.now() to cocos2d-js. (#16766)
* Adding performance.now() to cocos2d-js. See https://developer.mozilla.org/en-US/docs/Web/API/Performance/now

* Fixing improper logic for converting from microseconds, to milliseconds with micro-precision

* Adding performance.now tests
2016-11-04 11:58:48 +08:00
minggo fa02f24f0d add fbs files needed to update flatbuffer (#16808) 2016-11-04 10:13:06 +08:00
n2omatt 6be4ec8ee5 Add new methods to get the number of actions running in a given node with a specific tag. (#16789)
* Add new methods to get the number of actions running in a
given node with a specific tag.

This is useful for cases that we want to know how many
animations with a **specific** tag is running in our target.
For example:

auto tag1Count = this->getNumberOfRunningActionsByTag(kMyTag1);
auto tag2Count = this->getNumberOfRunningActionsByTag(kMyTag2);

While this could be achieved (more or less) with callbacks
to increment the tagCount at start of action and decrement
at the end the proposed API is much more concise and less error
prone.

* Replace the old C casts to static_casts.

As discussed in #16789 issue thread @minggo asked
to change the old style of cast to newer, more safer
static_casts.

* Add the required parenthesis and normalize the spaces.

Normalize all the static_cast<Action *> to static_cast<Action*>
some places we have spaces, other places haven't.

Fix the missing parenthesis.
2016-11-04 09:41:03 +08:00
Josh Bodily e20c1e0a9a Misc. UIEditBoxImpl-winrt fixes (#16773)
* SENSITIVE doesn't imply password, fixes crash on static cast in
* onTextChanged
* Fix type fontName instead of pFontName
* Set attributes that affect text content before setting initial text
2016-11-04 09:38:48 +08:00
James Chen 7e14812240 fixed #16492: RapidJSON Crashes in Release mode on Android. (#16792)
* fixed #16492: RapidJSON Crashes in Release mode on Android.

* Updates external/config.json

* json/filestream.h -> json/filereadstream.h
2016-11-04 09:36:59 +08:00
James Chen f32effeb96 More: Uses c++11 multi-line string literal (#16803) 2016-11-04 09:36:26 +08:00
CocosRobot 9eb177c6cc [ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically (#16802) 2016-11-03 15:29:09 +08:00
Josh Bodily 9f31a1e43c Add reason for edit end to UIEditBoxDelegate (#16771)
* Add reason for edit end to UIEditBoxDelegate

* Adds "NEXT" action button for iOS and Android for easier form
* navigation

* Fix compile error
2016-11-03 14:02:53 +08:00
Guy 925b4fa96f Update CCObjLoader.cpp (#16790)
In the case of a simple MTL file such as 

newmtl cube
  Ns 10.0000
  Ni 1.5000
  d 1.0000
  Tr 0.0000
  Tf 1.0000 1.0000 1.0000 
  illum 2
  Ka 0.0000 0.0000 0.0000
  Kd 0.5880 0.5880 0.5880
  Ks 0.0000 0.0000 0.0000
  Ke 0.0000 0.0000 0.0000
  map_Ka cube.png
  map_Kd cube.png

The entire istringstream would be consumed by LoadMTL and result in a 'not found' error due to the null check being in the wrong place
2016-11-02 10:22:48 -07:00
ggggamer 54d6321ff3 Support float line width (#16781)
glLineWidth use float but CCDrawNode use int
2016-11-02 17:48:26 +08:00
Bin Zhang 3b87e46280 Support compile & run project on Tizen by cocos command. (#16783)
* Add config files for build engine source code on tizen.

* Add config files for cpp-empty-test on tizen.

* Add missing files.

* Add config files for cpp-tests on tizen.

* Add Tizen config files for lua-bindings.

* Add Tizen config files for lua-empty-test.

* Solve the error when build lua-empty-test for Tizen.

* Add Tizen config files for lua-tests.

* Solve the error when build lua-tests for Tizen.

* Add tizen config files for templates.

* Update submodule cocos2d-console.
2016-11-02 17:41:26 +08:00
James Chen e183160efe fixed #16787: Removes unused code of 'if (sizeof(Vec2) == sizeof(Vec2)'. (#16791) 2016-11-02 17:27:49 +08:00
Wilson E. Alvarez d5dacd4f0e Use C++11 multiline string literal instead (#16765)
* Undo pull request #16742 while keeping fixed indentation on ccShader_UI_Gray.frag

* Removed unnecessary whitespace

* Switched implementation to C++11 string literal

Thanks to stevetranby for the suggestion
2016-11-02 14:13:34 +08:00
Paul Gardiner a888f42d7f Lua: have cc.Ray:intersects additionally return the distance (#16677)
cc.Ray:intersects now returns two results, an indication of hit or
not, plus the distance along the ray. The function can still be called
expecting a single argument and hence is backward compatible.

Also correct the debug error message
2016-11-02 09:45:24 +08:00
Josh Bodily 40b5c9f4b7 Mac edit box bug fixes (#16656)
* Don't allow multiline to overflow bounds of box
* Fix bug w/ performSelector
2016-10-31 15:16:18 +08:00
子龙山人 1a258f7ed4 Merge pull request #16776 from CocosRobot/update_lua_bindings_1477789224
[ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically
2016-10-31 00:01:08 -07:00
pyrosphere 1667a5c444 Toggle between windowed/fullscreen on desktop (#16762)
* GLViewImpl methods for desktop window management - toggle between fullscreen/windowed

* Window management tests (mac)

* Added window management tests to Win32 and Linux

* Added const keyword. Removed platform macros.
2016-10-31 14:02:02 +08:00
chgowolf ef380298bb fix issue#16756 tileGid may overflow when use horizontal flip (#16758)
* tileGid may overflow when use horizontal flip

kTMXTileHorizontalFlag = 0x80000000
when use horizontal flip, gid will bigger chan 0x7FFFFFFF

* use unsigned int to convert string to gid
2016-10-31 10:42:09 +08:00
James Chen cc1b7808f0 fixed #16735: [native] The behavior of (setRotation + setSkewX) is wrong (#16736)
* fixed #16735: [native] The behavior of (setRotation + setSkewX) is wrong.
Since I removed some logic, this patch may also improve a little bit performance.

* Adds test case for issue #16735
2016-10-31 10:29:04 +08:00
CocosRobot#Set 57903077d0 [ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically 2016-10-30 01:00:27 +00:00
Ricardo Quesada e0809d869c Sprite::capInsets -> Sprite::centerRect (#16770)
* Sprite::capInsets -> Sprite::centerRect

as requested by @minggo

* fixes flip issues in Sprite with slice 9
2016-10-29 17:52:33 -07:00
CocosRobot 3ab1be61a7 [ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically (#16764) 2016-10-28 10:13:57 +08:00
James Chen 609750ef58 fixed #16754: [android] Background music which is playing could not be paused while game enters background. (#16755)
* fixed #16754: [android] Background music which is playing could not be paused while game enters background.

* Updates a comment of cocos/audio/android/AudioEngine-inl.h
2016-10-28 10:12:52 +08:00
SongChengJiang af8b9cc47c Support MultiView matrix array (#16723)
* Support MultiView matrix array

Support MultiView matrix array and add new interface in GLProgram to
support shader header definitions.

* support getMatrixStackSize

* optimize code

* remove indents

* rename resetMatrixStack(unsigned int stackCount)

* Add document to interfaces

* Supplement document of render interface
2016-10-28 09:33:31 +08:00
pandamicro e4170a7b02 Improve JS bindings (#16751)
* Fix tests for v3.12 web

* Improve scheduler wrapper

* Update web engine ref

* Fix leak: js_remove_object_reference can not remove non binding objects

* Fix ScriptingCore::evalString

* Add missed `__cppCreated` for JS create objects

* Fix manifest path issue
2016-10-28 09:29:56 +08:00
zloopnew ed2dac1ba4 Mesh* Sprite3D::getMesh() should return nullptr when _meshes.empty() is true (#16711) 2016-10-27 15:20:41 +08:00
Wilson E. Alvarez c0e1e91373 Performance tweak: Use range-based for-loops and allocate std::vector size() and *end() on the stack where favorable. (#16716)
* Use range-based for-loops and allocate std::vector size(), end(), cend(), rend(), crend() on the stack where favorable.

Other minor trivial changes were applied.

* Fixed Android compilation error

* Fixed windows-universal compilation error
2016-10-27 15:10:24 +08:00
CocosRobot 44f6865697 [ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically (#16750) 2016-10-27 11:15:24 +08:00
niu2x 92af2b2b6f bug fix (#16747) 2016-10-27 09:46:07 +08:00
Ricardo Quesada 323ea7c0d4 Sprite scale9 (#16702)
* Adds slice9 support for Sprite.

how to use it:

// points coords
sprite->setCenterRect(Rect(x,y,w,h));

// normalized coords
sprite->setCenterRectNormalized(Rect(x,y,w,h));
starts scale9sprite in sprite

more slice 9 changes

sprite 9 slice works?

kind of works

correct anchor point

slice 9 works, at least with non-rotated atlases

streched works ok

better Y invert code.

cleaner, compatible with the previous code

yay, scaling workings...

need a better api now

sets scale correctly

yay! works as expected!

more fixes and tests

better test for box

setContentSize() changes size in non-9-slice mode sprites as well

setCenterRect() -> setCenterRectNormalized()

yet another test

adds setPositionNormalized()

adds setCenterRect() tests

remove devel team from xcode

tests: add one more tests

fun test!

improved test

yet another test for slice 9

* fixes anchorPoint issues

* adds documentation

* fix: using top-left coordinate for setRect

* sprite: fixes related to scale9 and tiled

* Sprite: slice 9 fixes

works Ok with rotated frames
uses `setCapInsets` instead of `setCenterRect` to be more familiar
with `UIScale9Sprite`

* fixes js and lua bindings for Autopolygon
2016-10-26 18:45:40 -07:00
James Chen 58acca108b Removes unused 'return' letter in builtin shaders. (#16742)
* Removes unused 'return' letter in builtin shader.

* Updates indention of ccShader_UI_Gray.frag.
2016-10-26 16:03:08 +08:00
James Chen 0a31c7de3a fixed #16737: NodeTest (stress test #2: no leaks) is broken. (#16741)
'clone' method must invoke the inner object's clone method rather than its raw pointer.
2016-10-26 15:54:01 +08:00
mogemimi 5b8919829c Fix typos in local variables (#16712) 2016-10-20 18:17:37 +08:00
James Chen a5fdc07fca Fixes label wrong blending and improves performance while enabling outline. (#16717) 2016-10-19 10:19:14 +08:00
Ricardo Quesada 90db0eb6bf Android pixel fixes (#16694)
* android pixel fixes

- pragma pack for NavMesh! (how this was working)
- no no-const global variables in shaders

* spine: js bindings work again
2016-10-17 15:44:41 +08:00
noprops 92da63db3d update visibleTiles rect (#16331) 2016-10-17 14:27:38 +08:00
James Chen b7d6e427e0 issue #16661: Replace c style uthash with std::unordered_map<K, V> in CCFontFNT.cpp (#16662)
* issue #16661: Replace c style uthash with std::unordered_map<K, V> in CCFontFNT.cpp

* issue #16661: Removes unused include "base/uthash.h" in CCGLProgram.cpp.
2016-10-17 13:53:54 +08:00
Paul Gardiner 6b27f014fc Correct the Skybox fov (#16655)
* Remove undrawn quads from the skybox mesh

CCSkybox had been implemented using a combination of two
inconsistent techniques. The rendering was being achieved via use of
the vertex shader's inherent support for cubemaps. That technique requires
only a single screen-covering quad, but the implemtation defined a cube.
Defining a cube mesh would be appropriate if one were simply mapping the
cubemap's 6 textures to faces, but is unnecessary if using the shader's
cubemap feature.

Not only was the use of a cube mesh unnecessary, but the particular way
the cube was defined and used meant that only one face would ever
contribute to the rendering. One of the other faces would always be culled
and the other four would be viewed edge on, mapping the the infinitesimally
thin lines defining the edges of the screen.

This commit simply removes the never-rendered faces, and adds comments
explaining the technique.

* Within test code, remove setScale calls applied to skyboxes.

A Skybox is defined in such a way that it's position, rotation and
scaling has no effect on it's rendering, so setScale has no effect.
The calls are removed from test code to avoid confusing anyone using
it as a template for their own programs.

* Make the Skybox correctly account for the camera's fov

The Skybox does not use the model/view and projection matricies. Instead
a single quad that maps exactly to the screen is rendered and the camera's
world matrix is passed into a shader that renders using cubemap lookups.
The way that works hardwires the fov to 90deg in both the horizontal and
vertical. That shows up particularly badly when the camera is pointed
directly downwards and rotated: the image deforms as it rotates.

This commit corrects the problem by using scaling factors from the
camera's projection matrix to prescale the matrix passed into the shader.
2016-10-17 13:46:26 +08:00
Paul Gardiner 875cf45d1d Lua: add cc.vec3 functions - add, sub, mul and dot (#16706)
Also update the lua test to use these functions.
2016-10-17 10:39:40 +08:00
mogemimi fe52c5fa0a Fix typos in comments and strings (#16708) 2016-10-17 10:12:54 +08:00
minggo 06b4a18f6f Merge pull request #16703 from dumganhar/pr/16689-font-pos
Adds test case for PR #16689 (fix font rendering position)
2016-10-17 10:09:50 +08:00
James Chen 627eba6aac fixed #16652: FontFreeType crashes in its destructor. (#16684) 2016-10-14 17:49:36 +08:00
Dale Stammen 58414f85a1 disable /Zw on .c file (#16697) 2016-10-14 17:49:03 +08:00
mogemimi 1ed151be82 Fix indentation (#16699) 2016-10-14 17:48:23 +08:00
mogemimi dde86b404a Remove unused local variable (#16698) 2016-10-14 17:48:00 +08:00
Sergey fd902e52cf adjustForDistanceMap need to be negative to 2016-10-14 11:45:29 +03:00
Sergey f05053329b fix font rendering position 2016-10-12 16:21:09 +03:00
QingliWang 7c1f88423b Fix bug when app paused the music is still resumed to play after interruption completed. (#16679)
* Support audio interruption and resume callback when change earphone status.

* Refactor keyevent callback and add makecurrent for compatible with different binary.

* Enable Tizen indicator.

* Remove the unnecessary evasobject in the window and refactor the function for glview mode.

* Fix the compatible issue between Tizen 2.3 and 2.4.

* Fix the wrong directory of script resources for HellLua template project.

* Create performance-test project for Tizen platform.
2016-10-12 15:48:27 +08:00
CocosRobot 23ff5fc51f [ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically (#16676) 2016-10-11 11:40:11 -07:00
Wilson E. Alvarez cdee1e11de Performance tweak: use range-based for-loops instead of iterator-based for-loops. (#16642)
* Use ++ prefix instead for non-primitive data types in CCAutoPolygon.cpp

* Use ++ prefix instead for non-primitive data types in SimpleAudioEngine.cpp

* Use ++ prefix instead for non-primitive data types in CCNodeLoaderLibrary.cpp

* Use ++ prefix instead for non-primitive data types in CCActionManagerEx.cpp

* Use ++ prefix instead for non-primitive data types in CCDataReaderHelper.cpp

* Use ++ prefix instead for non-primitive data types in HttpClient-android.cpp

* Use ++ prefix instead for non-primitive data types in CCDevice-linux.cpp

* Use ++ prefix instead for non-primitive data types in ScriptingCore.cpp

* Switched implementation to range-based for loops

* Added readability, fixed loop in CCDataReaderHelper.cpp

Thanks to Dimon4eg for the code review.
2016-10-11 10:59:44 -07:00
Ricardo Quesada e4be87a059 Adds Spine binary-file format support (#16629)
* Adds Spine binary-file format support

fixes issue #10438

* ignore SkeletonBinary.c from linter

* add another file to the exclude list

* lua manual fixes for spine

* SkeletonBinary.c and not .cpp

* missing files for win8.1

* don't compile it as crt

* new updates from spine
2016-10-11 10:56:14 -07:00
CocosRobot#Set f280ed2cdb [ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically 2016-10-11 01:51:00 +00:00
mogemimi ccc141fc99 Remove unnecessary const return qualifiers (#16671) 2016-10-11 09:33:05 +08:00
9b9387 0c8376411e Update GuiConstants.lua (#16666)
- fixed PageView constant
2016-10-10 13:56:42 +08:00
子龙山人 eeab15b2c9 Merge pull request #16659 from zilongshanren/fix-mac-font-name
fix mac system font creation with NSFont
2016-10-09 19:06:55 -07:00
zilongshanren 5b109854c3 fix mac system font creation with NSFont 2016-10-08 14:34:55 +08:00
Paul Gardiner 1c0602e130 Remove unnecessary arguments from some lua cc.mat4 methods (#16658)
* Lua: remove unused 3rd argument from cc.mat4.transformVector

cc.mat4.transformVector takes a mat4 and a 4vector and returns the result
of applying the mat4 to the vector. Strangely it had been made to also
require a third argument called dst which it doesn't use but did check
was a vec4. This commit allows cc.mat4.transformVector to be called
without the unnecessary argument. We still permit calling with it for
backward compatibility.

Also changed is the wrapper in Cocos2d.lua so that a second form of
cc.mat4.transformVector can be used where the vector is supplied as
4 separate numbers.

Changed the test files to call without the unnecessary argument.

* Lua: remove unused argument from cc.mat4.createTranslation/Rotation

Both these functions have an extra unnecessary argument called dst,
although neither use it either to pass in or out a value. This
commit removes the extra argument and updates the test programs
correspondingly.

Also, within Cocos2d.lua, remove some definitions that are later
overwritten by new ones
2016-10-08 14:33:50 +08:00
mogemimi 611b6fafc8 Suppress unused function warning (#16657) 2016-10-08 10:14:58 +08:00
mogemimi 59dea5a487 Removed unnecessary comments (#16649) 2016-10-07 11:47:48 -07:00
Dmitry 771a69709f fix for #16589 (#16636) 2016-10-04 22:26:40 -07:00
mogemimi d68eacd10a Remove unused functions (#16640) 2016-10-04 22:10:52 -07:00
mogemimi 868e6f62c5 Fix typos in doc: accpetable / accepteable -> acceptable (#16641) 2016-10-04 22:08:56 -07:00
minggo 5785c3fcdd use SharedPreferences.apply() instead (#16632) 2016-09-30 14:58:30 +08:00
CocosRobot c046257efc [ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically (#16630) 2016-09-30 09:44:34 +08:00
子龙山人 c3bbbb6cb2 Refactoring ui related code and fix label atlas and BMFont rendering issue with ETC1 texture format (#16615)
* refactoring ui related code

* fix label bmfont/charmap etc drawing

* make code more robust
2016-09-30 09:42:21 +08:00
minggo a6f3773aef Luajit (#16620)
* update console

* load lua according architecture

* install android-13 in travis
2016-09-28 16:19:20 +08:00
James Chen 189ffc4e27 Minor fix for TextureCache::addImage(image, key). (#16613)
* Removes insignificant log: `prevents overloading the autorelease pool`
* Removes unused retain -> autorelease stuff
* Checks the return value of `texture->initWithImage`, if it returns false, texture should be released and set to nullptr.
* More specifc log output in TextureCache::addImage(image, key)
* Checks arguments validation for VolatileTextureMgr::addImage
2016-09-27 15:10:16 +08:00
halx99 2ee439e3f5 Fix issue: 16603 (#16604)
see: https://github.com/cocos2d/cocos2d-x/issues/16603
2016-09-27 13:59:24 +08:00
mogemimi 8b703a8d12 Fix implicit conversion warning (#16598)
* Fix implicit conversion warning

* Change SAXParser::textHandler parameter type from int to size_t
2016-09-26 14:49:47 +08:00
pandamicro 466053b740 Fix JS AssetsManagerTest and Improve scheduler wrapper (#16605)
* Fix tests for v3.12 web

* Improve scheduler wrapper

* Update web engine ref
2016-09-26 14:44:32 +08:00
Wilson E. Alvarez 59574f95e0 Fix mismatched memory deallocators (#16596)
* Fix mismatched memory deallocator in CCFastTMXLayer.cpp

* Fix mismatched memory deallocator on SkeletonRenderer.cpp

* Fix mismatched memory deallocator in CCTMXLayer.cpp
2016-09-26 14:18:48 +08:00
Steve Tranby b22efc9115 Features: add events for window resize, focus, and unfocus (#16578)
* add events for window resize, focus, and unfocus

* fix typo
2016-09-20 20:32:33 -07:00
TankorSmash f93c6edb1f tidy up TextureAtlas::resizeCapacity (#16588)
My intent is to reduce clutter and improve readability, so that going forward it's a little easier to edit this.

No behaviour change.
2016-09-20 20:31:24 -07:00
mogemimi e8c3082229 Move skipBOM function outside to prevent shadowing warning (#16585) 2016-09-20 14:52:15 +08:00
colajam93 1d3a40f8be Fix warning (#16591) 2016-09-20 14:50:47 +08:00
colajam93 e7f739897c Fix deprecated warning (#16592) 2016-09-20 14:48:00 +08:00
mogemimi 63b3043dc0 Remove extra semicolon after member function definition (#16595) 2016-09-20 14:43:48 +08:00
halx99 a46b30f8a6 use more plain API FileUtils::getStringFromFile (#16586) 2016-09-19 11:49:35 +08:00
minggo 84a102edf8 merge v3.13.1 back to v3 2016-09-15 10:08:28 +08:00
mogemimi 91cdb3394b Suppress warning C4101 on MSVC (#16573) 2016-09-14 10:49:14 -07:00
Steve Tranby 2776d1e715 XCode sometimes gets confused with multiple 'Rect' types (#16579) 2016-09-14 10:46:17 -07:00
mogemimi 63637139dc Fix -Wpessimizing-move warning when using Xcode 8 (#16580) 2016-09-14 10:45:26 -07:00
mogemimi afe8b05da8 Remove semicolons before method bodies (#16566) 2016-09-14 10:44:00 -07:00
Jun Hyeon, Nam 4342aabe28 remove unnecessary comments (#16572) 2016-09-14 10:42:25 -07:00
Ricardo Quesada 5f4fb66f61 fix: staggered hex maps returns correct tile (#16552)
* fix: staggered hex maps returns correct tile

order was fixed in the array that contains the GIDs.

fixes Github issue #16512

* fix: add fix validation code for issue #16512
2016-09-13 21:47:36 -07:00
CocosRobot 7410bdd981 [ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically (#16563) 2016-09-12 10:03:21 +08:00
Wilson E. Alvarez 74fd5ae3ba Fix mismatched memory deallocator (#16560) 2016-09-12 10:02:48 +08:00
Steve Tranby 16781b00e8 change EaseBounce to real class instead of typedef (#16557) 2016-09-12 09:51:27 +08:00
minggo 3075108f1c get sdk version from java (#16546) 2016-09-12 09:49:39 +08:00
James Chen b8f127e601 fixed #16547: [ios, mac] Protencial memory leak in AudioPlayer.mm. (#16556)
If playing a large audio and its loop flag is set to false, after the audio is played over, there will be 4 or 8 bytes memory leak by _rotateBufferThread variable.

Resolution:

The `isDestroy` flag should not be set to true in rotate buffer thread, to exiting the thread, we need another varible for this purpose.

Thanks @nicolechen819 for the feedback.
2016-09-12 09:48:27 +08:00
CocosRobot ced81f3527 [ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically (#16554) 2016-09-12 09:46:19 +08:00
mogemimi 2b9ac2c950 Remove redundant semicolons (#16558) 2016-09-12 09:45:34 +08:00
mogemimi eca7b2392d Remove unnecessary inline keywords (#16562) 2016-09-12 09:44:21 +08:00
minggo 86de22a008 fix crash if FontAtlas pointer is the same (#16555) 2016-09-09 11:39:00 +08:00
Sachin Garg 84f6863214 getSlidBallRenderer methods to allow more customization of UISlider (#16532)
* getSlidBallRenderer methods to allow more customization of UISlider look and feel.

* Added const to declaration of getSlidBallRenderer methods for UISlider.
2016-09-09 10:01:14 +08:00
Dale Stammen 1c27c12327 updated libcocos2d dll version to 3.13.1 (#16542) 2016-09-08 10:38:16 +08:00
minggo 569681f6bd use api level 13 (#16538) 2016-09-07 14:50:03 +08:00
Ricardo Quesada 282959cc0f fix: uses correct design resolution (#16534)
fixes github issue #16485
2016-09-07 12:01:40 +08:00
Peter Siegmund 9449e687af fixed compile error for android-studio build (with-controller) (#16529) 2016-09-07 12:01:11 +08:00
Ricardo Quesada 2d1048bd00 fix: uses default designResolution if not set previosly (#16533)
fixes github issue #16485
and re fixes github issue #16003
2016-09-07 11:11:52 +08:00
minggo fa15ab8212 3.13.1 text color (#16516)
* fix: Label updateColor() and underline color work as expected (#16486)

fixes Github issue #15214 correctly. underline uses _displayColor
and not _textColorF. _textColorF is only for the text.
This also emulates the SystemFont underline behavior

fixes Github issue #16471

* fix conflict

* Issue 16471 (#16489)

* fix: Label updateColor() and underline color work as expected

fixes Github issue #15214 correctly. underline uses _displayColor
and not _textColorF. _textColorF is only for the text.
This also emulates the SystemFont underline behavior

fixes Github issue #16471

* docs: added more internal doc for issue_16471
2016-09-07 09:44:58 +08:00
minggo c233a5bdf7 [ci skip]V3.13.1 doc (#16528)
* update release note and changelog

* update engine version
2016-09-06 17:01:23 +08:00
minggo c51605971f fixed #16490: [android, audio] AudioEngine::stop() triggers 'finished' callback (#16491) (#16524) 2016-09-06 10:58:43 +08:00
Allen Lee 7c298bdcd7 misspelling check on cocos directory (#16522)
Misspelling fix on some comments,
cocos/editor-support/cocostudio/CSParseBinary_generated.h
fix misspelling postion -> position
2016-09-06 10:14:14 +08:00
James Chen 50a1e75373 fixed #16502: SPINE color bug (temporary storage of color was wrong in SkeletonRenderer) (#16503) 2016-09-06 10:11:54 +08:00
CocosRobot 8d2b645a96 [ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically (#16519)
* fixed #16473: OpenSLES error while play background music in writable path or sdcard. (#16475) (#16517)

* [ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically
2016-09-06 10:11:11 +08:00
minggo 9dc737901b fixed #16473: OpenSLES error while play background music in writable path or sdcard. (#16475) (#16521) 2016-09-06 09:41:53 +08:00
minggo a6c398ec95 Fixes jsval_to_std_string could not convert number to string. (#16504) (#16515)
Don't use deprecated method in ActionsProgressTest.
2016-09-05 17:42:34 +08:00
CocosRobot 8947ff722e [ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically (#16514) 2016-09-05 13:48:58 +08:00
CocosRobot 6f4551cdad [ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically (#16513) 2016-09-05 10:19:41 +08:00
Steve Tranby b48bcc9579 Ease Actions Code De-Duplication
* ease action class macros to reduce code duplication

- update bindings for ease actions
- reorder clone method
- add back in create/etc methods to allow for EaseRateAction instances
- fix wrong clone return type

* Add note and minor cleanup

* use create in clone instead of new/init as in latest EaseBezierAction

* fix reverse for EaseIn/Out to match original code

* add assert for null

* refactor to match original code flow

* fix missing CC_DLL for windows builds

* fix win build issues due to abstract methods

* remove unused overrides
2016-09-05 10:18:30 +08:00
mogemimi 857b2143a6 Remove deprecated attribute on Node::_setLocalZOrder() function (#16470) 2016-09-05 10:06:42 +08:00
James Chen 5bfd110424 Fixes jsval_to_std_string could not convert number to string. (#16504)
Don't use deprecated method in ActionsProgressTest.
2016-09-05 10:02:05 +08:00
CocosRobot b6536e8d9f [ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically (#16499) 2016-09-02 10:44:55 +08:00
pyrosphere 0cd365dd2e Fix MenuItemSprite::unselected() on disabled items showing _normalImage instead of _disabledImage (#16482) 2016-09-02 09:51:47 +08:00
Ricardo Quesada c32000250c Issue 16471 (#16489)
* fix: Label updateColor() and underline color work as expected

fixes Github issue #15214 correctly. underline uses _displayColor
and not _textColorF. _textColorF is only for the text.
This also emulates the SystemFont underline behavior

fixes Github issue #16471

* docs: added more internal doc for issue_16471
2016-09-01 16:59:40 +08:00
minggo db21e5f349 [ci skip]Travis enable pull request (#16494)
* refactor travis and build pull request

* delete unneeded file
2016-09-01 16:25:47 +08:00
Renato Almeida 1c40d5e16d Fix MessageBox inverted params on Android (#16484) 2016-09-01 16:10:02 +08:00
James Chen 64c62d37c2 fixed #16490: [android, audio] AudioEngine::stop() triggers 'finished' callback (#16491) 2016-09-01 16:06:29 +08:00
James Chen 6d27868918 fixed #16473: OpenSLES error while play background music in writable path or sdcard. (#16475) 2016-09-01 11:47:33 +08:00
James Chen 01e67f6203 fixed #16477: [android, audio] Deadlock if preload the same file more than 3 times in preload callback. (#16478)
And added test case.
2016-09-01 11:46:27 +08:00
James Chen 35f937cd40 AudioMixerController::initTrack should not setState for track. Otherwise, it may trigger Track state mess-up. (#16476)
* Warning fixes in AudioDecoder.cpp

* AudioPauseResumeAfterPlay test case should start in onEnter.
And add a loop to pause & resume many times.

* AudioMixerController::initTrack should not setState for track. Otherwise, it may trigger Track state mess-up.
2016-09-01 11:43:37 +08:00
Ricardo Quesada e57c30c83b fix: Label updateColor() and underline color work as expected (#16486)
fixes Github issue #15214 correctly. underline uses _displayColor
and not _textColorF. _textColorF is only for the text.
This also emulates the SystemFont underline behavior

fixes Github issue #16471
2016-08-31 20:20:13 -07:00
mogemimi 58ede40ed9 Add missing definition of PhysicsBody::getFirstShape (Revert part of #13923) (#16458) 2016-08-29 19:23:14 -07:00
Rubonnek 91efab2ba7 Fix memory leak caused by packetOut in SocketIO.cpp (#16451) 2016-08-29 19:22:38 -07:00
David DeSimone feb48aea9c Improving CCRef LEAK_DETECTION tools by making them thread safe. It is possible that ref's can be created and mutated off thread, and with leak detection on. This can cause ungaurded writes from two or more threads to a non-protected structure. Fixing a crash on iOS when using std::list instead of std::vector. (#16415) 2016-08-30 09:36:45 +08:00
Ricardo Quesada 9dea92b2e0 feat: add support for Game Controllers on Mac (#16461)
it shares 100% the same code with iOS.
it only adds a few #ifdefs.

github issue #16460
2016-08-29 16:58:44 -07:00
子龙山人 0b1f61b8ce fix possible crash of label shrinked (#16456) 2016-08-29 15:23:01 +08:00
minggo df3b33cd59 Merge pull request #16457 from minggo/merge-v3.13
Update rapid json to version 1.1.0.
2016-08-29 15:22:01 +08:00
子龙山人 7665d83db2 Merge pull request #16452 from mogemimi/add-missing-override
Add missing override keywords
2016-08-29 00:33:30 -05:00
minggo 04fd2b16b2 merge v3.13 back to v3 2016-08-29 11:57:13 +08:00
CocosRobot ee4d59cf76 [ci skip][AUTO]: updating luabinding & jsbinding automatically (#16454) 2016-08-29 11:48:21 +08:00
mogemimi 6c3f5e6d6b Fix variable shadowing warnings caused by Spine 3.4 (#16445) 2016-08-29 09:42:34 +08:00
mogemimi 86563af08a Add missing override keywords 2016-08-28 23:45:15 +09:00
Alfonso Grillo 6c9a05f831 PageView with custom 'scrollToPage' time (#16390)
* PageView with custom scrollToPage time

* fix compiler error
2016-08-25 15:48:01 +08:00
Nakhyun Choi a9898b9875 possible memory leak when font size is 0 (#16424) 2016-08-24 18:27:44 -07:00
halx99 5bc3659a33 #Improve XML parse performance with rapidxml pure SAX parser (#16419)
* Update CCSAXParser.cpp

* #Improve XML parse performance with rapidxml pure SAX parser without compatible break.

* put rapidxml to external

* Update deps
2016-08-24 16:37:03 -07:00
Aaron e62af99db7 Fixed Camera::_viewProjectionUpdated state (#16405)
Camera::_viewProjectionUpdated is not initialised in constructor. Should be initialised to false.
This can lead to redundant visibility checks if _viewProjectionUpdated happens to resolve true.

As Camera::visit() is never called, _viewProjectionUpdated is never actually updated, resulting in no visibility tests when the camera transform changes.

Fixes #16404
2016-08-24 18:15:19 +08:00
mogemimi a9a8add717 Add missing class declaration and remove duplicate declaration (#16423) 2016-08-24 18:09:29 +08:00
Michael Kösel c339266556 [UserDefault-android] Return defaultValue parameter instead of some default value (#16416)
* Return defaultValue parameter instead of some default value

* Remove unnecessary semicolon
2016-08-24 18:07:17 +08:00
minggo 20a0798007 avoid to use __system_get_property__ (#16433)
* avoid to use __system_get_property__

* add utils

* revert console
2016-08-24 17:11:41 +08:00
9b9387 e124fe4fc5 Update CCBProxy.cpp (#16421)
fixed bug
2016-08-23 14:48:06 +08:00
Adrien de Sentenac 3c60398c09 Fix size/position calculations for Linux system fonts. (#16328) 2016-08-23 12:01:43 +08:00
minggo 1b3ff00cef fix compiling error (#16420) 2016-08-23 11:05:01 +08:00
Furkan Üzümcü 5b83fa1ac0 Fix LNK4098 and LNK2001 warnings (#16372)
* Fix LNK4098 warnings

Fixes these two warnings:
```
warning: LNK4098: defaultlib 'MSVCRT' conflicts with use of other libs; use /NODEFAULTLIB:library
warning: LNK4098: defaultlib 'LIBCMT' conflicts with use of other libs; use /NODEFAULTLIB:library
```

* Fix LNK2001 error

The `version` library is not linked for MSVC compiler and it produces these errors when compiling with MSVC 19.
```
cocos2dInternal.lib(CCApplication-win32.cpp.obj) : error LNK2001: unresolved external symbol _GetFileVersionInfoSizeW@8
cocos2dInternal.lib(CCApplication-win32.cpp.obj) : error LNK2001: unresolved external symbol _GetFileVersionInfoW@16
cocos2dInternal.lib(CCApplication-win32.cpp.obj) : error LNK2001: unresolved external symbol _VerQueryValueW@16
```

This commit fixes that problem
2016-08-22 15:50:17 +08:00
CocosRobot 56cfd76b4c [ci skip][AUTO]: updating luabinding & jsbinding automatically (#16411) 2016-08-22 15:49:43 +08:00
pandamicro ec52cf4aa4 [ci skip] Remove LayerRGBA in scripts to avoid issues and update web ref (#16412)
* Remove LayerRGBA in scripts to avoid issues and update web ref

* Doctoc docs
2016-08-22 10:55:21 +08:00
halx99 4d801ba1d0 #Fix use const std::string& instead a temp string (#16392)
* #Fix use const std::string& instead a temp string

* #Fix use const std::string& instead a temp string
2016-08-22 09:43:41 +08:00
James Chen 727c501285 Fixes crash while invoking pause&resume right after play2d. (#16406) 2016-08-22 09:43:06 +08:00
mogemimi 7afde8c7a6 Remove unnecessary ActionInterval casts (#16402) 2016-08-22 09:39:58 +08:00
pandamicro f0be4f3069 Merge part of Cocos2d-x-lite (#16380)
* Update js auto binding settings with new ndk version

* Remove unnecessary property from Ref

* Merge part of Cocos2d-x-lite :
1. Improve network bindings
2. Use nullptr instead of NULL
3. Remove usage of some deprecated APIs
4. Add some defensive code and cleanup

* Fix spine track entry circle referencing issue

* cocos2d/cocos2d-x#16327: Fix global object leak issue in JSB

* Improve ScriptingCore::evalString, old implementation have been deprecated in Spidermonkey

* Update JS versions

* Add docs for web v3.13

* Improve ScriptingCore

* Manual merge cocos2d/cocos2d-x#16383 by DavidDeSimone

* Fix auto bindings configurations

* Update web ref
2016-08-19 16:28:47 +08:00
Ricardo Quesada 016e7b0dfc fix: release texture in RenderState (#16396)
memory leak fixed in RenderState

fixes github issue #16155
2016-08-19 00:22:57 -07:00
minggo 92ed162cbe replace replace __system_property_get() since it is deprecated in 64 bit android NDK (#16398) 2016-08-19 11:49:33 +08:00
minggo e9a5a4e2bd Revert luajit (#16397)
* revert to use lua

* comment lua bytecode test

* update release note
2016-08-19 11:49:19 +08:00
CocosRobot d09ee83c5a [ci skip][AUTO]: updating luabinding & jsbinding automatically (#16395) 2016-08-19 09:36:50 +08:00
Ricardo Quesada 3ecaa71944 fix: validates director before layout in iOS (#16394)
Adds Director::isValid()
removes DisplayLinkDirector()
removes virtual functions from Director()
Director is no longer an abstract class

github issue #14276
2016-08-18 18:13:15 -07:00
Ricardo Quesada 604312ac35 Revert "fix: uses correct constant for Eye in Director" (#16385) 2016-08-17 17:53:20 -07:00
minggo 3ce4134ab3 use java reflection to avoid API level dependent, use app-abi 10 (#16371)
* use java reflection to avoid API level dependent, use app-abi 10

* add license header
2016-08-17 13:55:26 +08:00
CocosRobot 7540a64fd8 [ci skip][AUTO]: updating luabinding & jsbinding automatically (#16370) 2016-08-16 16:56:06 +08:00
charlesstlaurent b1a64ae730 new actions ResizeBy and ResizeTo (#16275)
* new actions ResizeBy and ResizeTo

* FDP-5580-ResizeBy and ResizeTo fix and Test cpp : added a scale exemple in the test cpp to compare with our new resize + fix

* FDP-5580: actions ResizeBy and ResizeTo : changed some functions visibility
2016-08-16 16:55:31 +08:00
Ricardo Quesada dcea1b65ae fix: uses correct constant for Eye in Director (#16369)
fixes github issue #8354
2016-08-15 23:27:20 -07:00
James Chen 86b8a633f3 Android arm64-v8a also uses Luajit. (#16352)
* Android arm64-v8a also uses Luajit.

* Updates external/config.json
2016-08-15 14:57:04 +08:00
James Chen 1edaf7e122 Initializes member variable for TMXMapInfo and updates hexa-test.tmx to the latest format. (#16353) 2016-08-15 14:10:13 +08:00
Ricardo Quesada 02de525cbd deprecates CCProgressTimer::setReverseProgress() (#16341)
use CCProgressTimer::setReverseDirection() instead.

fixes github issue #14678
2016-08-15 14:08:42 +08:00
mogemimi b837dd7a20 Avoid unnecessary allocation if targetGrid is reusable (#16343) 2016-08-15 14:07:37 +08:00
James Chen 020745ee2e Disables 'permessage-deflate' extension for WebSocket temporarily. (#16366)
Currently, we couldn't find out the exact reason.
libwebsockets official said it's probably an issue of user code since 'libwebsockets' passed AutoBahn stressed Test.
2016-08-15 13:59:01 +08:00
CocosRobot 7f222c92e0 [ci skip][AUTO]: updating luabinding & jsbinding automatically (#16360) 2016-08-15 10:53:07 +08:00
Ricardo Quesada 3bc662ea7b fix: not resize textureatlas multiple times on Label::create() (#16358)
since we know the size before allocating it, just reserve
the needed capacity once.

fixes github issue #16293
2016-08-13 09:38:42 -07:00
Ricardo Quesada 3d75750728 resets bindBuffer after using it (#16342)
fixes github issue #14711
2016-08-11 08:32:09 -07:00
Ricardo Quesada 87f6dd3c97 v3.13 branch: spine updates (#16340)
related to:

* Github issue #16263
* Github issue #16294
2016-08-11 23:30:15 +08:00
Dale Stammen a124213777 disabled /ZW option for .c files for all platforms/configurations (#16338) 2016-08-11 23:03:58 +08:00
James Chen 8af275c4a6 Fixes potential crash in AudioEngine::uncache(filePath). (#16345) 2016-08-11 16:06:59 +08:00
Ricardo Quesada d41124a5b1 check for correct GL extension (#16346)
uses `GL_IMG_texture_format_BGRA8888` instead of `GL_IMG_texture_format_BGRA888`

fixes issue #16336
2016-08-10 03:24:41 -07:00
JaryGuo f9abbf02f6 fix the problem in ccUTF8.cpp and CCLuaJavaBridge.cpp (#16314)
* fix the return value when return null in java

fix the return value when return null in java

* fix getStringUTFCharsJNI

fix getStringUTFCharsJNI when srcjStr is null

* remove a word

remove a word added by mistake

* make a indention

line 233 utf8Str
2016-08-08 10:43:14 +08:00
vlad-tkachenko c3130caf27 Fix Desktop App crash upon exit when NotificationNode exists. (#11274) 2016-08-08 10:20:15 +08:00
Ricardo Quesada e5b14733c8 from spine source code (#16330)
Related to:

* Github issue #16263
* Github issue #16294
2016-08-08 09:47:05 +08:00
Ricardo Quesada f7464f8de5 fix: TriangleCommands with custom uniforms can be batched (#16329)
* fix: TriangleCommands with custom uniforms can be batched

TriangleCommands with custom uniforms can be batched together.

This improves the performance when using custom uniforms without
adding any penalties when not using them

Github issue #16224

* better tests
2016-08-07 14:51:02 -07:00
minggo 0e65025bda Revert "Match parent's camera mask when adding child." (#16324) 2016-08-05 17:28:05 +08:00
minggo abb97b1b71 don't set camera the same as its parent by default (#16325) 2016-08-05 17:26:27 +08:00
James Chen f44f253179 [Android] Notify waitup only while preloadEffect(info, cb) is invoked in play2d. (#16320)
Currently, if a audio isn't preloaded, then play2d will wait the preload operation to finish.
2016-08-05 14:07:19 +08:00
minggo 2bd325ab92 Revert "fixes issue #16263 correctly" (#16321) 2016-08-05 14:06:03 +08:00
子龙山人 0d836b2cea Fix pageview click turning event (#16318)
* fix pageView click turning event

* fix current PageIndx issue
2016-08-05 14:04:57 +08:00
mogemimi a5f36e70a5 Add explicit type casts to suppress -Wformat warnings (#16306) 2016-08-05 09:46:50 +08:00
子龙山人 08515f46e3 fix pageView click turning event (#16310) 2016-08-05 09:43:15 +08:00
James Chen b135d512d2 Update copyright to 2016. (#16311) 2016-08-05 09:42:15 +08:00
mogemimi 3175316131 Fix format string warning when compiling for iOS armv7 (#16298) 2016-08-04 09:54:27 +08:00
James Chen cc9871b71d fixed #10482: New AudioEngine class can't play large ogg file on Win32. (#16303)
* fixed #10482: New AudioEngine class can't play large ogg file on Win32.

* [win32] Small logic fix in AudioPlayer::readPcmData.
2016-08-04 09:53:30 +08:00
子龙山人 6eaf15a2c2 fix pageview turning event (#16299) 2016-08-04 09:51:54 +08:00
halx99 73f80f4c73 #Make etc1 alpha support ok for ProgressTimer (#16296)
* #Make etc1 alpha support ok for ProgressTimer

* #fix issues

* Add comment
2016-08-03 14:29:34 +08:00
minggo ba51370e43 use correct shader (#16295) 2016-08-03 10:56:12 +08:00
Ricardo Quesada 143317871d fixes issue #16263 correctly (#16294)
no stackoverflow when converting int to ssize_t
2016-08-03 09:23:06 +08:00
minggo 03723da032 implement bsd_sinal for compiling or Android 21+ (#16292) 2016-08-02 16:52:15 +08:00
Jeff Wang f8b2d8fe0f fixed base URL for webview on android doesn't work (#16279)
fixed base URL for webview on android doesn't work
2016-08-02 16:49:24 +08:00
mogemimi 808a10429b Fix some typos in comments and strings (#16290) 2016-08-02 15:29:23 +08:00
Dred95 d68f105da4 Fix openURL ubuntu error (#16283) 2016-08-01 11:51:05 +08:00
mogemimi c03dd85c3f Remove redundant includes (#16285) 2016-08-01 10:22:35 +08:00
mogemimi 269bdbed85 Fix compiler warnings caused by Spine 3.4 (#16286) 2016-08-01 09:34:20 +08:00
minggo d7b96a6498 update version 2016-07-31 22:53:33 +08:00
minggo 55d80413f2 update version 2016-07-31 22:52:59 +08:00
CocosRobot aac49e35e1 [ci skip][AUTO]: updating luabinding & jsbinding automatically (#16284) 2016-07-31 22:50:28 +08:00
Vladimir Perminov c26b755175 Android import cpufeatures in cocos. (#16233)
* Android import cpufeatures in cocos.

cpufeatures imported in 3rd party libs webp.
If not use webp, android not build.

* Issues #9968

* Issues #9968
2016-07-31 22:45:30 +08:00
halx99 a2adfaf7df #Improve node sort performance for 64-bit by std::sort + long long (_localZOrder) (#16262)
* #improve node sort performance by std::sort + unsigned long long (_localZOrder)

* Use bit field for make _localZOrder storage more clearly.

* #Comment _localZOrder members for meaningful.

* fix issues

* #use explicit bits integer of localZOrder storage

* #Fix compile error, add include <cstdint> to CCNode.h

* use the optimization for 64bit and no optimization solution for 32bit

* Use the optimization for 64bit and no optimization solution for 32bit

* #Improve node sort performance 64-bit by std::sort + long long (_localZOrder)

* fix issues

* test case

* Revert "test case"

This reverts commit 85471d07a433f2b7f0265c3b7dd483fcc28e3e2f.

* fix issues

* use lambda, and any other sort issues.

* skip sotNodes

* fix compile error

* fix  compile issue
2016-07-31 22:44:24 +08:00
QingliWang bbfd2d334c Some bug-fix and quality assurance for Tizen support. (#16281)
* Support audio interruption and resume callback when change earphone status.

* Refactor keyevent callback and add makecurrent for compatible with different binary.

* Enable Tizen indicator.

* Remove the unnecessary evasobject in the window and refactor the function for glview mode.

* Fix the compatible issue between Tizen 2.3 and 2.4.

* Fix the wrong directory of script resources for HellLua template project.

* Create performance-test project for Tizen platform.
2016-07-31 22:32:59 +08:00
halx99 9cca6eb685 #bug fix etc1 alpha builtin support Sprite (#16278)
see: https://github.com/cocos2d/cocos2d-x/pull/16118
2016-07-31 22:30:03 +08:00
Ricardo Quesada a82e52ffd6 Revert "#Use Data::takeBuffer replace deep copy data." (#16277) 2016-07-29 15:35:29 -07:00
minggo 9a8f577095 fix some typos (#16269) 2016-07-29 17:20:42 +08:00
halx99 3a3f6bd385 #Use Data::takeBuffer replace deep copy data. (#16263)
see: https://github.com/EsotericSoftware/spine-runtimes/pull/650
2016-07-29 15:27:16 +08:00
CocosRobot c5923e00ca [ci skip][AUTO]: updating luabinding & jsbinding automatically (#16261) 2016-07-29 13:40:46 +08:00
minggo 88eb533f9d Revert "#improve node sort performance by std::sort + long long (_localZOrder) for 64-bit" (#16260) 2016-07-29 10:58:31 +08:00
CocosRobot af1783364b [ci skip][AUTO]: updating luabinding & jsbinding automatically 2016-07-29 01:43:11 +00:00
Vladimir Perminov 817ab329f2 Win32 MessageBox correct show utf8 and LuaLog convert utf8 by common unicode api. (#16249)
* Win32 MessageBox correct show utf8

Support MessageBox utf8 string
based on pr #16234

* LuaLog convert utf8 by common unicode api.

* Add CCStdC.h
2016-07-29 09:36:39 +08:00
minggo a8ce513f6c Merge pull request #16228 from dumganhar/fix/iss14148-ios-no-sound
fixed #14148: Got an error while pressing home button at launch, after resuming from background, SimpileAudioEngine::playEffect will be mute.
2016-07-29 09:28:37 +08:00
Ricardo Quesada 2945968614 Upgrades to Spine v3.4 (#16242)
* Upgrades to Spine v3.4

Github issue #16115

* compiles and works on windows

tested on:

* win32
* win10
* win8.1

* include-linter: don't test spine files

we need them unmodified

* spine bindings fixes

also, doesn't use goblins-ffd. instead it uses goblins.
goblins-ffd is no longer present in spine v3.4
2016-07-28 07:25:50 -07:00
minggo 57e4963502 Merge pull request #15963 from Drakon-Cocos/PageViewIndicator
Fix PageViewIndicator opacity for 'inactive' pages
2016-07-28 14:44:35 +08:00
James Chen 66fac82f00 fixed #16169: new android project crash in android 5.0.2 device (Nexus 7) when use 3.12 (#16214)
* fixed #16169: new android project crash in android 5.0.2 device (Nexus 7) when use 3.12

* fixed #16169: Adds comments for why we should not use `assignment operator` of `std::u16string`.
2016-07-28 11:19:22 +08:00
minggo cac05fefd1 Merge pull request #16241 from mogemimi/avoid-casting-overhead
Avoid overhead of casting between float and double
2016-07-28 10:04:34 +08:00
Vladimir Perminov 09aa7d9cf4 Win32 move unicode utils global. (#16234)
* Win32 move unicode utils global.

It need for easy converting utf-8 string in all code.
And use it api in user code also WinRT version.

* Move to CCUtils-win32

Also in WinRT version.

* Copyright
2016-07-28 09:57:29 +08:00
mogemimi bf35e0f6b5 Avoid overhead of casting between float and double 2016-07-28 06:49:41 +09:00
CocosRobot 6b3454e9c6 [ci skip][AUTO]: updating luabinding & jsbinding automatically 2016-07-27 20:38:57 +00:00
Ricardo Quesada 47e6b0cf3d Merge pull request #16237 from ricardoquesada/issue_16220
Compile on macOS 10.10 and lower
2016-07-27 13:30:59 -07:00
Vladimir Perminov 5498bdb32b Add ricardoquesada info 2016-07-27 18:48:10 +03:00
Ricardo Quesada 9dcc1f8193 Compile on macOS 10.10 and lower 2016-07-27 07:44:00 -07:00
Vladimir Perminov 3734668d17 GLProgram::link always check link status
Fix issues #16231
2016-07-27 15:31:32 +03:00
halx99 3a14388087 #improve node sort performance by std::sort + long long (_localZOrder) (#16126)
* #improve node sort performance by std::sort + unsigned long long (_localZOrder)

* Use bit field for make _localZOrder storage more clearly.

* #Comment _localZOrder members for meaningful.

* fix issues

* #use explicit bits integer of localZOrder storage

* #Fix compile error, add include <cstdint> to CCNode.h

* use the optimization for 64bit and no optimization solution for 32bit
2016-07-27 16:58:51 +08:00
minggo 30118aff6b Merge pull request #16226 from dumganhar/fix/iss16192-smallaudio-crash
fixed #16192: Crash while decoding small MP3 file on Android.
2016-07-27 15:39:57 +08:00
minggo e6b42d486b Merge pull request #16218 from cezheng/fix/etc_premultiplied_alpha_value
fix CCImage premultipliedAlpha for ETC format
2016-07-27 15:38:48 +08:00
minggo 1a1241c3fc Merge pull request #16221 from Microsoft/winrt-v3.13
WinRT: update libcocos2d version to v3.13
2016-07-27 15:36:43 +08:00
James Chen 6efcf87b93 fixed #14148: Got an error while pressing home button at launch, after resuming from background, SimpileAudioEngine::playEffect will not be mute.
The error is: ERROR: [0x19e5fa000] >aurioc> 807: failed: '!pla' (enable 2, outf< 2 ch, 44100 Hz, Float32, non-inter> inf< 2 ch, 0 Hz, Float32, non-inter>)
2016-07-27 15:33:02 +08:00
Ricardo Quesada 4e278183ad Merge pull request #16122 from ricardoquesada/issue_16100
testcase: add test case for issue #16100
2016-07-26 23:21:25 -07:00
James Chen bd1d630f93 fixed #16192: Crash while decoding small MP3 file on Android. 2016-07-27 13:54:39 +08:00
Ricardo Quesada b336aa3219 testcase: add test case for issue #16100
delays camera creation

fix issue #16100
2016-07-26 19:03:54 -07:00
Dale Stammen d5809129c4 update libcocos2d version to v3.13 2016-07-26 12:34:36 -07:00
Ce Zheng 9903d31031 fix CCImage premultipliedAlpha for ETC format
translucent part of ETC format textures are rendered too bright due to
the fact that v3.12 sets PremultipliedAlpha to true by default. This
commit sets default value of _hasPremultipliedAlpha = false, deletes
unnecessary `_hasPremultipliedAlpha = false` code in multiple places,
making ETC format's _hasPremultipliedAlpha false while keeping other
formats unchanged.
2016-07-26 19:17:10 +09:00
minggo 6109ca6e4b Merge pull request #16216 from mogemimi/remove-unnecessary-extern
Remove unnecessary 'extern' to prevent compiler warnings
2016-07-26 15:19:11 +08:00
minggo 6fb4410232 Merge pull request #16213 from CocosRobot/update_lua_bindings_1469498667
[ci skip][AUTO]: updating luabinding & jsbinding automatically
2016-07-26 15:12:48 +08:00
mogemimi 0894662eff Remove unnecessary 'extern' to prevent compiler warnings 2016-07-26 12:42:43 +09:00
CocosRobot 9566a0cb24 [ci skip][AUTO]: updating luabinding & jsbinding automatically 2016-07-26 02:06:58 +00:00
minggo e1204c6138 Merge pull request #16210 from dumganhar/fix/std-bind
Remove unneeded std::bind, and use const & for input parameters.
2016-07-26 09:58:01 +08:00
mogemimi 093ef3a14f Fix typos in variable names 2016-07-26 04:06:01 +09:00
James Chen bf80f10dfd Remove unneeded std::bind, and use const & for input parameters. 2016-07-26 00:55:32 +08:00
minggo 662a1636c3 replace __system_property_get (#16205)
* replace __system_property_get

* fix comment
2016-07-25 18:30:47 +08:00
CocosRobot e0abb981d5 [ci skip][AUTO]: updating luabinding & jsbinding automatically 2016-07-25 09:39:34 +00:00
halx99 bf996c5bac Add ETC1 builtin alpha support. (#16118)
* Add ETC1 builtin alpha support.

* Rename setETC1AlphaFileEndix to setETC1AlphaFileSuffix

* Check whether etc1 alpha suffix is empty

* fix Code ident & Add etc1 alpha test case to SpriteTest.

* Remove unused ETC1AA shader programs

* Fix all review issues and endl issues

* Add a new TriangleCommand::init() with Texture2D* instead of GLuint textureID

* #fix issues
2016-07-25 17:31:54 +08:00
minggo cc14a06800 Issue 14206 (#16201)
* don't trigger applicationWillEnterForeground at first time to be the same as iOS

* rename first to firstTime
2016-07-25 14:25:48 +08:00
mogemimi 15030ad4c3 Fix typos in log messages 2016-07-25 02:53:22 +09:00
minggo 4c2234fe20 get correct control code 2016-07-22 14:30:06 +08:00
minggo a97906a280 Merge pull request #16184 from minggo/issue-16161
Issue 16161
2016-07-22 13:51:54 +08:00
minggo 391d97d1dd improve log info 2016-07-22 11:56:41 +08:00
minggo 8419cc2662 Merge pull request #16183 from SaxonDruce/android-willplaymusic
Implement willPlayBackgroundMusic() on Android
2016-07-22 10:57:26 +08:00
minggo fcd02f109e Merge pull request #16189 from mogemimi/fix-docs-typo
Fix typos in documentation and comments
2016-07-22 10:55:05 +08:00
Ricardo Quesada 1a834ebdbf fix: FPS appears again
Sets default glviewport() when the GLView::updateDesignResolutionSize()
is called

github issue #16139
2016-07-21 15:12:57 -07:00
mogemimi 94d4971ddc Fix typos in documentation and comments 2016-07-22 02:05:19 +09:00
SaxonDruce bbedddbf08 Fix bugs with music not resuming when iOS app is reactivated (#16178)
* Pause instead of stopping music on resign

The [audioSource stop] causes the music to be stopped, and therefore it fails to resume later on a call to [audioSource resume], due to the addition of the if (!stopped) check in resume added in 26a04b38f2

* Don't re-pause music that has already been paused

In this situation:

1. Start game, music plays
2. Switch to Music app, game music paused, start other music
3. Switch to game, game music not resumed due to other music playing
4. Switch to Music app, stop other music
5. Switch back to game, game music should resume due to no other music playing

At step 5 the game music doesn't currently resume. This is because at step 4 when switching to the Music app, the game music gets re-paused (actually isPlaying is false, so systemPaused is set to NO, even though the music *is* still paused). This causes the music to not be resumed at step 5.

This change fixes this, by skipping the pause logic if systemPaused is already true.

Note that this is dependent on https://github.com/cocos2d/cocos2d-x/pull/16178

* Fix typo in previous fix.
2016-07-21 17:41:24 +08:00
James Chen 233f2111b9 fixed #16170: Random crash in alGenBuffers(AudioCache::readDataTask) at startup. (#16182)
* fixed #16170: Random crash in alGenBuffers(AudioCache::readDataTask) at startup.

* Minor fix: should -> may

* Minor fix: updates comments.

* Update comment.

* Comment fix again.
2016-07-21 16:51:04 +08:00
minggo bb25bed6f2 Merge pull request #16164 from dumganhar/fix/iss16046-fps-clock
Uses std::chrono::steay_clock for calculating dt.
2016-07-21 16:01:58 +08:00
minggo 35cea378a9 Merge pull request #16172 from cezheng/fix/label_text_formatter_right_alignment
fix label text formatter right alignment
2016-07-21 15:21:12 +08:00
James Chen bb004c5e22 [audio] Fixes some issues while stop/uncache right after play/preload on OSX/iOS platform. (#16147)
* [audio] Fixes some issues while stop/uncache right after play/preload on OSX/iOS platform.

* Better state control in AudioCache.

* Adds State enum class which contains INITIAL, LOADING, READY, FAILED states.
* AudioPlayer::destroy should check AudioCache::_isAudioLoaded flag, otherwise, app will freeze in cpp-tests/NewAudioEngineTest/6:Test invalid audio file.

* Should check whether state is INITIAL in the destructor of AudioCache.

* Adds test case for switching play state frequently.

* Skips invoking reading data callback if cache's state is INITIAL.

* Variables initialization for AudioCache class and fixes protential missing delete AL buffers.
2016-07-21 14:57:59 +08:00
minggo b8f8ff0d25 Merge pull request #16177 from mogemimi/fix-constant-spelling
Fix typo in constant name
2016-07-21 14:41:35 +08:00
Saxon Druce de091cd3d9 Implement willPlayBackgroundMusic() on Android, to return false if there is other music already playing in another app. 2016-07-21 14:29:13 +08:00
minggo 26dd7b2698 remove curl link for Android 2016-07-21 11:56:56 +08:00
CocosRobot 708dab448d [ci skip][AUTO]: updating luabinding & jsbinding automatically (#16175) 2016-07-21 10:11:14 +08:00
mogemimi 17dfd03fa7 Fix typo in constant name 2016-07-21 00:49:19 +09:00
Ricardo Quesada 62f1762ea9 Merge pull request #16165 from ricardoquesada/issue_16105_bis
fix: stagger tilemaps hexa works as expected
2016-07-20 05:06:31 -07:00
Ce Zheng 35b848e842 fix label text formatter right alignment 2016-07-20 18:08:15 +09:00
James Chen 2e5626236b Remove unused code in cocos/audio/openal 2016-07-20 14:49:39 +08:00
minggo e19393fa23 Merge pull request #16123 from ricardoquesada/issue_15805
Fix: not cransh on android when mapBuffer() is not present
2016-07-20 14:10:04 +08:00
Ricardo Quesada b3218c1e58 fix: stagger tilemaps hexa works as expected
Github issue #16105
2016-07-19 22:55:05 -07:00
James Chen ddb25ca563 Uses std::chrono::steay_clock for calculating dt. 2016-07-20 12:43:40 +08:00
Ricardo Quesada cd495f68ba Fix: not cransh on android when mapBuffer() is not present
more info:
https://www.khronos.org/registry/gles/extensions/OES/OES_mapbuffer.txt

add methods to check whether or not glMapBuffer exists
2016-07-19 21:00:50 -07:00
Ricardo Quesada cc947737dd Merge pull request #16160 from ricardoquesada/issue_16139
fix: display FPS again on GLFW platforms
2016-07-19 19:19:31 -07:00
minggo 66e29ba82d Merge pull request #16151 from mogemimi/fix-function-spelling
Fix spelling for `getPolygonCenter` function
2016-07-20 09:56:51 +08:00
Ricardo Quesada 5f0c0163b3 fix: display FPS again on GLFW platforms
Apparently GLFW stop emitting some events that creation time.
2016-07-19 18:26:14 -07:00
mogemimi 5bd2d74078 Fix spelling for `getPolygonCenter` function 2016-07-19 08:24:22 +09:00
mogemimi 60dbbde3eb Fix misspelled enum: POLYGEN -> POLYGON 2016-07-18 19:10:07 +09:00
CocosRobot cbcbeb96b3 [ci skip][AUTO]: updating luabinding & jsbinding automatically 2016-07-18 06:20:59 +00:00
minggo 04ebd952a0 Merge pull request #16137 from yalab/cocosstudio_with_texturepacker
Fixed to use cocosstudio LoadingBarReader with TexturePacker.
2016-07-18 14:14:49 +08:00
James Chen 15ef80e27d [big refactoring] Audio latency fix for Android. Support to preload effects on Android now. (#15875)
* Audio latency fix for Android. Support preload effects on Android now.

Squashed commits:
[b6d80fe] log fix
[a0a918e] Fixes assetFd didn't be released while PcmData is returned from cache.
[4b956ba] Potential crash fix for PcmAudioPlayer while pause / resume.
[398ab8c] Updates LOG_TAG position in AudioEngine-inl.cpp
[e3634e7] include stdlib.h for posix_memalign
[9004074] fixes setVolume logical error.
[c96df46] Don't use another thread for mixing, enqueue is in a seperated thread, therefore doing mixing in another thread will waste more time.
[0a4c1a8] Adds setLoop, setVolume, setPostion support for Track
[c35fb20] Fixed include.
[cdd9d32] Do mixing by ourself. (TO BE POLISHED)
[6447025] µ -> u since µ could not be shown on some android devices.
[97be0c6] Don't send a silence clip.
[c1607ed] Make linter.py happy.
[0898b54] Puts enqueue & SetPlayState in PcmAudioPlayer::play to thread pool.
[b79fc01] Adds getDuration, getPosition support for PcmAudioPlayer
[80fa2ab] minor fix of the code position of resetting state to State::INITIALIZED
[d9c62f1] underrun fix for PcmAudioPlayer.
[9c2212a] UrlAudioPlayer, playOverMutex should be static, and should be used in update method.
[1519d2e] static variables
[19da936] _pcmAudioPlayer Null pointer check in AudioPlayerProvider.
[e6b0d14] Updates audio performance test.
[fc01dd4] Registers foreground & background event in AudioEngine-inl.cpp(android), the callback should invoke `provider`'s pause & resume method.
[e00a886] TBD: Pause & resume support for PcmAudioPlayerPool.
Since OpenSLES audio resources are expensive and device shared, we should delete all unused PcmAudioPlayers in pool while pause and re-create them while resume.
But this commit isn't finished yet, I don't find a better way to register pause&resume event in AudioEngine module.
[9e42ea3] Interleave mono audio to stereo audio. PcmAudioPlayerPool only contains PcmAudioPlayers with 2 channels.
[3f18d05] Adds a strategy for checking small size of different file formats.
[753ff49] Adds performance test for AudioEngine.
[09d3045] Releases an extra PcmAudioPlayer for UrlAudioPlayer while allocating PcmAudioPlayer fails.
[9dd4477] Using std::move for PcmData move constructor & move assignment.
[6ca3bcb] some fixes:
1) new -> new (std::nothrow)
2) break if allocate PcmAudioPlayer fails
3) renames 'initForPlayPcmData' to 'init'
4) PcmAudioPlayer destructor deadlock if 'init' failed
[54675b6] include path fix.
[a1903ca] More refactorings.
[19b9498] Makes linter.py happy. :)
[923c530] Fixes:
1) Avoid getFileInfo to be invoked twice
2) A critical bug fix for UrlAudioPlayer and adds detailed comments
3) __clang__ compiler option fix for AudioResamplerSinc.cpp.
[5ec4faf] minor fix.
[faaa0f3] output a log in the destructor of UrlAudioPlayer.
[9c20355] NewAudioEngineTest,TestControll crash fix.
[f114464] fixes an unused import.
[1dc5dab] Better algorithm for allocating PcmAudioPlayer.
[331a213] minor fix.
[e54084a] null -> nullptr
[f9a0389] Support uncache.
[89a364f] Removes unused update, and TODO uncache functionality.
[1732bf9] Supports AudioEngineImpl::setFinishCallback for android.
[43d1596] UrlAudioPlayer::stop fix.
[e2ee941] Test case fix in NewAudioEngineTest/AudioIssue11143Test
[5c5ba01] More fixes for making cpp-tests/New Audio Engine Test happy.
[8b554a3] Adds log while remove player from map.
[ed71322] If original file is larger than 30k bytes, consider it's a large audio file.
[fb1845a] Updates project.properties
[6f3839f] minor log output fix in AudioEngine-inl.cpp
[c68bc6c] Don't resample if the sample rate of the decoded pcm data matchs the device's.
[43ca45f] PcmAudioPlayers also need to be removed while they play over, but should not be deleted since their lifecycle is managed by PcmAudioPlayerPool.
[f5e63c9] Audio latency fix for Android. Support preload effects on Android now.

* Supports to loading audio files asynchronously.

* Crash fix for stop audio right after play2d.

* Minor fix for logic in AudioMixerController.cpp

* Adds missing files (CCThreadPool.h/.cpp).

* Minor fix for including.

* Minor fix for missing include <functional> in Track.h

* update license information in audio.h

* Don't use std::future/std::promise anymore since ndk counldn't support it well in armeabi arch.

* isSmallFile postion updated, fixes large audio file goto the checking logic of cache.

* std::atomic<int> isn't supported by ndk-r10e while compiling with `armeabi` arch, using a int with a mutex instead.

* fixes __isnanf & posix_memalign doesn't exist on low api (<=16) devices.

* namespace updated: cocos2d -> cocos2d::experimental

* Removes commented code in AudioMixerController.h/.cpp

* Removes unused code again, and fixes a memory leak of `Track` instance.

* Oops, namespace changed.

* Only outputs log in debug mode.

* Uses ALOGV for outputing logs in AudioEngine-inl.cpp

* const PcmData& ->  PcmData for Track

* Fixes a protential crash in NewAudioEngineTest

* Adds `COCOS` prefix in header #ifndef COCOS_BALABALA #define COCOS_BALABALA

* Uses _ prefix for cocos code style instead of `m` prefix.

* Deletes AudioResamplerSinc related files.

* Bug fix from @minggo's reply on github.

* Don't need to invoke pause after in UrlAudioPlayer::prepare.

* Updates ThreadPool class, uses enum class and adds const keyword.
2016-07-18 10:22:40 +08:00
yalab ef21e44d9c Fixed to use cocosstudio LoadingBarReader with TexturePacker. 2016-07-17 16:30:17 +09:00
mogemimi d931c62649 Fix typos in documentation comments 2016-07-16 04:18:40 +09:00
minggo 1544b8eed0 Merge pull request #16127 from mogemimi/add-missing-fclose
Add missing fclose() to fix a possible bug caused by PR #16114
2016-07-15 18:32:33 +08:00
minggo 8b289d2385 fix bug that virtual button is not hidden after keyboard dismissed
* fix compiling error with --android-studio

* hide virtual button after keyboard dismiss

* remove unneeded log
2016-07-15 18:25:48 +08:00
mogemimi 07d0b4412f Add missing fclose() to fix a possible bug caused by PR #16114 2016-07-15 17:04:14 +09:00
minggo 38b3ab6853 Merge pull request #16114 from mogemimi/use-fstat-instead
Use fstat instead of fseek and ftell for performance and portability
2016-07-15 15:39:22 +08:00
Ricardo Quesada 9166c28e75 Merge pull request #16101 from mtak-/glprogram_buffer_overflow_fix
fix buffer over-read in CCGLProgram.cpp in memcmp call (Address Sanitizer...
2016-07-14 17:12:17 -07:00
Ricardo Quesada 1563d14447 Squashed commit of the following:
commit c8349caeca6ff5ebacf497eaa986e71d5f1c2c0d
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Thu Jul 14 11:19:50 2016 -0700

    fix: works with odd sized maps

commit da4cf8bc19c9cdab148d60e03a25ee9cc4292b66
Author: zhangbin <zhangbin@cocos2d-x.org>
Date:   Wed Jul 13 13:45:57 2016 +0800

    Add test case.
2016-07-14 11:21:24 -07:00
halx99 9e80526251 #Use std::string reference instead of char* for utils::findChild (#16117)
* #Optimize, Use std::string reference instead of char* for utils::findChild

* Check Node::INVALID_TAG

* revert submodules
2016-07-14 13:52:30 +08:00
minggo 125b0601c3 Merge pull request #16091 from mtak-/data_clear_on_move
fix leak in Data on move assignment
2016-07-14 11:40:19 +08:00
mogemimi 8b05476d45 Use fstat instead of fseek and ftell for performance and portability 2016-07-14 01:18:44 +09:00
minggo 261f1ef780 Merge pull request #16094 from stevetranby/patch-1
Match parent's camera mask when adding child.
2016-07-13 16:33:17 +08:00
minggo c5c846f6e1 Merge pull request #16107 from cezheng/fix/EaseExponentialOut_clone_crash
fix crash in EaseExponentialOut::clone()
2016-07-13 16:32:48 +08:00
mogemimi 98cc48bc62 Add missing override keyword 2016-07-13 15:03:53 +09:00
Ce Zheng cf18857206 fix crash in EaseExponentialOut::clone() 2016-07-13 14:28:04 +09:00
Ricardo Quesada 1824b21cb7 Merge pull request #16090 from ricardoquesada/issue_15566
fixes issue #15566
2016-07-12 21:36:52 -07:00
minggo 8561e5f868 Merge pull request #16089 from mogemimi/avoid-double-promotion
Use std::abs to avoid overhead of casting float to double
2016-07-13 12:01:20 +08:00
Ricardo Quesada 05a772115e fixes issue #15566
lua and javascript for arm64 is not compiled

version 103

uses JPEG 9b for android

using armeabi

uses Lua, and not LuaJIT for Android ARM64
2016-07-12 19:03:53 -07:00
Tyler Kopf 15c6788783 fix buffer overflow in CCGLProgram.cpp in memcmp call (Address Sanitizer spots it easily)
- previously the flow went memcmp, if that != 0, do a bounds check, etc
- now do a bounds check, if destSize >= srcSize, do memcmp, etc
2016-07-12 11:10:16 -07:00
mogemimi b9c78ac41c Use std::abs to avoid overhead of casting float to double 2016-07-13 00:55:11 +09:00
coderwj c9ad76e56a Fix a bug, in lua can't get the "backClicked" but a nil
in lua, I registerScriptKeypadHandler,when debug on Andriod, after clicking back button, I didn't get "backClicked",but a nil 
I see that in CHANGELOG:
cocos2d-x-3.1  May.24 2014
    [FIX]           EventKeyboard::KeyCode: key code for back button changed from KEY_BACKSPACE to KEY_ESCAPE
so,I fix it , and get the right "backClicked"
2016-07-12 17:37:33 +08:00
halx99 c0e0931838 fix, replace std::sort by std::stable_sort (#16092)
* fix, replace std::sort by std::stable_sort
2016-07-12 13:46:38 +08:00
Steve Tranby f162ffe2ae Match parent's camera mask when adding child. 2016-07-12 00:07:41 -05:00
Tyler Kopf 5ecd016a9e fix leak in Data on move assignment 2016-07-11 15:33:51 -07:00
CocosRobot 3aeefd911e [ci skip][AUTO]: updating luabinding & jsbinding automatically 2016-07-11 07:54:54 +00:00
minggo 3d5789ee77 Merge pull request #16077 from mogemimi/fix-documentation-comments
Fix documentation when compile with -Wdocumentation and Clang
2016-07-11 15:49:28 +08:00
minggo 9c7d44ccd7 Merge pull request #16080 from minggo/use-std_abs
use std::abs instead
2016-07-11 12:02:10 +08:00
minggo 2ca1760b78 Merge pull request #16079 from minggo/use-std_srand
use std::srand() instead
2016-07-11 12:01:38 +08:00
minggo 3dc167a9f9 use std::abs instead 2016-07-11 12:01:09 +08:00
minggo a146f3eec7 use std::srand() instead 2016-07-11 11:17:28 +08:00
mogemimi 7531c5156b Fix documentation when compile with -Wdocumentation and Clang 2016-07-10 17:38:32 +09:00
Ricardo Quesada 995868c62e fix: Text::create() does not crash on mac/ios
...on invalid unicode.

fixes issue #16073
2016-07-08 16:59:44 -07:00
minggo c267167d07 Merge pull request #16069 from minggo/ndkr12b-issue
fix compiling and linking error with ndk r12b
2016-07-08 17:01:09 +08:00
minggo 4e125d84a4 fix compiling and linking error with ndk r12b 2016-07-08 15:29:35 +08:00
minggo 8d8c295ff0 Merge pull request #16062 from minggo/fileutils-issue
fix bug that FileUtils::removeDirectory() can not work on all platforms except iOS and Mac
2016-07-08 14:54:25 +08:00
CocosRobot 8fe92fbd4b [ci skip][AUTO]: updating luabinding & jsbinding automatically 2016-07-07 19:04:04 +00:00
Ricardo Quesada 891fe706da Merge pull request #16057 from ricardoquesada/issue_12226
test: add test case for Github issue #12226
2016-07-07 08:34:30 -07:00
minggo 836acff6d0 Merge pull request #16060 from minggo/merge-v312
Merge v312
2016-07-07 18:29:28 +08:00
minggo 4511b35b51 fix bug that FileUitls::removeDirectory() can not work on all platforms except iOS and Mac 2016-07-07 17:43:19 +08:00
minggo 734d857ced Merge branch 'v3.12' into merge-v312 2016-07-07 15:13:21 +08:00
Ricardo Quesada 6d5a94e569 test: add test case for Github issue #12226
Adds test case for Github issue #12226
2016-07-06 16:37:15 -07:00
mogemimi 6ce7f3c0e9 Avoid overhead of casting float to double 2016-07-07 01:38:27 +09:00
minggo 8d6acd9ffe Merge pull request #16050 from pandamicro/v3.12
[ci skip]Update JS versions
2016-07-06 17:04:42 +08:00
pandamicro ccb30cefc7 Update JS versions 2016-07-06 17:02:53 +08:00
minggo 6248480b3a Merge pull request #16047 from minggo/issue-14071
[ci skip]convert aplpha channel correctly
2016-07-06 15:59:50 +08:00
minggo d0db838b71 convert aplpha channel correctly 2016-07-06 15:49:05 +08:00
minggo 418907d972 Merge pull request #16044 from pandamicro/v3.12
Improve web template and update web ref
2016-07-06 14:47:23 +08:00
pandamicro 305bd95dc2 More secure release in JSB_closeWindow 2016-07-06 13:55:18 +08:00
CocosRobot cf2646b7a2 [ci skip][AUTO]: updating luabinding & jsbinding automatically 2016-07-06 02:16:03 +00:00
mogemimi bed4e048b6 Fix various typos 2016-07-06 08:27:39 +09:00
minggo 2f1e14dcde fix compiling error 2016-07-05 14:28:30 +08:00
minggo 4c2efb1319 don't read file content if it is empty 2016-07-05 14:27:28 +08:00
minggo 33d1eb4455 don't invoke front() if container is empty 2016-07-05 14:27:11 +08:00
minggo e4aa6d1ef7 Merge pull request #16035 from minggo/issue-16032
remove extra '\'
2016-07-05 14:22:19 +08:00
minggo 0cc8b9fc09 Merge pull request #16031 from MrCapone/fix_GLView
GLView::setFrameSize fixed
2016-07-05 09:54:59 +08:00
minggo 1c9ad5594c remove extra '\' 2016-07-05 09:50:38 +08:00
minggo f666d99192 Merge pull request #16021 from yalab/cocosstudio_with_texturepacker
Fixed to use TexturePacker with cocosstudio.
2016-07-05 09:35:59 +08:00
mogemimi 2650fd1afd Add missing float suffix to avoid -Wdouble-promotion 2016-07-04 23:12:45 +09:00
mr_capone-win7 0e64c2a071 GLView::setFrameSize fixed 2016-07-04 19:48:24 +07:00
minggo b9d6f0d8d6 Merge pull request #16027 from CocosRobot/update_lua_bindings_1467596228
[ci skip][AUTO]: updating luabinding & jsbinding automatically
2016-07-04 11:00:49 +08:00
minggo ca8ff36f2e Merge pull request #16016 from LeeMyoungYeol/v3
Update utils::getTimeInMilliseconds()
2016-07-04 10:55:41 +08:00
CocosRobot 934b2413dc [ci skip][AUTO]: updating luabinding & jsbinding automatically 2016-07-04 01:40:35 +00:00
minggo 8bbeb01be4 Merge pull request #16025 from mogemimi/fix-doc-typo
Fix typos and other mistakes in docs
2016-07-04 09:33:29 +08:00
minggo b380df97c6 Merge pull request #16022 from mogemimi/fix-format-string
Fix format string warning when compiling with Android NDK
2016-07-04 09:31:45 +08:00
mogemimi 2443e09d29 Fix typos and other mistakes in docs 2016-07-04 00:42:10 +09:00
mogemimi 57900112c5 Fix format string warning when compiling with Android NDK 2016-07-03 17:19:17 +09:00
CocosRobot f30a7cf546 [ci skip][AUTO]: updating luabinding & jsbinding automatically 2016-07-03 05:14:11 +00:00
yalab 35968a6fc1 Slidebar can load TextureCache on cocosstudio. 2016-07-02 18:45:20 +09:00
yalab c675675de5 Fixed to use TexturePacker with cocosstudio. 2016-07-02 17:31:32 +09:00
Ricardo Quesada f7d65fbe8a Squashed commit of the following:
commit 3a8ccb54b58f01daaa5b17efcd0e1ab4b7ccf914
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Fri Jul 1 11:05:02 2016 -0700

    Add support for Hex tiled maps

    Based on original patch by https://github.com/JustVic
    Original patch:
    https://github.com/cocos2d/cocos2d-x/pull/13288
    fix: tiled hex maps

    Hexagonal TileMaps Support

    fix: odd, even works as expected

    still problems with rendering order

    fix: fixes layer position in Hex

    fix render ordering
2016-07-01 15:51:00 -07:00
minggo c1949be617 Merge pull request #16017 from minggo/issue-15978
don't search APK if the path is absolute
2016-07-01 17:21:37 +08:00
minggo 12442521b2 don't search APK if the path is absolute 2016-07-01 15:42:02 +08:00
이명열 853e083c68 - The result comes across as negative.(device android) 2016-07-01 15:32:43 +09:00
mogemimi 2354df9faf Fix getSubStringOfUTF8String bug 2016-07-01 15:16:35 +09:00
pandamicro d02bdda781 Fix callfunc released with retained data (callback, target, extradata) issue 2016-07-01 10:56:17 +08:00
CocosRobot 94de257115 [ci skip][AUTO]: updating luabinding & jsbinding automatically 2016-07-01 02:16:32 +00:00
minggo 043d81be1c Merge pull request #16008 from yalab/cocosstudio_with_texturepacker
cocosstudio can manage TexturePacker Image.
2016-07-01 10:10:09 +08:00
halx99 2610ad77cc #15965: remove unused _orderOfArrival (#16009) 2016-07-01 10:09:25 +08:00
yalab c5648db10a cocosstudio can manage TexturePacker Image. 2016-06-30 18:10:08 +09:00
CocosRobot 274a82c7f5 [ci skip][AUTO]: updating luabinding & jsbinding automatically (#16001) 2016-06-29 22:56:13 +08:00
minggo 47442b9d8b Merge pull request #15997 from mogemimi/fix-variable-names
Fix some minor typos in local variable names
2016-06-29 14:24:00 +08:00
CocosRobot ef01ac4465 [ci skip][AUTO]: updating luabinding & jsbinding automatically 2016-06-29 04:47:21 +00:00
Ricardo Quesada b1f93b2679 fix: not leak Toggle items
Github issue: fixes #13351
2016-06-28 20:41:47 -07:00
mogemimi c0f2194961 Fix some minor typos in local variable names 2016-06-29 11:04:11 +09:00
Drakon-Cocos 7302ad979a Can set scroll to item duration in ListView and derived classes (#15964)
* Can set scroll to item duration in ListView and derived classes (e.g. PageView)

* Parameter no more 'const'. Comments
2016-06-29 09:48:03 +08:00
minggo ecf97575ad Revert "Added CCGLViewImpl.h" 2016-06-29 09:45:05 +08:00
minggo feb513c7eb Merge pull request #15982 from mogemimi/fix-typo
Fix typo: destoryMark -> destroyMark
2016-06-29 09:41:59 +08:00
minggo 076e0b488b Merge pull request #15980 from minggo/merge-v312
Merge v312
2016-06-29 09:41:30 +08:00
kuzy000 8598003b55 Added CCGLViewImpl.h (#10501)
* Added CCGLViewImpl.h for more consistency

* fixed indentation
2016-06-29 09:36:13 +08:00
mogemimi 2060b333ca Fix typo: destoryMark -> destroyMark 2016-06-29 10:04:31 +09:00
minggo 0c290540df Merge pull request #9823 from ericmux/frame-independent-ms
Making CCMotionStreak _maxPoints framerate independent.
2016-06-28 18:29:14 +08:00
minggo bbd837aefa merge v3.12 back to v3 2016-06-28 17:53:50 +08:00
pandamicro d46cd96896 Don't warn user about API deprecation 2016-06-28 12:11:21 +08:00
pandamicro e7e365a00f Fix window.close crash in JSB 2016-06-28 11:59:55 +08:00
mogemimi 2a853ba73e Avoid const_cast when calling Node::setAdditionalTransform 2016-06-27 19:33:45 +09:00
minggo d7cb7676bc Merge pull request #15966 from mogemimi/improve-refptr
Improve RefPtr to avoid casting when possible
2016-06-27 10:07:54 +08:00
mogemimi a287e696c9 Improve RefPtr to avoid casting when possible 2016-06-26 21:39:43 +09:00
Alfonso Grillo b6fa894f81 Fix page view indicator opacity for inactive pages 2016-06-25 18:49:13 +02:00
mogemimi bc51528301 Fix typo in FileUtils::Status enum 2016-06-25 12:58:55 +09:00
Ricardo Quesada 04a01b65f4 fix: FPS appears on iOS
`glViewport()` has a default value so that it has a valid value
after `Scene::render()` exits

Github issue #15934
2016-06-24 11:44:55 -07:00
Ricardo Quesada 4f973044ac fix: FPS appears on iOS
`glViewport()` has a default value so that it has a valid value
after `Scene::render()` exits

github issue #15934
2016-06-24 11:40:13 -07:00
minggo 26fb64395a Merge pull request #15954 from pandamicro/v3.12
Fix easing action crash because the js object is not rooted
2016-06-24 17:21:41 +08:00
Ricardo Quesada 0872cccd67 fix: collection of vr fixes (#15948)
* fix: collection of vr fixes

* Node::additionalTransform() and Node::setNodeToParentTransform() can be used at the same time
* Node allocs _additionalTransform in runtime taking 60 bytes lees for 99% of the nodes
* Node calculates the transform faster when an additionalTransform is being used
* VR works when the camera is being moved manually with setNodeToParentTransform
* VR has its own tests
* VR can be disabled and works as expected

* doc: documentation for the new fix

* fix: restore submodule web

* fix: compile and link on iOS

* fix conflicts
2016-06-24 16:55:28 +08:00
pandamicro 8cb2e93644 Fix easing action crash because the js object is not rooted 2016-06-24 14:38:59 +08:00
mogemimi 0dce4961ee Avoid implicit conversion from size_t to int 2016-06-24 15:15:45 +09:00
minggo 2931b310cf Merge pull request #15942 from zilongshanren/improveEditBox
Improve edit box
2016-06-24 10:27:22 +08:00
minggo b29fbf0fc8 Merge pull request #15885 from Sumxx/v3
fix restart game crash in FT_Get_Char_Index
2016-06-24 10:08:32 +08:00
Ricardo Quesada 69d2ac1786 fix: collection of vr fixes (#15947)
* fix: collection of vr fixes

Node: additionalTransform() has its own dirty variable
VR: disabling VR works as expected
VR: works with camera3d test
VR: iOS Tracking works even if it doesn't have any input

fix: setNodeToParentTransform() and setAdditionalTransfrom() work...

...at the same time.
Also, this PR makes the size of Node smaller. `_additionalTransform` is
no longer an inline object.
Instead, it is allocated on demand making 99% of the Nodes smaller by 60
bytes.

fix: compile in windows

* doc: documentation for this fix
2016-06-24 10:03:38 +08:00
minggo 86af4cdab8 Merge pull request #15897 from halx99/patch-4
luabindings: Add script with utf-8 bom support.
2016-06-24 09:58:41 +08:00
minggo dbc083b924 Merge pull request #15939 from halx99/patch-2
Optimize, remove unnecessory truncate.
2016-06-24 09:54:57 +08:00
minggo 1042b18999 Merge pull request #15936 from mogemimi/use-nullptr-instead
Use nullptr instead of 0 or NULL whenever possible
2016-06-24 09:54:15 +08:00
mogemimi b7982fd8e0 Fix -Wreturn-type warnings when compiling JSB with Clang 2016-06-24 08:48:21 +09:00
Ricardo Quesada e681a9b5d1 fix: fix delay when creating QuadCommands
starts with a bigger buffer, and also increases buffer by 25% if needed.
triggered by particles.

Github issue #15937
2016-06-23 09:19:21 -07:00
Ricardo Quesada 9e0371a3b8 fix: fix delay when creating quadcomamnds
triggered by particles.

Github issue #15937
2016-06-23 09:17:26 -07:00
zilongshanren 459b7f30c6 refactoring Android editbox setVisible API
fix set visible issue of android editbox

fix android lower case multiline

revert unkown changes
2016-06-23 18:18:39 +08:00
halx99 cd93612746 Optimize, remove unnecessory truncate. 2016-06-23 16:01:05 +08:00
zilongshanren a6b0ea76de improve editbox test and font creation 2016-06-23 15:57:41 +08:00
minggo ee7ceee007 Merge pull request #15874 from mogemimi/fix-unused-variable
Fix unused variable warnings when compiling release mode
2016-06-23 15:55:11 +08:00
minggo 08898db883 Merge pull request #15831 from j-jorge/premultiplied-alpha-config
Add a config option to enable or disable the premultiplied alpha code.
2016-06-23 13:57:41 +08:00
halx99 ba55723178 Update CCLuaStack.cpp 2016-06-23 13:42:38 +08:00
mogemimi cbc0612306 Use nullptr instead of 0 or NULL 2016-06-23 12:39:23 +09:00
halx99 90434e58d0 fix compile error. 2016-06-23 11:37:20 +08:00
子龙山人 bac1870d16 fix android editbox custom font file (#15924)
* fix android editbox custom font file

* simplify get real font name on Android
2016-06-23 11:26:32 +08:00
halx99 c4def57774 Update CCLuaStack.cpp
Lua script utf-8 bom support, handle encrypted script.
2016-06-23 10:24:22 +08:00
minggo 597fb61a78 Merge pull request #15922 from dumganhar/fix/lua-binding
Some lua bindings fixes:
2016-06-23 10:00:45 +08:00
Ricardo Quesada ec5155137f Merge pull request #15933 from ricardoquesada/issue15932
fix: not crash after removing a physics body right after...
2016-06-22 15:28:56 -07:00
Ricardo Quesada ff71ffae84 fix: not crash after removing a physics body right after...
adding it.
2016-06-22 14:12:27 -07:00
Ricardo Quesada a31279f8cb fix: reverse iterator on events + doesn't use additionalTransform
use reverse Camera iterator when traversing events (of course).
but somehow setAdditionalTransform() breaks
setNodeToParentTransform(). And since setAdditionalTransform is not
needed, we just don't use it.

Github issue #15909
2016-06-22 11:28:58 -07:00
Ricardo Quesada edafe726cc fix: reverse iterator on events + doesn't use additionalTransform
use reverse Camera iterator when traversing events (of course).
but somehow `setAdditionalTransform()` breaks
`setNodeToParentTransform()`. And since `setAdditionalTransform` is not
needed, we just don't use it.

Github issue #15909
2016-06-22 11:22:47 -07:00
minggo 7828b505fe Merge pull request #15925 from minggo/andriod-preload
[ci skip]return true for preload though it is not implemented
2016-06-22 18:19:09 +08:00
minggo 82597d4305 Merge pull request #15920 from dumganhar/fix/particle
Fix ParticleSystem::_paused varible isn't initialized. Particle will show or hide after being created randomly.
2016-06-22 18:10:55 +08:00
minggo 324931a242 Merge pull request #15919 from zilongshanren/fix-android-system-fontname
fix system font creation on Android platform
2016-06-22 18:10:13 +08:00
James Chen 710ab777dd Some lua bindings fixes:
1) Reverts changes in  #15443, the behavor of LuaEngine::handleCommonEvent should not be changed. empty eventName should be supported, otherwise it will break compatiblity.
2) Null pointer check in CommonScriptData initialization
3) No error callback in lua (fixed #15904)
2016-06-22 17:48:17 +08:00
minggo 465da95c01 return true for preload though it is not implemented 2016-06-22 17:41:04 +08:00
James Chen 09d5fd3f90 Fix ParticleSystem::_paused varible isn't initialized. Particle will show or hide after being created randomly. 2016-06-22 16:54:57 +08:00
zilongshanren 783dfb3f14 fix system font name on Android ttf creation 2016-06-22 16:54:01 +08:00
James Chen 67dd4b0684 JSScript* may be garbage collected before the next time execute the same JS file.
It will crash in JS_ExecuteScript.
2016-06-22 16:18:20 +08:00
minggo 9fd190d283 Merge pull request #15916 from dumganhar/fix/AssetsManager
fix AssetsManager could not work after Pull Request #13893 was merged.
2016-06-22 15:25:18 +08:00
James Chen 8e19db7d26 fix AssetsManager could not work after Pull Request #13893 was merged. 2016-06-22 14:31:26 +08:00
CocosRobot 4a5bedc6e6 [ci skip][AUTO]: updating luabinding & jsbinding automatically 2016-06-22 05:52:51 +00:00
minggo 9d0801834e Merge pull request #15893 from halx99/patch-1
Optimize, avoid unnecessary memory alloc & copy
2016-06-22 13:44:40 +08:00
minggo cdc3b2b9f1 Merge pull request #15903 from minggo/fileutil-directory-exists
should use full path to check directory
2016-06-22 13:40:07 +08:00
James Chen cffc9cecd7 cc.Node.ignoreAnchorPointForPostion was deprecated, lua/js script should handle this. 2016-06-22 11:05:04 +08:00
mogemimi a3bc979452 Fix typos in documentation and comments 2016-06-22 11:22:05 +09:00
minggo 6b9c76fd93 should use full path to check directory 2016-06-22 10:19:35 +08:00
Ricardo Quesada 414f1d4252 fix: little menu fixes
does not execute `dynamic_cast<>` in release mode
uses for(:) instead of the old way
2016-06-21 16:46:27 -07:00
zilongshanren 2d3785c03d fix tizen compile error 2016-06-21 19:50:00 +08:00
halx99 f41130bafe luabindings: Add script with utf-8 bom support. 2016-06-21 14:31:25 +08:00
halx99 654d17d27c Update CCFontFNT.cpp 2016-06-21 11:25:11 +08:00
halx99 51ba45ae26 Optimize, avoid unnecessary memory alloc & copy 2016-06-21 10:52:25 +08:00
Ricardo Quesada ca677f2be1 fix: not crash if CC_SPRITE_DEBUG_DRAW is enabled in SpriteBatchNode
`SpriteBatchNode` was trying to render `DrawNode` when
`CC_SPRITE_DEBUG_DRAW` was enabled.

Github issue #14730
2016-06-20 19:13:53 -07:00
Julien Jorge 6fb3946c51 Add a config option to enable or disable the premultiplied alpha code. 2016-06-20 18:05:11 +02:00
minggo ad28d44d2f Merge pull request #15878 from cezheng/build_for_android6/downloader
fix downloader build issue for Android API 23
2016-06-20 13:38:22 +08:00
mogemimi f0028e5459 Fix unused variable warnings when compiling release mode 2016-06-20 09:23:42 +09:00
sum 4700bbce43 fix restart game crash in FT_Get_Char_Index 2016-06-19 03:22:57 +08:00
Ricardo Quesada 35008702bf fix: underline will have the same solor as text in TTF
underline will have the same solor as text in TTF when calling
`setColor`. There is another method called `setTextColor` which is
confusing. What does each function?

github issue #15214
2016-06-17 17:23:59 -07:00
Ricardo Quesada d9b3ef55ae Merge pull request #15880 from ricardoquesada/issue-15776
fix: TextureCache ASSERTS if image is invalid
2016-06-17 16:48:19 -07:00
Ricardo Quesada c387f953fa fix: TextureCache ASSERTS if image is invalid
Github issue #15776
2016-06-17 16:07:33 -07:00
Ce Zheng 84db1ac294 fix downloader build issue for Android API 23
fixes #15823
2016-06-17 22:32:49 +09:00
minggo ed955cbe1d update version 2016-06-17 18:09:27 +08:00
CocosRobot 4c233b8df7 [ci skip][AUTO]: updating luabinding & jsbinding automatically 2016-06-17 02:22:58 +00:00
minggo 6778ebf451 Merge pull request #15853 from ricardoquesada/vr_squashed
Squashed commit of the following:
2016-06-17 10:15:20 +08:00
minggo e9cf762304 Merge pull request #15866 from minggo/remove-compiling-flag
remove gcc comipling flag
2016-06-17 09:39:18 +08:00
minggo 6280b8a376 Merge pull request #15870 from mogemimi/fix-unused-function
Remove unused debug function in RenderCommand
2016-06-17 09:38:32 +08:00
minggo 44ced37785 Merge pull request #15825 from dumganhar/iss15652-perf-fix
issue #15652: fix low FPS on some android devices while auto batch is disabled.
2016-06-17 09:37:42 +08:00
mogemimi 0872a50f60 Remove unused debug function in RenderCommand 2016-06-17 03:19:19 +09:00
Ricardo Quesada 08ed2eccd2 fix: using `enum class` instead of `typedef enum` 2016-06-16 07:02:04 -07:00
minggo 832ec5eab4 remove gcc comipling flag 2016-06-16 16:14:50 +08:00
minggo 0db0a45fa0 Merge pull request #15863 from zilongshanren/fix-word-clamp-with-only-one-word-left
fix TTF and BMFont word wrap
2016-06-16 15:01:27 +08:00
minggo 9b210e00d7 Merge pull request #15837 from geemedia/cmake-improvements
Various CMake improvements
2016-06-16 14:53:10 +08:00
minggo d66b686bd8 Merge pull request #15816 from yalab/valuemap_reject_none
Fixed to fail FileUtils::writeValueMapToFile on iOS.
2016-06-16 14:20:46 +08:00
zilongshanren f0f8663fa9 fix TTF and BMFont word wrap 2016-06-16 14:15:00 +08:00
mogemimi 01aaff66c8 Fix -Wsometimes-uninitialized warning in release build 2016-06-16 14:27:52 +09:00
minggo 5fa57ae5c1 Merge pull request #15844 from halx99/patch-1
fix: missing properties for clone
2016-06-16 11:15:13 +08:00
minggo ab0e461b00 Merge pull request #15852 from MSOpenTech/v3-winrt-x64
V3: updated to support Windows 10 UWP x64 builds
2016-06-16 11:08:28 +08:00
minggo d8bd0ff8c8 Merge pull request #15855 from mogemimi/fix-possible-leak
Fix possible memory leak when pass initialization fails
2016-06-16 11:04:03 +08:00
CocosRobot cc2b887dbb [ci skip][AUTO]: updating luabinding & jsbinding automatically 2016-06-16 02:58:46 +00:00
minggo b0f3d43414 Merge pull request #15834 from Shulepov/rendertexture_opacity_modify_rgb
RenderTexture - set opacity modify RGB
2016-06-16 10:52:21 +08:00
Ricardo Quesada 9e40fffb13 fix: remove liboculus 2016-06-15 17:53:01 -07:00
mogemimi 4f329d8aac Fix possible memory leak when pass initialization fails 2016-06-16 04:52:38 +09:00
Ricardo Quesada ccfbc29288 fix travis error 2016-06-15 12:08:40 -07:00
Ricardo Quesada 180c2f1e9a Squashed commit of the following:
VR support for cocos2d-x

commit 087aff0aec24b81418fa2678ce0cae2d4c1e2e01
Merge: b32d329 fc44d0d
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Wed Jun 15 11:26:33 2016 -0700

    Merge branch 'v3' into vr

commit b32d329f9331a4f9bbbbf946b88b31db7559934d
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Wed Jun 15 11:25:27 2016 -0700

    fix: dont' include oculus files

commit 816928c6a8782984830aa92de5bed038c1306cdc
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Wed Jun 15 10:57:26 2016 -0700

    fix: missing guard in header

commit 2abd4eb5a1fc961c2cbae9b00809b5e6409740db
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Wed Jun 15 10:43:49 2016 -0700

    removed VR engines... should be part of package manager

commit 583179755d1c66c02e898297230d0f882e629b98
Merge: 12f4f71 b6d6bb0
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Wed Jun 15 10:42:37 2016 -0700

    Merge branch 'vr' of github.com:ricardoquesada/cocos2d-x into vr

commit 12f4f71aca4fa15231976a7727faf40648d62313
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Wed Jun 15 10:42:12 2016 -0700

    fix: new VR API... easier to enable/disable different VR renderers

commit b6d6bb087f54cbd272fbfb9e1cf1cd6bba776ffa
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Tue Jun 14 20:48:04 2016 -0700

    fix: compiles and runs on win10

commit e73aa8902118377abbd2192c757104c4531d2a9e
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Tue Jun 14 20:27:06 2016 -0700

    fix: vr works again

commit 5615e276507edf8602f043f3130204a89dbaba69
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Tue Jun 14 18:55:18 2016 -0700

    fix: compiles on windows

commit 494061ee4da8fbc5616f83efb64b2c0c3932778e
Merge: 284910b fd3b6d4
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Tue Jun 14 17:13:47 2016 -0700

    Merge branch 'v3' into vr

commit 284910b204ee0dd76d949ea8f2b2f6b1b72e533f
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Tue Jun 14 17:12:25 2016 -0700

    android vr: better performance

commit aa8328e8029143dd7c6c724f38915f0fb3b64abe
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Mon Jun 13 16:10:14 2016 -0700

    fix: low pass filter in accel and magnet

commit f6d9b622abff5abb95ad60fa7139f3ce1ec9caab
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Mon Jun 13 15:43:00 2016 -0700

    fix: removes debugging info

commit 2004f0ce5605dad70ff8656a058073181346f083
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Mon Jun 13 14:54:32 2016 -0700

    fix: kind of works on android! yeah!

commit d6dcb6a3410fda053f0d6fbc00af817a13a86d3b
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Fri Jun 10 09:44:53 2016 -0700

    logging

commit 7e5d6ad52d39642c111e7b690173338af4e94092
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Tue Jun 7 22:53:07 2016 -0300

    android head tracking

    compiles, doesn't work yet... how to debug java code?

commit cbf5f6482aa0ae002a7dc40045ef3ffdbe192e26
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Tue Jun 7 19:45:41 2016 -0300

    reading sensor from android

    not compiling yet

commit 6ee0a3c2c43f8e8a603bfce9fddb0cce5ce79415
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Tue Jun 7 11:45:06 2016 -0300

    compiles on android... finally

commit fb728da756ca7ee94b316c113e2239a77d9f4b53
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Mon Jun 6 18:15:12 2016 -0300

    fix: compile vr android files only on android

commit 90db6daef382d142bb60207d2b16936dd66ee245
Merge: 2e56f03 cc936af
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Mon Jun 6 12:15:56 2016 -0300

    Merge pull request #11 from songchengjiang/riq_vr

    daydream VR platform supporting

commit cc936afac44518a00b90ec3133aaac5d00f0b91f
Author: songchengjiang <moses_jc@sina.com>
Date:   Mon Jun 6 10:38:27 2016 +0800

    remove VR 3rdparty dependence

commit 5f7a1a9c80f84cc915763ad6f52ffc524dd59309
Author: songchengjiang <moses_jc@sina.com>
Date:   Mon Jun 6 10:34:37 2016 +0800

    remove VR 3rdparty dependence

commit 3f72ecde2a259357a137bec1e99e731a2e78df84
Author: songchengjiang <moses_jc@sina.com>
Date:   Mon Jun 6 10:28:43 2016 +0800

    remove VR 3rdparty dependence

commit 2e56f032d1daced1b66b984acacc6f5007f5ecc3
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Fri Jun 3 10:45:44 2016 -0300

    fix: started android support

commit 1910c9c488ee4315110081b60438aa1b7c1011f2
Author: songchengjiang <moses_jc@sina.com>
Date:   Thu Jun 2 15:58:34 2016 +0800

    add CCVRGvrRenderer and CCVRGvrHeadTracker framework

commit 96200eedea9234287153d71b4f198077cc49389a
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Tue May 31 13:07:44 2016 -0300

    fix: little fixes

commit a2eb8114b2969beca83762ba829c8cb809b1615a
Merge: 20a74e0 5fddebc
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Tue May 31 12:12:59 2016 -0300

    Merge pull request #10 from songchengjiang/riq_vr

    bugs fixed

commit 5fddebcae997db9e1a4108413d73b0d057a61e83
Author: songchengjiang <moses_jc@sina.com>
Date:   Fri May 27 15:57:30 2016 +0800

    parameter corrected

commit 925aad012ae513ebeeec682b003123a3c543759f
Merge: 9b5e02f 20a74e0
Author: songchengjiang <songcheng.jiang@chukong-inc.com>
Date:   Fri May 27 15:46:13 2016 +0800

    Merge branch 'vr' of https://github.com/ricardoquesada/cocos2d-x into riq_vr

    Conflicts:
    	cocos/2d/CCScene.cpp

commit 9b5e02fa7c9fcdd15cfea99769560ed30b976e9e
Author: songchengjiang <songcheng.jiang@chukong-inc.com>
Date:   Fri May 27 14:36:31 2016 +0800

    fixed ProjectionMatrix error on oculus platform
    fixed ScrollView error on oculus platform

commit 3c63ead1943d1cf8aa3c0fd722a4b3834db323b1
Author: songchengjiang <moses_jc@sina.com>
Date:   Fri May 27 10:51:46 2016 +0800

    bugs fixed

    mobile VR platforms:
    fixed ProjectionMatrix  error
    fixed culling error of ScrollView

commit 20a74e064708e6bf9d15cc5551d1f86af9d24010
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Fri May 20 09:22:45 2016 -0300

    fix: setAdditionalTransform support reference

commit 8341df82a02683b8e4ae02654e90617a2e5ced6d
Merge: 83751de 469d38d
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Wed May 18 07:38:49 2016 -0700

    Merge pull request #8 from songchengjiang/riq_vr

    Finished VR integration of SKDs based on VRProtocol

commit 469d38d778cd5f947098a08d8fd14ca6f32b0502
Author: songchengjiang <moses_jc@sina.com>
Date:   Wed May 18 15:32:32 2016 +0800

    fix bug of deepoon's headtracking

commit 83751deac133910c24321ddaddff93bf736de884
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Tue May 17 09:41:17 2016 -0700

    fix: Scene inverts the eye matrix

commit 41ae41969a71fd5b07396faac78e777c4afbe5c4
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Tue May 17 06:54:34 2016 -0700

    fix: inversed matrix for camera

commit 049dee721356a47b19f5e51a0face6a5a1647095
Author: songchengjiang <songcheng.jiang@chukong-inc.com>
Date:   Tue May 17 15:51:57 2016 +0800

    add headtracker of oculus

commit 3f6478352a4baebc684105156389655edbac7e6f
Author: songchengjiang <moses_jc@sina.com>
Date:   Tue May 17 14:22:56 2016 +0800

    add headtracker of SKDs

    gearvr/deepoon/cardboard

commit 59df985b72adf0dbb5a4c66c80ae7299b16ae909
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Mon May 16 22:12:23 2016 -0700

    fix: head tracker works

commit 306c59da0175708c96b5757f5f27afd6a6592fe3
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Mon May 16 17:55:43 2016 -0700

    fix: adds missing methods to `VRIHeadTracker`

commit 91100b8a86d78801fbcd08e99427d6a6363ad69b
Author: songchengjiang <songcheng.jiang@chukong-inc.com>
Date:   Mon May 16 14:17:21 2016 +0800

    Rename Oculus's files

commit 01ef6215de936a8d8bb15f9ec195cb81b2b4b18f
Author: songchengjiang <moses_jc@sina.com>
Date:   Mon May 16 11:41:56 2016 +0800

    Rename files based on riq's changes

commit 734efbb045064d24df095c5b8fc604ef2aab1dea
Merge: 91449c9 769a883
Author: songchengjiang <songcheng.jiang@chukong-inc.com>
Date:   Mon May 16 09:57:57 2016 +0800

    Merge branch 'riq_vr' of https://github.com/songchengjiang/cocos2d-x into riq_vr

    Conflicts:
    	build/cocos2d_libs.xcodeproj/project.pbxproj
    	cocos/vr/CCVRGeneric.cpp
    	cocos/vr/CCVRGenericHeadTracker.h

commit 91449c9d23e357549cb1aeae6d1454274def1aab
Merge: d3e4550 a33faaf
Author: songchengjiang <songcheng.jiang@chukong-inc.com>
Date:   Mon May 16 09:54:44 2016 +0800

    Merge branch 'vr' of https://github.com/ricardoquesada/cocos2d-x into riq_vr

    Conflicts:
    	build/cocos2d_libs.xcodeproj/project.pbxproj
    	cocos/platform/CCGLView.cpp

commit a33faafa1a2b6cffdc32d87f3c1c321f46f94789
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Sat May 14 00:57:54 2016 -0700

    fix: adds head tracker

commit ea348cf72d3e54dc3864571bff1405909dbb65c9
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Fri May 13 18:40:32 2016 -0700

    fix: removes red background

commit 113c7debe9a35fc142183a9012cac40063e17efe
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Fri May 13 18:39:31 2016 -0700

    fix: centers image

commit 769a883c93f4f7c6191462626845f01d6f8596fe
Author: songchengjiang <moses_jc@sina.com>
Date:   Fri May 13 20:36:19 2016 +0800

    Merge branch 'vr' of https://github.com/ricardoquesada/cocos2d-x into riq_vr

commit d3e45501cd2cada87735390a407fbd44e61cd84e
Author: songchengjiang <songcheng.jiang@chukong-inc.com>
Date:   Fri May 13 17:52:46 2016 +0800

    update win32 project for VR

commit ba0fdb8b8e1efaf8fdf88e044e701fb5bedb4839
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Thu May 12 23:21:50 2016 -0700

    fix: no hardcoded values

    code is simpler, fixed a few bugs

commit b30596cdae4cdcf39d960a39661a79200b27c7a8
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Thu May 12 21:50:18 2016 -0700

    fix: simplified distortion

commit 37b184f084e7b50bac9a5a3c59a87f8f03440b53
Author: songchengjiang <songcheng.jiang@chukong-inc.com>
Date:   Fri May 13 09:39:34 2016 +0800

    finished VR rendering of Oculus

commit f7d74cd0a2479541c0546d0ec41fe4f867405fcc
Author: songchengjiang <moses_jc@sina.com>
Date:   Thu May 12 10:00:43 2016 +0800

    Finished GearVR and Deepoon VR rendering integration

commit 776fb4fd7420f1c14403eb476df1e9716362f1e5
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Wed May 11 16:56:57 2016 -0700

    fix: distortion working... with too many hardcoded values

    time to "un-hardcode" the values

commit 0584773cca88c5b3dee72821830841f617cfb21c
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Tue May 10 19:49:07 2016 -0700

    feat: distortion WIP

commit 9b5ef01776eaa617dd4677c3824e50c1f9da41c6
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Tue May 10 15:49:17 2016 -0700

    fix: simpler

    one texture that holds both left and right eye

commit bfff504c499c253a0c36b342e6b5bcb0edf4fed7
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Mon May 9 10:50:43 2016 -0700

    fix: Camera code is cleaner

commit fcf730bc2afc6c4552787273577e1942088c2e42
Author: songchengjiang <moses_jc@sina.com>
Date:   Mon May 9 16:43:58 2016 +0800

    support cardboard VR rendering

commit f88b834b70fbfb28db0c8442e68984c61192d7cc
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Fri May 6 21:16:10 2016 -0700

    fix: proj fixes. works ok in any resolution

commit f980a616837b0f259d9564e622c78e0f4869ed53
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Fri May 6 19:08:47 2016 -0700

    fix: renders ok in any device

commit 4799ad32ea38ddd217e80e868c3d9021c03e88ce
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Thu Apr 28 16:46:30 2016 -0700

    fix: renders something

    fix: passing camera to scene

    adds a way to return user camera

    fix: stereo rendering works

    fix: viewport left is correct

    fix: scissor is not needed...

    fix: works!

    fix: minor fixes

    fix: new approach... almost working

    fix: camera is moved

    whitespace fixes

    fix: whitespaces

    fix: new line

commit c137a53aba227cf2e2a1809b55cb9b3da25d432b
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Wed Apr 27 18:56:41 2016 -0700

    fix: VR refactor... still WIP

commit 16fde77d71b8309e982bf6fa4f4ee0acea5fc0d1
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Tue Apr 26 22:21:21 2016 -0700

    feat: VR, initial commit
2016-06-15 11:33:25 -07:00
Dale Stammen 53321e401a updated to support Windows 10 UWP x64 builds 2016-06-15 08:50:04 -07:00
minggo fc44d0deed Merge pull request #15850 from minggo/hide-virtual-button
[ci skip]hide virtual button correctly
2016-06-15 18:38:59 +08:00
minggo 7bf13f34cd hide virtual button correctly 2016-06-15 18:33:52 +08:00
PooperPig 7214173e98 Added Particle Emitter Pause option, and tests (#15836)
* Added Particle Emitter Pause option, and tests

* private field emitter => _emitter
isPaused changed to const
removed erroneously added spaces
renamed unPauseEmissions => resumeEmissions
2016-06-15 18:31:10 +08:00
minggo 8c9019b128 Merge pull request #15848 from minggo/hide-virtual-button
[ci skip]hide virtual button if has focus
2016-06-15 18:20:53 +08:00
minggo d94dc7edc0 hide virtual button if has focus 2016-06-15 18:19:06 +08:00
minggo 3807a2f678 Merge pull request #15847 from minggo/hide-virtual-button
[ci skip]hide virtual button by default
2016-06-15 18:08:00 +08:00
minggo a8c6011f66 use android sdk 19 2016-06-15 18:06:53 +08:00
minggo 8634773be3 hide virtual button by default 2016-06-15 17:55:26 +08:00
minggo d7b495c3d1 Merge pull request #15838 from MagicXrEv/rename-end-functions
lua binding : Rename end() to endToLua().
2016-06-15 16:24:34 +08:00
mogemimi a348cbda8b Move StringUtils functions from deprecated header file to ccUTF8.h (#15835)
* Move StringUtils functions outside of deprecated header

* Replace deprecated headers with 'base/ccUTF8.h'
2016-06-15 15:01:26 +08:00
Aaron dd6fed7928 Fixed ClippingNode not cleaning up _stencil correctly (#15814)
* Fixed ClippingNode not cleaning up _stencil correctly

_stencil may be running due to onEnter() called by ClippingNode. If onExit() is not called then Node::~Node() will assert when _stencil is released.

* Added onEnterXXX to ClippingNode::setStencil()

ClippingNode::_stencil would not be initialised correctly when set after ClippingNode was adding to the active scene.
2016-06-15 14:55:29 +08:00
halx99 dafa8054bf fix: missing properties for clone
missing CascadeColorEnabled and CascadeOpacityEnabled for clone.
2016-06-15 14:39:18 +08:00
CocosRobot 7c4b7e1bf1 [ci skip][AUTO]: updating luabinding & jsbinding automatically 2016-06-15 02:49:50 +00:00
子龙山人 51f4deee01 Add system label overflow (#15827)
* Add system font overflow

1. currently only iOS, Mac and Android platform are supported

add mac label overflow shrink

modify system font overflow test

fix warning and possible memory leaks

add ios system label overflow support

add iOS system font overflow support

fix iOS system font overflow

fix Mac System font overflow

add android system font clamp

add Android system font shrink

cleanup iOS shrink related code

fix Android system font clamp

add core text to project template

fix iOS tests project

fix mac and iOS shrink

improve iOS and Mac clamp feature

fix header file include path

* modify the comments, make it more clearer
2016-06-15 10:43:15 +08:00
MagicXrEv 8e6ca57f4f lua binding : Rename end() to endToLua(). 2016-06-14 23:35:17 +08:00
Adrien de Sentenac dac9be5016 Various CMake improvements
- Added c++_shared (LLVM) to Android toolchain options. Fixed AndroidNdkGdb.cmake.
- Fixed includes when not using prebuilt libs. Added option to use sources in external when not using prebuilt libs.
- Added option in CMake to be able build Box2D without using it as physics library in cocos2d-x (similar to what is done in the Visual Studio solution).
2016-06-14 10:20:57 -04:00
Mikhail Shulepov 7d6d677983 RenderTexture - set opacity modify RGB 2016-06-13 23:07:17 +03:00
mogemimi 10418676ca Remove duplicate header includes in cocos2d.h 2016-06-13 19:11:05 +09:00
子龙山人 da2ea7e08b Merge pull request #15794 from TheCodez/cachetexture
UIScrollbar and UIPageViewIndicator cache base64 Texture now #15780
2016-06-13 17:31:12 +08:00
James Chen 126b60945e issue #15652: fix low FPS on some android devices while auto batch is disabled. 2016-06-12 11:35:30 +08:00
minggo 109f572bf6 Merge pull request #15807 from mogemimi/add-switch-default-case
Add missing default cases within switch block for JS and Lua JavaBridge
2016-06-12 10:37:05 +08:00
yalab 598be0840c Fixed to fail FileUtils::writeValueMapToFile on iOS. 2016-06-10 14:53:11 +09:00
mogemimi 07e0c1cbf9 Fix typo in method name: 'destory' -> 'destroy' 2016-06-09 09:25:06 +09:00
mogemimi de5dd21ded Add missing default cases within switch block for JS and Lua JavaBridge 2016-06-08 15:41:44 +09:00
minggo 363beb436d Merge pull request #15790 from dumganhar/profiling-fix
Compilation fix while CC_ENABLE_PROFILERS = 1
2016-06-08 10:55:54 +08:00
minggo 93d87ad19e android supports LOWERCASE_ALL_CHARACTERS 2016-06-07 12:41:22 +08:00
minggo 7e1da2188c ios supports LOWERCASE_ALL_CHARACTERS 2016-06-07 10:31:16 +08:00
TheCodez 7885f55ce5 Cache bas64 images 2016-06-06 16:32:50 +02:00
James Chen 4f2b4559b6 Compilation fix while CC_ENABLE_PROFILERS = 1 2016-06-06 16:25:00 +08:00
minggo 3b4f2c38dd Merge pull request #15788 from minggo/editbox-capital-issue
[ci skip]not use capital letters by default
2016-06-06 14:00:32 +08:00
minggo 7e2f79ce8f not use capital letters by default 2016-06-06 13:55:20 +08:00
minggo 264bf87c87 Merge pull request #15784 from mogemimi/fix-unused-param
Fix unused parameter warning when compiling CCArray
2016-06-06 10:13:28 +08:00
patriciog 097eebdb50 Testcase for CCS 1.6 animations with only one frame (#15714)
* Testcase for CCS 1.6 animations with only one frame

* Removed extra comma

* Removed conflict garbage

* Removed old code

* Create new Test section Cocos Studio > Issues

* update ccs-res submodule

* Fixed Back button visibility
2016-06-06 09:32:33 +08:00
mogemimi a22302e2ee Fix unused parameter warning when compiling CCArray 2016-06-04 21:17:53 +09:00
minggo cf80eb18b1 Merge pull request #15777 from pandamicro/v3
Fix scheduler callback target lost issue
2016-06-03 14:05:32 +08:00
minggo 5cd4c8aaca Merge pull request #15778 from minggo/scriptingcore-issue
avoid to access invalid memory
2016-06-03 14:04:17 +08:00
mogemimi 388eeed014 Suppress '-Wundefined-bool-conversion' warnings on Android NDK with Clang (#15775) 2016-06-03 13:42:44 +08:00
minggo b7b74f2328 avoid to access invalid memory when received data length is the same as buffer size 2016-06-03 11:39:01 +08:00
pandamicro 3597ce7c43 Fix scheduler callback target lost issue 2016-06-03 11:01:06 +08:00
Nikita 612cd7b82f Fixed behavior of "cc.isObject" function for undefined and null values. (#15085)
* Fixed wrong behavior of "cc.isObject" function for undefined and null values.

* Simplify 'cc.isObject' function

* Remove double return in 'cc.isObject'
2016-06-03 09:45:32 +08:00
MagicXrEv 29cca63822 Texture2D::addImageAsync : Set pixel format correctly. (#15774) 2016-06-03 09:38:01 +08:00
minggo c7c67144b7 Merge pull request #15769 from pandamicro/v3
Fix scheduler callback target lost issue
2016-06-03 09:29:01 +08:00
minggo 9322ecc937 Merge pull request #15768 from minggo/issue-15738
add a new create method to create resizable window
2016-06-03 09:28:40 +08:00
CocosRobot da114e13d1 [ci skip][AUTO]: updating luabinding & jsbinding automatically 2016-06-02 09:16:13 +00:00
minggo dd1c87a1e0 Merge pull request #15764 from AlexanderShniperson/listview_select_item
ListView select item programmatically
2016-06-02 17:09:49 +08:00
minggo 35730063f1 Merge pull request #15766 from mogemimi/fix-unused-param
Fix unused parameter warning
2016-06-02 17:06:02 +08:00
minggo 75227a5c0e [desktop]fix the bug the depth test is disabled when application size changed 2016-06-02 16:18:31 +08:00
pandamicro d1e9a149c4 Fix scheduler callback target lost issue 2016-06-02 16:02:29 +08:00
minggo 7243b00cad add a new create method to create resizable window 2016-06-02 15:48:16 +08:00
mogemimi bd00b2f261 Fix unused parameter warning 2016-06-02 15:30:24 +09:00
Alexander Shniperson 07c5e528e7 ListView select item programmatically 2016-06-02 10:11:28 +04:00
minggo 66217b7bd1 Merge pull request #15761 from dumganhar/set-blending-fix
SetBlending fix
2016-06-02 11:01:50 +08:00
minggo 827aa803a4 Merge pull request #15755 from mogemimi/remove-c99-macros
Remove unnecessary sinf, cosf, tanf and sqrtf macros
2016-06-02 11:00:51 +08:00
minggo 1d42bae8c5 Merge pull request #15735 from MrCapone/v3
AudioEngine-linux fix: add map contains IDs of preloaded files
2016-06-01 21:34:15 +08:00
James Chen 3d116c3333 SetBlending fix 2016-06-01 17:46:27 +08:00
minggo 6f79082c6a Merge pull request #15754 from minggo/linux-compiling-error
use std::isnan instead of isnan to fix compiling errors
2016-05-31 09:22:05 +08:00
mogemimi a4a357db69 Remove unnecessary sinf, cosf, tanf and sqrtf macros 2016-05-31 02:39:40 +09:00
minggo 3810854c45 use std::isnan instead of isnan to fix compiling errors 2016-05-30 18:19:10 +08:00
CocosRobot 4f0869e51e [ci skip][AUTO]: updating luabinding & jsbinding automatically 2016-05-30 09:27:04 +00:00
minggo 3521e605f8 Merge pull request #15723 from urokuta/issue-9367
#9367 blend mode does not work with animated sprite
2016-05-30 10:53:15 +08:00
halx99 fa4bfe43d8 fix AudioEngine bug for iOS, UTF8 filePath (#15743)
* fix AudioEngine bug for iOS, UTF8 filePath

Fix bug for apple platform, open audio file failed with chinese App Name.

* Update AudioPlayer.mm
2016-05-30 10:47:48 +08:00
minggo 67c95549b3 Merge pull request #15744 from mogemimi/fix-refptr-warnings
Fix warnings caused by comparison between RefPtr and C++11's nullptr
2016-05-30 10:45:28 +08:00
mogemimi c647a95656 Fix C4267 and C4309 warnings when compiling for Windows 10 UWP 2016-05-29 14:43:28 +09:00
mogemimi 69974ab06f Fix warnings caused by comparison between RefPtr and C++11's nullptr 2016-05-28 22:15:56 +09:00
minggo 74fe77a367 Merge pull request #15737 from yalab/slicent_warning_android_clang
It mute warning on android clang.
2016-05-27 16:46:50 +08:00
minggo 533636e63a Merge pull request #15726 from minggo/v3.11.1
merge v3.11.1 to v3
2016-05-27 16:45:04 +08:00
yalab 3ea46c617f It mute warning on android clang. 2016-05-27 15:39:33 +09:00
minggo 7516db0fa8 Merge pull request #15734 from pandamicro/v3
Support cc.view.setOrientation on web
2016-05-27 14:26:50 +08:00
minggo 127f718dfc Merge pull request #15728 from mogemimi/remove-duplicate-includes
Remove duplicate header includes
2016-05-27 14:25:39 +08:00
minggo 103bdb3d37 fix conflict 2016-05-27 14:22:03 +08:00
minggo 80039c4aee Merge pull request #15731 from minggo/jsb-debug-issue
fix the bug that will lost message if only received one message
2016-05-27 09:46:36 +08:00
mogemimi fc6c612c4c Remove duplicate header includes 2016-05-26 23:25:44 +09:00
Ricardo Quesada 1a7c22bd97 Merge pull request #15594 from yutaka-takeda-drecom/fix/sprite3d_singlesprite_bug
CCSprite::createNode bug fix.
2016-05-26 08:59:46 -03:00
capone 5b02460989 AudioEngine-linux fix: add map contains IDs of preloaded files 2016-05-26 17:57:56 +06:00
pandamicro 1928d24bf0 Made templates support cc.view.setOrientation on web 2016-05-26 19:24:24 +08:00
zilongshanren f9415734f2 Merge pull request #15732 from zilongshanren/fix-actionNode-studio
fix actionNode studio 1.6 parser error
2016-05-26 18:17:25 +08:00
zilongshanren 13003d9a78 Merge pull request #15727 from dumganhar/editbox-fix
Make sure closeKeyboard run on UI thread
2016-05-26 18:08:03 +08:00
zilongshanren 2476722137 fix default value of studio version 2016-05-26 17:33:44 +08:00
zilongshanren b317588e6e fix include path 2016-05-26 17:25:03 +08:00
zilongshanren 517cb9e437 Merge pull request #15729 from dumganhar/editbox-fix-2
fixed java.lang.IndexOutOfBoundsException while invoking toString on GL thread.
2016-05-26 17:24:09 +08:00
zilongshanren 3e941be0ce fix actionNode studio 1.6 parser error 2016-05-26 17:20:51 +08:00
minggo 031e329d64 fix the bug that will lost message if only received one message 2016-05-26 16:32:10 +08:00
James Chen d42b99b10b fixed java.lang.IndexOutOfBoundsException while invoking toString on GL thread. 2016-05-26 15:49:57 +08:00
James Chen cf883b5c0f UI thread check. 2016-05-26 12:02:23 +08:00
James Chen a472ab2931 Make sure closeKeyboard run on UI thread 2016-05-26 11:57:57 +08:00
minggo 1f2dea7974 Merge pull request #15724 from dumganhar/catch-exception
Try catch IllegalStateException in Cocos2dxMusic.java.
2016-05-26 11:20:14 +08:00
James Chen 5321a2fc7a Removes unused package import for Cocos2dxSound.java. 2016-05-26 11:15:44 +08:00
minggo 5e8eee2c76 Merge pull request #15721 from mogemimi/fix-minor-typo
Fix minor typo: Texure -> Texture
2016-05-26 10:58:55 +08:00
pandamicro aab8ea5094 Fix android compilation issue with thumb mode 2016-05-26 10:50:19 +08:00
minggo 7073a1c90c Merge pull request #15718 from pandamicro/v3
Fix some small issues
2016-05-26 10:46:54 +08:00
James Chen 1285954cd9 Try catch IllegalStateException in Cocos2dxMusic.java. 2016-05-26 10:25:45 +08:00
minggo 072592d6e3 update version 2016-05-26 10:18:45 +08:00
urokuta 785d02a818 #9367 blend mode does not work with animated sprite 2016-05-26 09:39:48 +09:00
Ricardo Quesada b2c7358370 Merge pull request #15722 from ricardoquesada/issue_15154
Fix crash on windows when using PolygonInfo
2016-05-25 21:25:31 -03:00
Ricardo Quesada 906967c53a fix: make it compile on iOS and Mac 2016-05-25 20:00:48 -03:00
mogemimi f6bee1abc2 Fix minor typo: Texure -> Texture 2016-05-26 02:36:15 +09:00
Dale Stammen 26781ee592 fixed array overrun in triangulate() 2016-05-25 10:14:09 -07:00
pandamicro ea6a6a8586 Reverse include path in network module and update web engine 2016-05-25 23:58:11 +08:00
pandamicro 8692ee176c Merge branch 'v3' of github.com:cocos2d/cocos2d-x into v3
Conflicts:
	cocos/network/HttpAsynConnection-apple.m
	cocos/network/HttpClient-android.cpp
	cocos/network/HttpClient.cpp
	cocos/network/HttpCookie.h
	cocos/network/HttpRequest.h
	cocos/network/HttpResponse.h
	cocos/network/SocketIO.cpp
	cocos/network/WebSocket.h
2016-05-25 19:19:27 +08:00
minggo 4e92b82571 Merge pull request #15716 from cezheng/bug/ios_httpclient_ssl
correct assign to equal in cert trust expression
2016-05-25 18:44:01 +08:00
pandamicro 2c05ecc3cd Fix Component event issue 2016-05-25 18:36:02 +08:00
pandamicro 896aeb2d0c Fix android compilation issue with thumb mode 2016-05-25 18:35:38 +08:00
minggo c4a40618f5 Merge pull request #15715 from dumganhar/dlfree-fix
dlfree fix for HttpClient, the instances of Ref or its sub classes should be released by CC_SAFE_RELEASE rather than CC_SAFE_DELETE.
2016-05-25 18:34:29 +08:00
Ce Zheng e4bf6584db correct assign to equal in cert trust expression 2016-05-25 18:34:05 +09:00
minggo 47891b81af Merge pull request #15712 from mogemimi/use-nullptr-instead
Use nullptr instead of 0 or NULL
2016-05-25 13:56:52 +08:00
minggo c8c57696be Merge pull request #15705 from minggo/jsb-debug-issue
lock mutext to get element from g_queue
2016-05-25 13:55:34 +08:00
James Chen 1db3c1644d dlfree fix for HttpClient, the instances of Ref or its sub classes should be released by CC_SAFE_RELEASE rather than CC_SAFE_DELETE. 2016-05-25 13:54:13 +08:00
Ricardo Quesada 9ad3db0635 fix: make PolygonCode cleaner
not sure if this fixes the bug, but it makes the interfaces cleaner.

Github issue #15154
2016-05-24 20:57:40 -03:00
mogemimi 1e04cb5950 Use nullptr instead of 0 or NULL 2016-05-25 03:09:11 +09:00
Ricardo Quesada 23c5c18c91 Merge pull request #15646 from Rypac/fix_quadcommand_crash
Fix crash due to reallocation of shared indices memory
2016-05-24 11:29:28 -03:00
Ricardo Quesada 02a9c9aae3 fix: update damping in physics
github issue #15630
2016-05-24 10:53:23 -03:00
alecmilne 5daaa6e49b Adding setBounce to webview (#15623)
* Adding setBounce to webview

This makes the .bounces of the scrollview section of webview publically accessible

When set to true it stops the grey over scroll of webviews

* Adding empty function for setBounces to Android

* Adding empty setBounces function for tizen

* Adding comments for empty Android and Tizen setBounce functions

* Small comment text change
2016-05-24 18:27:59 +08:00
minggo fff7a78efe lock mutext to get element from g_queue 2016-05-24 15:59:00 +08:00
mogemimi 38fd8ebca9 Fix typo in function name: Keybard -> Keyboard 2016-05-24 10:14:36 +09:00
minggo b8e7f37eaf Merge pull request #15640 from xpol/better-lua-print
Print as Lua 5.1 does and remove duplicate code.
2016-05-23 18:42:23 +08:00
Shulepov 758425cfd5 Refactor CCFileUtils-apple to remove code duplication (#15645)
* Refactor CCFileUtils-apple to remove code duplication of conversion from CCValue to NSObject and vise versa

* CCFileUtilsApple: rename helper functions
2016-05-23 18:26:19 +08:00
minggo 16a1605927 Merge pull request #15690 from halx99/patch-2
change if (fontName.c_str()) to if(!fontName.empty())
2016-05-23 16:04:14 +08:00
minggo 5caea3a197 Merge pull request #15692 from mogemimi/prevent-c4996-warning
Prevent too many C4996 warnings caused by ignoreAnchorPointForPosition()
2016-05-23 14:14:38 +08:00
Vladimir Perminov b6d72e33d8 Fix password style text in UTF-16 (#15620)
* Fix password style text in UTF-16

Label used UTF-16 in internal.
Need string in UTF-8.

* Set correct char for Max and iOS

* Add test for TextFiledTTF Secure Text Entry
2016-05-23 09:48:15 +08:00
mogemimi ad3c305172 Prevent too many C4996 warnings caused by ignoreAnchorPointForPosition() 2016-05-22 07:05:35 +09:00
halx99 86d148c24c change if (fontName.c_str()) to if(!fontName.empty())
fix warnning, change if (fontName.c_str()) to if(!fontName.empty()), The first expression's value always true.
2016-05-20 23:10:28 +08:00
minggo 2c9716d714 Merge pull request #6927 from TimothyZhang/fix-cc-utf8-to-utf16
fixed bug of cc_utf8_to_utf16() when length!=-1
2016-05-20 14:59:06 +08:00
minggo 797cd50a6e Merge pull request #15683 from hopstertv/enable-webview-local-storage-on-android
Enable WebView's local storage on Android
2016-05-20 14:40:22 +08:00
mogemimi 0f3b36e834 Fix gcc warnings and type mismatch issues in AudioEngine for Linux 2016-05-20 01:39:40 +09:00
Greg Rynkowski 21fc67b358 Enable WebView's local storage on Android
Problem:
cocos2d::experimental::ui::WebView' local storage wasn't working on
Android. On iOS worked fine.

Solution:
Enable local storage of android.webkit.WebView in Android.

References:
https://developer.android.com/reference/android/webkit/WebSettings.html
http://stackoverflow.com/questions/5899087/android-webview-localstorage
2016-05-19 14:43:35 +01:00
minggo 3db84916d1 Merge pull request #15677 from mogemimi/refactor-audioengine
Refactor the AudioEngine-Linux to make more maintainable
2016-05-19 18:07:45 +08:00
minggo 9c0acf1e5d Merge pull request #15619 from VisualSJ/v3_audio
audio search path (android)
2016-05-19 18:06:58 +08:00
zilongshanren b154f274a5 Merge pull request #15410 from 1scaR1/up_v3
Make PageView indicator more tunable
2016-05-19 16:19:18 +08:00
mogemimi 09d839be35 Format the code to better align with cocos2d-x code style 2016-05-19 05:17:33 +09:00
mogemimi 7b61aca64e Fix indentation and remove trailing whitespaces 2016-05-19 03:42:34 +09:00
mogemimi 3a80e7d8fb Change 2 spaces to 4 spaces indentation 2016-05-19 03:34:04 +09:00
mogemimi 03be0de2fa Remove unnecessary trailing semicolons 2016-05-19 01:40:00 +09:00
fusijie 36113f507e add comments for ps. 2016-05-18 22:25:43 +08:00
zilongshanren 9223d1d917 Merge pull request #15668 from zilongshanren/fix-issue-of-tizen
fix tizen related issues
2016-05-18 17:20:19 +08:00
zilongshanren c4e6db4e9b fix tizen related issues 2016-05-18 16:26:13 +08:00
pandamicro a03c45ce62 Update network licenses and reformat 2016-05-18 14:29:54 +08:00
minggo c6034787e4 Merge pull request #15664 from mogemimi/replace-ccassert-macro
Replace CCAssert macros with CCASSERT
2016-05-18 11:57:18 +08:00
minggo a54251b854 Merge pull request #15659 from mogemimi/use-const-reference
Use const references whenever possible
2016-05-18 11:55:55 +08:00
mogemimi 320ec027f7 Replace CCAssert macros with CCASSERT 2016-05-18 01:49:35 +09:00
minggo 3e396fedab Merge pull request #15617 from pandamicro/v3
Some modifications merged from Creator
2016-05-17 13:43:41 +08:00
mogemimi 948f64631f Use const references whenever possible 2016-05-17 13:17:56 +09:00
pandamicro c96bd9a4df Resolve local reference leak and function order 2016-05-17 12:06:28 +08:00
minggo 601460682e Merge pull request #15641 from mogemimi/add-missing-references
Add missing references to avoid unnecessary copies
2016-05-17 10:28:08 +08:00
minggo abe020e808 Merge pull request #15654 from minggo/ipv6-compatibility
Ipv6 compatibility
2016-05-17 09:25:14 +08:00
mogemimi a1a8feed71 Add missing references to avoid unnecessary copies 2016-05-17 01:15:07 +09:00
zilongshanren 9203630583 Merge pull request #15651 from zilongshanren/fixNativeCotnrolIssuesV2
fix UI native control onEnter issue
2016-05-16 16:58:32 +08:00
zilongshanren 3ae5b1075b fix native control onEnter issue 2016-05-16 16:14:16 +08:00
minggo 88db5d3660 use AF_UNSPEC to support ipv6 2016-05-16 15:15:29 +08:00
minggo 2b480a75bf use AF_UNSPEC to support ipv6 2016-05-16 14:45:09 +08:00
Ryan Davis 8ca09f7c2a Fix crash due to reallocation of shared indices memory 2016-05-15 12:30:30 +10:00
Xpol Wan a7d9dd9a75 Print as Lua 5.1 does and remove duplicate code. 2016-05-14 14:09:58 +08:00
mogemimi 16878a53b1 Suppress MSVC warning C4800 2016-05-13 11:44:17 +09:00
minggo 74af3b5232 merge v3.11 back to v3 2016-05-12 09:50:03 +08:00
ViusualSJ ada1d1dfe8 audio search path (android) 2016-05-11 17:24:14 +08:00
pandamicro 6b59dc24c7 Add Image::setPNGPremultipliedAlphaEnabled 2016-05-11 16:36:21 +08:00
pandamicro 1023c8730e [JSB] Made cc.log overwrite-able 2016-05-11 11:58:24 +08:00
pandamicro 1cbbde5d8b Fix android LocalStorage return null for empty string value 2016-05-11 11:57:54 +08:00
minggo 48937ca3e6 disable new JSB memory model by default 2016-05-11 11:10:11 +08:00
minggo bb5d1a5e97 Merge pull request #15607 from minggo/iss-15413
remove Content-Type limitation
2016-05-11 10:57:34 +08:00
minggo 2ad6f10bb6 Merge pull request #15609 from pandamicro/v3.11
Fix web engine issues and SocketIO connection fail issue
2016-05-11 09:28:24 +08:00
pandamicro 85812b4f5b Remove client_no_context_takeover extension in WebSocket (not working on Android/iOS/Mac) 2016-05-10 20:35:02 +08:00
minggo fd160a1611 remove Content-Type limitation 2016-05-10 18:15:57 +08:00
minggo 27060e43b7 Merge pull request #15590 from ntotani/v3
add missing lua const values
2016-05-10 14:55:53 +08:00
minggo 36ad79761f Merge pull request #15596 from dabingnn/v3_fix_animation3D_bug
fix animate 3d bug
2016-05-10 14:11:01 +08:00
minggo f4a7ba836c Merge pull request #15599 from Naruto/feature/fix_build_error_using_fileutils-apple
fix build failed using FileUtilsApple on Application code.
2016-05-10 12:07:16 +08:00
Naruto TAKAHASHI 79b9a191d0 declare explicitly FileUtilsApple destructor 2016-05-09 21:50:52 +09:00
minggo d086965683 Merge pull request #15598 from minggo/android-package-name
[ci skip]set correct package name
2016-05-09 18:17:28 +08:00
minggo 2a712a0c3b set correct package name 2016-05-09 18:14:53 +08:00
Huabing.Xu e8acf38212 fix animate 3d bug 2016-05-09 15:21:19 +08:00
TAKEDA Yutaka d17fdfe3cc CCSprite::createNode bug fix. 2016-05-09 15:42:39 +09:00
mogemimi bbbb7e498d Prevent variable shadowing warnings 2016-05-08 12:32:36 +09:00
minggo 5d7cbe622a Merge pull request #15589 from pandamicro/v3.11
Add cc.game.end to close game window
2016-05-07 22:11:46 +08:00
halx99 fc9880ab49 Add captureNode for cocos2d::utils (#15558)
* Add captureNode for cocos2d::utils

Add captureNode for cocos2d::utils and fix CC_DLL syntax.

* Add test case for utils::captureNode

Add test case for utils::captureNode.

* Store captured image to disk with RGB.

* Trigger jenkins check
2016-05-07 22:10:53 +08:00
Naoyuki Totani 04ebba425f add missing lua const values 2016-05-07 16:23:23 +09:00
pandamicro d0fc3ec4c4 Add cc.game.end to close game window 2016-05-07 14:37:36 +08:00
zilongshanren e4d91f5577 fix tizen videoplayer issue 2016-05-06 18:43:26 +08:00
minggo f34acca188 Merge pull request #15575 from stevetranby/capturescreen-drain-autorelease
Prevent memory leak: force drain on autoreleased `data`.
2016-05-06 16:57:29 +08:00
CocosRobot d72fadf6cc [ci skip][AUTO]: updating luabinding & jsbinding automatically 2016-05-06 05:44:31 +00:00
minggo 38631ab655 Merge pull request #15576 from minggo/sync-15066
Fix setPhysicsBody method
2016-05-06 13:38:53 +08:00
mogemimi 694259bf80 Suppress warning C4800 on MSVC 2016-05-06 12:30:16 +09:00
TheCodez 4de7ef1515 Fix setPhysicsBody method 2016-05-06 09:29:57 +08:00
Steve Tranby 7c1e60f0b7 Prevent memory leak: force drain on autoreleased `data`. 2016-05-05 08:00:28 -06:00
minggo 9218329968 Merge pull request #15569 from minggo/issue-15522
Fix compile error isnan -> std::isnan
2016-05-05 11:36:24 +08:00
CocosRobot 0445e7c562 [ci skip][AUTO]: updating luabinding & jsbinding automatically 2016-05-05 03:07:58 +00:00
minggo 44063b8e85 Merge pull request #15568 from zilongshanren/fix-jsb-related-issues
fix jsb 3.11 related issues
2016-05-05 11:01:44 +08:00
minggo e2c38ed87f make std::isnan work for winrt 2016-05-05 10:29:31 +08:00
zilongshanren 8c046fea92 fix jsb 3.11 related issues 2016-05-05 10:20:00 +08:00
minggo 03b38bcee2 Merge branch 'fix_isnan' of https://github.com/gelldur/cocos2d-x into issue-15522 2016-05-05 10:17:17 +08:00
mogemimi 2df9afbe71 Fix typos in documentation and comments 2016-05-05 08:05:20 +09:00
pandamicro fcfaafa4a5 Fix SocketIO fail to connect issue on Android 2016-05-04 17:43:36 +08:00
minggo a5602cc732 merge v3.11 back to v3 2016-05-04 16:02:23 +08:00
halx99 9ff61f915c Add findChild for cocos2d::utils (#15548)
* Add searchNode for cocos2d::utils

Add searchNode for cocos2d::utils

* fix compile error on win32_bak

* convert line terminates to unix sytle.

* Rename searchNode to findChild, and etc.

* fix compile error.
2016-05-04 09:46:00 +08:00
minggo 0eb25af347 Merge pull request #15555 from mogemimi/remove-c-str-calls
Reduce unnecessary c_str() calls
2016-05-04 09:43:01 +08:00
minggo 4766e0dd9b Merge pull request #15545 from minggo/isse-15540
avoid remove event listener multiple times
2016-05-04 09:39:38 +08:00
minggo 6260c67941 Merge pull request #15549 from minggo/issue_15525
use std::atof() instead
2016-05-04 09:38:42 +08:00
Adrien de Sentenac 1a76c9ea3b Add OBB (zip) support (#15515)
* Add OBB support.
OBB must be a zip file with audio and video files stored uncompressed.

* Use introspection to be able to build with Android API level 10.
Using the new audio engine to play sounds from the OBB will only work with API level 12 (Android 3.1) or above.
2016-05-04 09:21:35 +08:00
mogemimi 8429b34010 Reduce unnecessary c_str() calls 2016-05-04 04:18:25 +09:00
dualface 2901f0aea6 fix display.wrapScene() 2016-05-03 21:37:15 +08:00
pandamicro 3d6bddd2c7 Merge pull request #15465 from cezheng/fix/several_network_bugs
[BugFixes]Several serious bug fixes related to network/asset_manager
2016-05-03 17:37:32 +08:00
minggo 1bf56d5a78 use std::atof() instead 2016-05-03 15:50:06 +08:00
minggo f2e5eb332a Merge pull request #15546 from minggo/issue_15526
fix memory leak
2016-05-03 14:02:38 +08:00
minggo fba4bead70 fix memory leak 2016-05-03 11:24:22 +08:00
minggo d41207e99a avoid remove event listener multiple times 2016-05-03 10:56:03 +08:00
minggo 9f678f2f27 Merge pull request #15541 from cocos2d/fix-doxygen-mistakes
Fix doxygen format mistakes in enum class Platform
2016-05-03 09:38:58 +08:00
mogemimi 6433172fae Fix shadow variable warning in GameNode3DReader 2016-05-02 10:57:03 +09:00
Zhe Wang a640f007ef Fix doxygen format mistakes in enum class Platform
An user reported this error in the forum http://forum.cocos.com/t/api-document/36199/2
I noticed that our doxygen was written in wrong format.
2016-04-30 15:20:24 +08:00
Xpol Wan f111583214 Refactor FileUtils::getFileData() and CCFreeTypeFont::loadFont().
* Remove unnecessary memory copy in FileUtils::getFileData()
* Add Data::takeBuffer() to simplify FileUtils::getFileData() and CCFreeTypeFont::loadFont().
2016-04-29 09:31:09 +08:00
minggo 788dae5a2e Merge pull request #15531 from pandamicro/v3.11
Fix clipping node memory management issue and update web engine
2016-04-28 16:15:59 +08:00
pandamicro d8d6e55756 Fix clipping node memory management issue 2016-04-28 15:14:03 +08:00
Ricardo Quesada c432b23ef6 fix: removes `friend class Game`
fixes Github issue #15221
2016-04-27 18:57:41 -07:00
CocosRobot 198acb9466 [ci skip][AUTO]: updating luabinding & jsbinding automatically 2016-04-28 01:56:50 +00:00
zilongshanren 482788c933 Add tizen support (#15518)
* add Tizen Support

* fix linter error

* fix tizen audio engine lua bindings config
2016-04-28 09:49:55 +08:00
Dawid Drozd 0f19bec99d Fix compile error isnan -> std::isnan #15111
Issue: https://github.com/cocos2d/cocos2d-x/issues/15111
2016-04-27 13:15:08 +02:00
minggo 2a4799758d Merge pull request #15511 from xpol/signed-unsigned-mismatch
Fixes signed/unsigned mismatch warnings.
2016-04-27 11:34:10 +08:00
minggo fc5e537327 Merge pull request #15508 from xpol/remove-use-of-getFileData
Remove last internal use of deprecated `FileUtils::getFileData()`.
2016-04-27 09:38:30 +08:00
minggo 51fb49a522 Merge pull request #15512 from minggo/issue-15193
use fullpath to play background music
2016-04-27 09:37:45 +08:00
mogemimi f395cadbac Add CC_GUI_DLL to suppress warning C4275 2016-04-27 04:08:09 +09:00
Xpol Wan 1cc0130bdd Fixes signed/unsigned mismatch warnings.
```
2d\CCFontFNT.cpp(328): warning C4018: '<' : signed/unsigned mismatch
2d\CCLabel.cpp(782): warning C4018: '>' : signed/unsigned mismatch
2d\CCLabel.cpp(784): warning C4018: '<' : signed/unsigned mismatch
scripting\js-bindings\manual\cocos2d_specifics.cpp(2741): warning C4018: '<' : signed/unsigned mismatch
tests\cpp-tests\Classes\Sprite3DTest\Sprite3DTest.cpp(1969): warning C4018: '>=' : signed/unsigned mismatch
tests\cpp-tests\Classes\TextInputTest\TextInputTest.cpp(264): warning C4018: '>=' : signed/unsigned mismatch
ui\UIEditBox\UIEditBoxImpl-common.cpp(113): warning C4018: '<' : signed/unsigned mismatch
ui\UIRichText.cpp(1573): warning C4018: '<=' : signed/unsigned mismatch
ui\UITextField.cpp(89): warning C4018: '>=' : signed/unsigned mismatch
```
2016-04-26 17:53:25 +08:00
minggo b9184ac452 Merge pull request #15509 from minggo/issue-15449
remove unsupport flags
2016-04-26 16:03:58 +08:00
minggo bb4a54b042 use fullpath to play background music 2016-04-26 15:59:30 +08:00
Xpol Wan bd3c3a7c3d remove default value for size argument. 2016-04-26 14:54:20 +08:00
Xpol Wan 94944082c4 Fixes warning about deprecated cc_wcslen. 2016-04-26 14:21:25 +08:00
minggo 2319860d38 remove unsupport flags 2016-04-26 14:08:23 +08:00
Xpol Wan 3f8910d80c Remove last internal use of deprecated `FileUtils::getFileData()`. 2016-04-26 13:57:53 +08:00
xpol 43a94c0693 Add FileUtils::getContents(). (#15479)
* Add FileUtils::getContents().

* skip FileUtils::getContents() in binding generator config.

* use FileUtils::getContents in CCDataReaderHelper.

* obey the cocos2d-x coding style.

* Explicit constructor.

* More docs.

* More tests.

* Move FileError to FileUtils::Error.

* Fixes wrong buffer size for reading into string and vector.

* Update tests.

* Add note on padding for output buffers.

* FileUtils: implements old methods by using `getContents()`.

methods are:

* FileUtils::getDataFromFile()
* FileUtils::getStringFromFile()
* FileUtils::getFileData()

and follow Android methods are now just calls FileUtils' ones.

* FileUtilsAndroid::getDataFromFile()
* FileUtilsAndroid::getStringFromFile()
* FileUtilsAndroid::getFileData()

* Fixes build error.

* FileUtils::getFileData: Return the size of data.

* Remove old methods form FileUtilsAndroid they are now done in FileUtils.

* Fixes for win32 code.

* Fixes build error in test and add more test.

* Better error message.

* Make template type name more readable.

* Update comments.

* Move internal functions to anonymous namespace.

* Refactor FileUtils test.

* Fix warning about compare signed and unsigned.

* Win32 and WinRT does not use text mode.

That is we don't need simulate convert CRLF to LF.

* Fixes for Win32 and WinRT.

* Update for Win32 and WinRT.

* Win32: return FileUtils:Error::TooLarge when file is large than 2^32-1.
* Win32: remove checkFileName() which has no effect at all.
* WinRT: add FileUtilsWinRT::getContents() using ::CreateFile2.
* WinRT: add override keyword for FileUtilsWinRT::getFileSize().

* Update for coding styles.

* More error strings.

* check read and malloc return codes.

* rename FileUtils::Error to FileUtils::Status.

* Fixes for WinRT, use GetFileInformationByHandleEx to get file size.

* Fixes build error for winrt and cleanup FileUtils::Status.

* Try to fix the build error on Linux.

Status must defined in some header, so move FileUtils.h up.

* Remove support of text mode on WinRT (it is the last platform support text mode).
2016-04-26 13:37:22 +08:00
minggo 2cc6ebc137 Merge pull request #15507 from CocosRobot/update_lua_bindings_1461642261
[ci skip][AUTO]: updating luabinding & jsbinding automatically
2016-04-26 11:49:15 +08:00
CocosRobot 29da95494e [ci skip][AUTO]: updating luabinding & jsbinding automatically 2016-04-26 03:47:27 +00:00
minggo a6b59c40be Merge pull request #15496 from treert/patch-2
[fix bug] reset UIGrayScale Shader when reload shaders
2016-04-26 11:44:20 +08:00
minggo 86df9b535a Merge pull request #15493 from njh0602/somefix
Renamed ignoreAnchorPointForPosition()
2016-04-26 11:41:09 +08:00
minggo 2f2373be87 Merge pull request #15497 from stevetranby/tilemap-csv-support
Add CSV format support to tile maps
2016-04-26 11:39:33 +08:00
minggo c8e2dc83d1 Merge pull request #15498 from ynaoto/v3
Warn if fontDef.charID exceeds 16bits.
2016-04-26 11:27:06 +08:00
minggo d5e4cc0b88 Merge pull request #15492 from mogemimi/fix-unused-variable-warning
Fix unused variable warning when building with Xcode
2016-04-25 15:50:58 +08:00
minggo 8792078bb4 Merge pull request #15500 from mogemimi/fix-warning-c4804
Fix compiler warning C4804 under Visual Studio
2016-04-25 13:59:15 +08:00
Josh Bodily 614c3c47d7 Josh/winrt inplace editbox (#15473)
* WinRT in-place edit box

* Fix static analysis errors
2016-04-25 11:17:09 +08:00
mogemimi d2c46167c3 Fix compiler warning C4804 under Visual Studio 2016-04-25 10:46:33 +09:00
Naoto Yoshioka d42cb71a27 Warn if fontDef.charID exceeds 16bits. 2016-04-25 01:02:50 +09:00
Steve Tranby 510e7b831e csv support working test 2016-04-23 17:31:10 -06:00
treert 2c4b634a50 reset UIGrayScale Shader when reload shaders
reset GLProgram for UIGrayScale Shader when reload shaders
2016-04-23 13:33:22 +08:00
NamJunHyone ea2b73c30e Renamed ignoreAnchorPointForPosition() 2016-04-22 22:29:49 +09:00
NamJunHyone 401f3a84ac Renamed ignoreAnchorPointForPosition() 2016-04-22 21:36:02 +09:00
mogemimi 71677ee286 Fix unused variable warning when building with Xcode 2016-04-22 20:25:32 +09:00
minggo 5aa83ef1cf Merge pull request #15490 from mogemimi/fix-signed-unsigned-mismatch
Fix warnings about signed/unsigned mismatch
2016-04-22 13:54:52 +08:00
Steve Tranby 0f0c9b627b Add support for Unsigned with CCValue (#13785)
Add support for Unsigned with CCValue
2016-04-22 13:49:20 +08:00
mogemimi a3ad4cddf8 Fix warnings about signed/unsigned mismatch 2016-04-22 12:20:05 +09:00
minggo 16c7a594c8 Merge pull request #14005 from wighawag/draw_node_shader_fix
allow to use custom shader uniforms and attributes on drawNode
2016-04-22 10:49:41 +08:00
minggo 2c75a4cf39 Merge pull request #15480 from mogemimi/remove-unary-operator
Remove incorrect unary operator to fix warnings
2016-04-21 15:42:29 +08:00
minggo 488ceb485d Merge pull request #14547 from colajam93/fix-linux-clang-build
Add missing header
2016-04-21 15:38:53 +08:00
CocosRobot 361e054d6d [ci skip][AUTO]: updating luabinding & jsbinding automatically 2016-04-21 07:07:41 +00:00
minggo 6459c92ee7 Merge pull request #13950 from Almax27/patch-4
Added CC_PROPERTY const qualifier
2016-04-21 14:56:01 +08:00
minggo 7de8f761d0 Merge pull request #14123 from jgod/patch-2
Check that textureAtlas isn't null before removing quads in SpriteBatchNode
2016-04-21 14:44:32 +08:00
minggo 949112fdc2 Merge pull request #14321 from pandemosth/socketIO_issue_14287
Fix SocketIO crash on reconnect
2016-04-21 14:28:21 +08:00
minggo fcd8aa30f4 Merge pull request #14312 from TimothyZhang/jsb-getDataFromFile-should-return-null-if-read-failed
return null if read failed in js_cocos2dx_CCFileUtils_getDataFromFile
2016-04-21 14:17:44 +08:00
minggo de3dac7664 Merge pull request #14090 from SongCF/v3
issues #14050 ActionManager memory leak
2016-04-21 14:09:52 +08:00
mogemimi eae7ec40ef Remove incorrect unary operator to fix warnings 2016-04-21 14:39:42 +09:00
MURAKAMI Yukio 9514b51057 Console refactor (#15013) 2016-04-21 11:31:20 +08:00
Ricardo Quesada b8eae430fb Merge pull request #15289 from m-yukio/feature/richtext_xml_refactor
extend the RichText
2016-04-20 20:05:29 -07:00
CocosRobot f4c9ea3902 [ci skip][AUTO]: updating luabinding & jsbinding automatically 2016-04-21 01:54:49 +00:00
minggo 481c55adb2 Merge pull request #15466 from wefiends/spriteframe-clone
Copy polygonInfo when cloning SpriteFrame
2016-04-21 09:49:00 +08:00
minggo 6b262a55cb Merge pull request #15472 from mogemimi/fix-deprecation-warning
Fix deprecation warning caused by PageView::getPages()
2016-04-21 09:47:49 +08:00
minggo b0ae128ec3 Merge pull request #15066 from TheCodez/patch-2
setPhysicsBody can be called multiple times again
2016-04-21 09:40:28 +08:00
Yukio Murakami a8ddbdc12c defaults and append tag support 2016-04-21 10:03:57 +09:00
Ricardo Quesada 775db978da fix: fix issue 15423 for v3.11
Github issue #15423
2016-04-20 08:41:20 -07:00
mogemimi 4dfdd159b7 Fix deprecation warning caused by PageView::getPages() 2016-04-21 00:28:34 +09:00
TheCodez afdd600045 Fix setPhysicsBody method 2016-04-20 11:46:10 +02:00
CocosRobot a9184f1047 [ci skip][AUTO]: updating luabinding & jsbinding automatically 2016-04-20 09:31:06 +00:00
AlwynC 4c7e4671d9 Modified the layer follow action class to include a horizontal (x) and vertical (y) offset. (#15194) 2016-04-20 17:25:31 +08:00
Nicholas Barrios 20b31eb1e8 Copy polygonInfo when cloning SpriteFrame 2016-04-20 03:04:19 -04:00
minggo 0a609e9176 Merge pull request #15461 from ricardoquesada/issue_15423
fix: fix crash in win for rich text
2016-04-20 13:41:07 +08:00
Ce Zheng 200c9fda59 fix HTTPAsyncConnection bad memory management
Removed a redundant release on certDataRef that caused crash on
NSURLConnectionLoader thread.
Fixed a memory leak of SecCertificateRef
This fixes #15464
2016-04-20 14:04:44 +09:00
Ce Zheng d848292860 make android downloader taskQueue thread
My previous fixes for the android downloader in #14530 are not thread
safe, this commit fixes the problem
2016-04-20 13:42:00 +09:00
minggo 08b000bacf Merge pull request #14426 from pyrosphere/fix-controller-ios6
Fix crash when using cocos2d::Controller on iOS6
2016-04-20 11:45:13 +08:00
minggo 3a7195f4b0 Merge pull request #14485 from cpascal/fix_libexport
Fix app-project generates .lib file in Win32
2016-04-20 11:26:25 +08:00
minggo f49f69dac8 Merge pull request #14525 from elvman/key_none
Add enum value for no key
2016-04-20 11:21:43 +08:00
Ce Zheng 7f1b02ab92 Merge branch 'fix/ios_downloader_crashes_with_storage_path_containing_spaces' into fix/several_network_bugs 2016-04-20 12:12:31 +09:00
minggo 095f404738 Merge pull request #14735 from linguofeng/patch-2
CCFileUtils-apple.mm Grammatical errors
2016-04-20 11:00:38 +08:00
minggo 9ef6035951 Merge pull request #15460 from mogemimi/add-missing-float-suffix
Add missing float suffix to avoid warning C4305
2016-04-20 10:35:56 +08:00
minggo e16d016c46 Merge pull request #15452 from 1scaR1/fix_osx_sandbox
Implement createDirectory for apple platform.
2016-04-20 10:26:45 +08:00
Ricardo Quesada 4bb35f2219 fix: fix crash in win for rich text
use `std::locale()` when invoking `std::isXXX` function
to avoid crash

github issue #15423
2016-04-19 13:53:27 -07:00
mogemimi f9f751834a Add missing float suffix to avoid warning C4305 2016-04-20 03:54:47 +09:00
Julien Jorge a3f28a18df Uniformize image support macro usage.
All images format implementation but WIC test the value of a CC_USE_<FORMAT>
preprocessor macro to verify if the implementation must be available or not.
WIC support is checked against the definition of the macro only,
independently of its value, thus making the implementation available even
if CC_USE_WIC = 0.

This commit makes the tests of the CC_USE_WIC macro identical to the tests
of the other similar image format macros.
2016-04-19 14:15:43 +02:00
minggo 29df93c5e4 Merge pull request #15458 from WenhaiLin/v3-0419
Fixed crash and actions may not have been executed.
2016-04-19 18:25:00 +08:00
minggo 09e476af9a Merge pull request #15450 from mogemimi/fix-deprecation-warning
Replace cc_utf8_to_utf16 with UTF8ToUTF16 to avoid deprecation warning
2016-04-19 16:51:52 +08:00
Wenhai Lin a8847ccf5e Fixed crash and actions may not have been executed. 2016-04-19 16:11:54 +08:00
Бесшапошников Никита a3717b6907 Add error logging of incorrect directory creating. 2016-04-19 10:17:31 +03:00
mogemimi 87be03fe9b Fix compilation error with Platform Toolset v120 for WinRT 2016-04-19 16:13:12 +09:00
minggo 776ee8ac5a Merge pull request #14843 from cezheng/fix/ios_downloader_crashes_with_storage_path_containing_spaces
fix iOS downloader crash when storage path contains spaces
2016-04-19 13:46:02 +08:00
minggo 03ad0f01c9 Merge pull request #15001 from mogemimi/refactor-httprequest
Refactor HttpRequest and HttpResponse
2016-04-19 11:23:59 +08:00
minggo 5c567c54b4 Merge pull request #15198 from perminovVS/v3-dev-wrong-log-detect-image-type
Wrong log message if use tga image
2016-04-19 11:00:55 +08:00
minggo f24eb55378 Merge pull request #15454 from tomi-payne/v3
Update CCSprite3D.cpp
2016-04-19 10:55:38 +08:00
minggo f3d8d043a1 Merge pull request #15447 from xpol/use-decltype-to-avoid-side-effect-warnings
Use decltype and std::remove_pointer to avoid side effect warnings.
2016-04-19 10:53:15 +08:00
minggo 660002c239 Merge pull request #15446 from xpol/fixes-integer-cast-warings
Fixes some integer cast warnings.
2016-04-19 10:27:37 +08:00
minggo df9a9292a2 Merge pull request #15453 from mogemimi/add-missing-dllexport
Add missing dllexport to avoid warning C4275
2016-04-19 10:26:58 +08:00
minggo b182adae5b Merge pull request #15448 from xpol/remove-internal-use-of-getFileData
Fixes deprecated warnings
2016-04-19 10:24:49 +08:00
minggo 5f6f35fb91 Merge pull request #15451 from xpol/fixes-format-warnings
Fixes format warnings.
2016-04-19 10:21:10 +08:00
minggo 3dbabdee05 Merge pull request #15099 from feijing566/v3
Add "id" for parser object
2016-04-19 10:18:04 +08:00
tomi-payne fbadcf188a Update CCSprite3D.cpp
Fixed Sprite3DCache::removeSprite3DData error
2016-04-19 10:11:29 +08:00
mogemimi 24a09a5ae7 Add missing dllexport to avoid warning C4275 2016-04-19 04:01:13 +09:00
mogemimi d1871d1ca7 Refactor HttpRequest and HttpResponse 2016-04-19 02:58:42 +09:00
mogemimi 19c2893509 Replace cc_utf8_to_utf16 with UTF8ToUTF16 to avoid deprecation warning 2016-04-18 19:50:59 +09:00
minggo f3fd111200 Merge pull request #14944 from mxenabled/josh/export_wicimageloader
Export WICImageLoader form DLL
2016-04-18 18:33:39 +08:00
minggo 93d331f1e8 Merge pull request #14965 from elloop/fix_opengl_log_function
fix opengl log function.
2016-04-18 18:32:00 +08:00
minggo 5bd592ca34 Merge pull request #15231 from SteveKChiu/v3
Fix calculation of base64Encode outLength
2016-04-18 17:54:14 +08:00
Xpol Wan dc0f7bf903 Fixes format warnings. 2016-04-18 17:52:58 +08:00
Бесшапошников Никита e555ed5b9e Implement createDirectory for apple platform. 2016-04-18 12:52:20 +03:00
xiaofeng11 061fc2f287 Fix on win32 platform if cpp-tests' windows been minisized, after window restore, content size is wrong. (#15236) 2016-04-18 17:15:56 +08:00
minggo 37655ea271 Merge pull request #15091 from mogemimi/fix-null-conversion
Fix return value of VertexAttribBinding::init()
2016-04-18 16:52:15 +08:00
minggo 6cc80f28fc Merge pull request #15096 from fnz/volume_control
Set music volume control as default
2016-04-18 16:48:55 +08:00
Xpol Wan bd263d6be4 Fixes deprecated warnings
* remove all internal use of FileUtils::getFileData().
2016-04-18 16:45:46 +08:00
minggo 7749ba6de8 Merge pull request #15444 from xpol/fixes-warings-unused-static-consts-in-cpp
Fixes warning about unused static constants.
2016-04-18 16:37:10 +08:00
xpol 24db45e925 Fixes some warnings in Lua manual bindings. (#15443)
1. Use __Type for deprecated classes.
2. Refactored LuaStack::luaLoadChunksFromZIP() and use FileUtils:getDataFromFile().
3. Fixes wrongly compare NULL with char array.
2016-04-18 16:35:50 +08:00
Xpol Wan 9ea3bc4aa8 Use decltype and std::remove_pointer to avoid side effect warnings. 2016-04-18 16:07:48 +08:00