Commit Graph

36074 Commits

Author SHA1 Message Date
CocosRobot e08cbc1c39 [ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically () 2017-03-07 09:45:23 +08:00
Bin Zhang b7f8dacd7c Solve the error logic in spine runtime. ()
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. () 2017-03-07 09:36:09 +08:00
James Chen ce2f4e892f Websocket bug fix after PR#17440 was merged. ()
* 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 () 2017-03-06 18:28:58 +08:00
James Chen bdcacd0031 Some fixes for search paths: ()
* 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
minggo 2983207021 update external version () 2017-03-06 16:57:25 +08:00
Tiffanyx 69d92bbe49 fixed : [webSocket ] webSocket random crash in win32 () 2017-03-06 14:18:58 +08:00
mogemimi e293520057 Fix some local variable names in tests () 2017-03-06 10:01:53 +08:00
Dale Stammen 13a438dbfd win10 uwp fix for new Mouse events () 2017-03-03 12:40:32 +08:00
Bin Zhang c69d14c32e Update the reference of submodule cocos2d-console. ()
Solve the error when using cocos command on Windows.
2017-03-02 18:07:05 +08:00
CocosRobot 7dbfc85a8f [ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically () 2017-03-02 16:08:53 +08:00
radman0x c442275c8e 17357: Better encapsulate the definition of mouse buttons ()
* 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
Bin Zhang 740e761d88 Update the reference of submodule cocos2d-console. ()
Changed: Improve the logic of gen-libs with external libraries tremolo & pvmp3dec.
2017-03-01 13:41:01 +08:00
James Chen eca39ba7aa fixed : [Android] AudioEngine::play2d may still wait 2 seconds if preload is too fast. () 2017-02-27 15:11:39 +08:00
mogemimi cfbbc65c71 Fix various typos in comments and strings () 2017-02-27 11:12:29 +08:00
mogemimi 0e28e68d45 Fix variable name typo in Sprite3DTest.js () 2017-02-27 10:32:48 +08:00
Bin Zhang a8dd7aff4f Update the reference of submodule cocos2d-console. ()
Changed: Add argument "--agreement" for skip the shown of agreement.
2017-02-24 17:28:47 +08:00
mogemimi 454fd8518b Fix minor typos in tests () 2017-02-24 12:45:41 +08:00
mogemimi 48cbc890c6 Typo fix: Rename `MutiTouchTest` to `MultiTouchTest` () 2017-02-23 17:05:08 +08:00
mogemimi 3937b4d631 Fix minor typos in UI test cases () 2017-02-23 16:14:39 +08:00
James Chen c86d7b0d2f fixed : Updates CMakeList.txt for win32 audio module () 2017-02-23 16:13:26 +08:00
Bin Zhang 494ddfbeee Update the reference of submodule web. ()
Fix the problem: Spine event callbacks are not work.
2017-02-22 18:24:54 +08:00
Bin Zhang 7416bb7008 Update the reference of submodule web. () 2017-02-22 14:15:06 +08:00
CocosRobot 06f2d415f7 [ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically () 2017-02-22 11:38:58 +08:00
Bin Zhang 41014fd54c Update the spine runtime of JS. () 2017-02-22 11:21:37 +08:00
minggo 5ae8a95c6f [ci skip]make all tests and template support Android Studio ()
* make all tests and template support Android Studio

* use grable 2.2.3
2017-02-21 17:58:30 +08:00
Chaoren Lin d14f4270aa Use ndk-build with Android Studio. ()
* Use ndk-build integration in Android Studio.

* Update build.gradle

* Update build.gradle

* Update build.gradle
2017-02-20 11:14:36 +08:00
James Chen 619e012d9b [WebSocket] Adds support for getting url and server selected protocol ()
* [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
子龙山人 f506cb9eb2 Merge pull request from CocosRobot/update_lua_bindings_1487317991
[ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically
2017-02-17 20:12:44 +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 ()
* 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. () 2017-02-17 11:18:13 +08:00
CocosRobot 126c983ca9 [ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically () 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. ()
* [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 ()
* 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
CocosRobot 59a15ac1e4 [ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically () 2017-02-14 16:04:59 +08:00
子龙山人 a8f7668b8c Fix glfw mac os 10.12.2 ()
* 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. () 2017-02-14 14:59:12 +08:00
CocosRobot d07794052f Update license to 2017 ()
* 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 ()
* 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 () 2017-02-14 10:24:55 +08:00
子龙山人 8bf29a493b fix label ttf line wrap ()
* fix label ttf line wrap

* improve code style
2017-02-13 18:00:33 +08:00
子龙山人 1baad6b962 Fix tizen compilation issue ()
* fix tizen compile issue

* enable websocket test on tizen

* change application id of tizen projects

* improve cpp-tests websockets

* update template app id of tizen

* fix tizen cpp-tests in release mode

* update 3rd deps version

* bump external version to 123
2017-02-13 17:59:48 +08:00
CocosRobot 62e759b9a1 [ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically () 2017-02-13 15:36:30 +08:00
James Chen 4237639dd6 Some fixes for websocket ()
* 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 ()
* 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 ()
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 () 2017-02-10 14:14:16 +08:00
James Chen 27e2012cf1 fixed : Material second shader texture will be lost when removeUnusedTextures is invoked. ()
* fixed : Material second shader texture will be lost when removeUnusedTextures is invoked.

* issue : Adds test case for issue .

* issue : 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