Commit Graph

12461 Commits

Author SHA1 Message Date
colajam93 e7f739897c Fix deprecated warning () 2016-09-20 14:48:00 +08:00
mogemimi 63b3043dc0 Remove extra semicolon after member function definition () 2016-09-20 14:43:48 +08:00
halx99 a46b30f8a6 use more plain API FileUtils::getStringFromFile () 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 () 2016-09-14 10:49:14 -07:00
Steve Tranby 2776d1e715 XCode sometimes gets confused with multiple 'Rect' types () 2016-09-14 10:46:17 -07:00
mogemimi 63637139dc Fix -Wpessimizing-move warning when using Xcode 8 () 2016-09-14 10:45:26 -07:00
mogemimi afe8b05da8 Remove semicolons before method bodies () 2016-09-14 10:44:00 -07:00
Jun Hyeon, Nam 4342aabe28 remove unnecessary comments () 2016-09-14 10:42:25 -07:00
Ricardo Quesada 5f4fb66f61 fix: staggered hex maps returns correct tile ()
* fix: staggered hex maps returns correct tile

order was fixed in the array that contains the GIDs.

fixes Github issue 

* fix: add fix validation code for issue 
2016-09-13 21:47:36 -07:00
CocosRobot 7410bdd981 [ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically () 2016-09-12 10:03:21 +08:00
Wilson E. Alvarez 74fd5ae3ba Fix mismatched memory deallocator () 2016-09-12 10:02:48 +08:00
Steve Tranby 16781b00e8 change EaseBounce to real class instead of typedef () 2016-09-12 09:51:27 +08:00
minggo 3075108f1c get sdk version from java () 2016-09-12 09:49:39 +08:00
James Chen b8f127e601 fixed : [ios, mac] Protencial memory leak in AudioPlayer.mm. ()
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 () 2016-09-12 09:46:19 +08:00
mogemimi 2b9ac2c950 Remove redundant semicolons () 2016-09-12 09:45:34 +08:00
mogemimi eca7b2392d Remove unnecessary inline keywords () 2016-09-12 09:44:21 +08:00
minggo 86de22a008 fix crash if FontAtlas pointer is the same () 2016-09-09 11:39:00 +08:00
Sachin Garg 84f6863214 getSlidBallRenderer methods to allow more customization of UISlider ()
* 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 () 2016-09-08 10:38:16 +08:00
minggo 569681f6bd use api level 13 () 2016-09-07 14:50:03 +08:00
Ricardo Quesada 282959cc0f fix: uses correct design resolution ()
fixes github issue 
2016-09-07 12:01:40 +08:00
Peter Siegmund 9449e687af fixed compile error for android-studio build (with-controller) () 2016-09-07 12:01:11 +08:00
Ricardo Quesada 2d1048bd00 fix: uses default designResolution if not set previosly ()
fixes github issue 
and re fixes github issue 
2016-09-07 11:11:52 +08:00
minggo fa15ab8212 3.13.1 text color ()
* fix: Label updateColor() and underline color work as expected ()

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

fixes Github issue 

* fix conflict

* Issue 16471 ()

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

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

fixes Github issue 

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

* update engine version
2016-09-06 17:01:23 +08:00
minggo c51605971f fixed : [android, audio] AudioEngine::stop() triggers 'finished' callback () () 2016-09-06 10:58:43 +08:00
Allen Lee 7c298bdcd7 misspelling check on cocos directory ()
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 : SPINE color bug (temporary storage of color was wrong in SkeletonRenderer) () 2016-09-06 10:11:54 +08:00
CocosRobot 8d2b645a96 [ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically ()
* fixed : OpenSLES error while play background music in writable path or sdcard. () ()

* [ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically
2016-09-06 10:11:11 +08:00
minggo 9dc737901b fixed : OpenSLES error while play background music in writable path or sdcard. () () 2016-09-06 09:41:53 +08:00
minggo a6c398ec95 Fixes jsval_to_std_string could not convert number to string. () ()
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 () 2016-09-05 13:48:58 +08:00
CocosRobot 6f4551cdad [ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically () 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 () 2016-09-05 10:06:42 +08:00
James Chen 5bfd110424 Fixes jsval_to_std_string could not convert number to string. ()
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 () 2016-09-02 10:44:55 +08:00
pyrosphere 0cd365dd2e Fix MenuItemSprite::unselected() on disabled items showing _normalImage instead of _disabledImage () 2016-09-02 09:51:47 +08:00
Ricardo Quesada c32000250c Issue 16471 ()
* fix: Label updateColor() and underline color work as expected

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

fixes Github issue 

* docs: added more internal doc for issue_16471
2016-09-01 16:59:40 +08:00
minggo db21e5f349 [ci skip]Travis enable pull request ()
* 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 () 2016-09-01 16:10:02 +08:00
James Chen 64c62d37c2 fixed : [android, audio] AudioEngine::stop() triggers 'finished' callback () 2016-09-01 16:06:29 +08:00
James Chen 6d27868918 fixed : OpenSLES error while play background music in writable path or sdcard. () 2016-09-01 11:47:33 +08:00
James Chen 01e67f6203 fixed : [android, audio] Deadlock if preload the same file more than 3 times in preload callback. ()
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. ()
* 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 ()
fixes Github issue  correctly. underline uses _displayColor
and not _textColorF. _textColorF is only for the text.
This also emulates the SystemFont underline behavior

fixes Github issue 
2016-08-31 20:20:13 -07:00
mogemimi 58ede40ed9 Add missing definition of PhysicsBody::getFirstShape (Revert part of ) () 2016-08-29 19:23:14 -07:00
Rubonnek 91efab2ba7 Fix memory leak caused by packetOut in SocketIO.cpp () 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. () 2016-08-30 09:36:45 +08:00
Ricardo Quesada 9dea92b2e0 feat: add support for Game Controllers on Mac ()
it shares 100% the same code with iOS.
it only adds a few #ifdefs.

github issue 
2016-08-29 16:58:44 -07:00
子龙山人 0b1f61b8ce fix possible crash of label shrinked () 2016-08-29 15:23:01 +08:00
minggo df3b33cd59 Merge pull request 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 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 () 2016-08-29 11:48:21 +08:00
mogemimi 6c3f5e6d6b Fix variable shadowing warnings caused by Spine 3.4 () 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 ()
* 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 () 2016-08-24 18:27:44 -07:00
halx99 5bc3659a33 #Improve XML parse performance with rapidxml pure SAX parser ()
* 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 ()
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 
2016-08-24 18:15:19 +08:00
mogemimi a9a8add717 Add missing class declaration and remove duplicate declaration () 2016-08-24 18:09:29 +08:00
Michael Kösel c339266556 [UserDefault-android] Return defaultValue parameter instead of some default value ()
* 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__ ()
* avoid to use __system_get_property__

* add utils

* revert console
2016-08-24 17:11:41 +08:00
9b9387 e124fe4fc5 Update CCBProxy.cpp ()
fixed bug
2016-08-23 14:48:06 +08:00
Adrien de Sentenac 3c60398c09 Fix size/position calculations for Linux system fonts. () 2016-08-23 12:01:43 +08:00
minggo 1b3ff00cef fix compiling error () 2016-08-23 11:05:01 +08:00
Furkan Üzümcü 5b83fa1ac0 Fix LNK4098 and LNK2001 warnings ()
* 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 () 2016-08-22 15:49:43 +08:00
pandamicro ec52cf4aa4 [ci skip] Remove LayerRGBA in scripts to avoid issues and update web ref ()
* 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 ()
* #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. () 2016-08-22 09:43:06 +08:00
mogemimi 7afde8c7a6 Remove unnecessary ActionInterval casts () 2016-08-22 09:39:58 +08:00
pandamicro f0be4f3069 Merge part of Cocos2d-x-lite ()
* 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

* : 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  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 ()
memory leak fixed in RenderState

fixes github issue 
2016-08-19 00:22:57 -07:00
minggo 92ed162cbe replace replace __system_property_get() since it is deprecated in 64 bit android NDK () 2016-08-19 11:49:33 +08:00
minggo e9a5a4e2bd Revert luajit ()
* 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 () 2016-08-19 09:36:50 +08:00
Ricardo Quesada 3ecaa71944 fix: validates director before layout in iOS ()
Adds Director::isValid()
removes DisplayLinkDirector()
removes virtual functions from Director()
Director is no longer an abstract class

github issue 
2016-08-18 18:13:15 -07:00
Ricardo Quesada 604312ac35 Revert "fix: uses correct constant for Eye in Director" () 2016-08-17 17:53:20 -07:00
minggo 3ce4134ab3 use java reflection to avoid API level dependent, use app-abi 10 ()
* 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 () 2016-08-16 16:56:06 +08:00
charlesstlaurent b1a64ae730 new actions ResizeBy and ResizeTo ()
* 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 ()
fixes github issue 
2016-08-15 23:27:20 -07:00
James Chen 86b8a633f3 Android arm64-v8a also uses Luajit. ()
* 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. () 2016-08-15 14:10:13 +08:00
Ricardo Quesada 02de525cbd deprecates CCProgressTimer::setReverseProgress() ()
use CCProgressTimer::setReverseDirection() instead.

fixes github issue 
2016-08-15 14:08:42 +08:00
mogemimi b837dd7a20 Avoid unnecessary allocation if targetGrid is reusable () 2016-08-15 14:07:37 +08:00
James Chen 020745ee2e Disables 'permessage-deflate' extension for WebSocket temporarily. ()
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 () 2016-08-15 10:53:07 +08:00
Ricardo Quesada 3bc662ea7b fix: not resize textureatlas multiple times on Label::create() ()
since we know the size before allocating it, just reserve
the needed capacity once.

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

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

fixes issue 
2016-08-10 03:24:41 -07:00
JaryGuo f9abbf02f6 fix the problem in ccUTF8.cpp and CCLuaJavaBridge.cpp ()
* 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. () 2016-08-08 10:20:15 +08:00
Ricardo Quesada e5b14733c8 from spine source code ()
Related to:

* Github issue 
* Github issue 
2016-08-08 09:47:05 +08:00
Ricardo Quesada f7464f8de5 fix: TriangleCommands with custom uniforms can be batched ()
* 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 

* better tests
2016-08-07 14:51:02 -07:00
minggo 0e65025bda Revert "Match parent's camera mask when adding child." () 2016-08-05 17:28:05 +08:00
minggo abb97b1b71 don't set camera the same as its parent by default () 2016-08-05 17:26:27 +08:00
James Chen f44f253179 [Android] Notify waitup only while preloadEffect(info, cb) is invoked in play2d. ()
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 correctly" () 2016-08-05 14:06:03 +08:00
子龙山人 0d836b2cea Fix pageview click turning event ()
* 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 () 2016-08-05 09:46:50 +08:00
子龙山人 08515f46e3 fix pageView click turning event () 2016-08-05 09:43:15 +08:00
James Chen b135d512d2 Update copyright to 2016. () 2016-08-05 09:42:15 +08:00
mogemimi 3175316131 Fix format string warning when compiling for iOS armv7 () 2016-08-04 09:54:27 +08:00
James Chen cc9871b71d fixed : New AudioEngine class can't play large ogg file on Win32. ()
* fixed : 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 () 2016-08-04 09:51:54 +08:00
halx99 73f80f4c73 #Make etc1 alpha support ok for ProgressTimer ()
* #Make etc1 alpha support ok for ProgressTimer

* #fix issues

* Add comment
2016-08-03 14:29:34 +08:00
minggo ba51370e43 use correct shader () 2016-08-03 10:56:12 +08:00
Ricardo Quesada 143317871d fixes issue correctly ()
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+ () 2016-08-02 16:52:15 +08:00
Jeff Wang f8b2d8fe0f fixed base URL for webview on android doesn't work ()
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 () 2016-08-02 15:29:23 +08:00
Dred95 d68f105da4 Fix openURL ubuntu error () 2016-08-01 11:51:05 +08:00
mogemimi c03dd85c3f Remove redundant includes () 2016-08-01 10:22:35 +08:00
mogemimi 269bdbed85 Fix compiler warnings caused by Spine 3.4 () 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 () 2016-07-31 22:50:28 +08:00
Vladimir Perminov c26b755175 Android import cpufeatures in cocos. ()
* Android import cpufeatures in cocos.

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

* Issues 

* Issues 
2016-07-31 22:45:30 +08:00
halx99 a2adfaf7df #Improve node sort performance for 64-bit by std::sort + long long (_localZOrder) ()
* #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. ()
* 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 ()
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." () 2016-07-29 15:35:29 -07:00
minggo 9a8f577095 fix some typos () 2016-07-29 17:20:42 +08:00
halx99 3a3f6bd385 #Use Data::takeBuffer replace deep copy data. ()
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 () 2016-07-29 13:40:46 +08:00
minggo 88eb533f9d Revert "#improve node sort performance by std::sort + long long (_localZOrder) for 64-bit" () 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. ()
* Win32 MessageBox correct show utf8

Support MessageBox utf8 string
based on pr 

* LuaLog convert utf8 by common unicode api.

* Add CCStdC.h
2016-07-29 09:36:39 +08:00
minggo a8ce513f6c Merge pull request from dumganhar/fix/iss14148-ios-no-sound
fixed : 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 ()
* Upgrades to Spine v3.4

Github issue 

* 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 from Drakon-Cocos/PageViewIndicator
Fix PageViewIndicator opacity for 'inactive' pages
2016-07-28 14:44:35 +08:00
James Chen 66fac82f00 fixed : new android project crash in android 5.0.2 device (Nexus 7) when use 3.12 ()
* fixed : new android project crash in android 5.0.2 device (Nexus 7) when use 3.12

* fixed : 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 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. ()
* 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 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 
2016-07-27 15:31:32 +03:00
halx99 3a14388087 #improve node sort performance by std::sort + long long (_localZOrder) ()
* #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 from dumganhar/fix/iss16192-smallaudio-crash
fixed : Crash while decoding small MP3 file on Android.
2016-07-27 15:39:57 +08:00