Commit Graph

12676 Commits

Author SHA1 Message Date
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