06f2d415f7
[ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically ( #17392 )
2017-02-22 11:38:58 +08:00
41014fd54c
Update the spine runtime of JS. ( #17391 )
2017-02-22 11:21:37 +08:00
5ae8a95c6f
[ci skip]make all tests and template support Android Studio ( #17389 )
...
* make all tests and template support Android Studio
* use grable 2.2.3
2017-02-21 17:58:30 +08:00
d14f4270aa
Use ndk-build with Android Studio. ( #15676 )
...
* Use ndk-build integration in Android Studio.
* Update build.gradle
* Update build.gradle
* Update build.gradle
2017-02-20 11:14:36 +08:00
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
f506cb9eb2
Merge pull request #17382 from CocosRobot/update_lua_bindings_1487317991
...
[ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically
2017-02-17 20:12:44 +08:00
a3daaf3626
[ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically
2017-02-17 07:53:15 +00:00
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
c553d418e4
[websocket] Pass nullptr for protocol parameter if there aren't any protocols are assigned. ( #17379 )
2017-02-17 11:18:13 +08:00
126c983ca9
[ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically ( #17375 )
2017-02-17 10:17:46 +08:00
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
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
59a15ac1e4
[ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically ( #17366 )
2017-02-14 16:04:59 +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
8fbf04ee28
Updates license year. ( #17363 )
2017-02-14 14:59:12 +08:00
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
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
1baad6b962
Fix tizen compilation issue ( #17341 )
...
* 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
62e759b9a1
[ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically ( #17350 )
2017-02-13 15:36:30 +08:00
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
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
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
ced1009291
[ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically ( #17339 )
2017-02-10 14:14:16 +08:00
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
34d4c65c86
fix crash on Android ( #17338 )
...
The crash is caused because of local reference table overflow
2017-02-10 13:51:29 +08:00
c61cd9afe7
fix spine binding codes and test case ( #17335 )
2017-02-10 11:58:23 +08:00
1ef380f3a9
Update the submodule cocos2d-console. ( #17337 )
...
Changed: Solve the error when compile project for tizen with option `--tizen-strip`.
2017-02-10 10:44:05 +08:00
d160d79d5b
Fix typos in comments and strings ( #17333 )
2017-02-10 10:35:52 +08:00
19ffd3a5ff
Remove `const T&` qualifiers from fundamental type arguments ( #17334 )
2017-02-10 10:34:47 +08:00
85dbcc1638
[ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically ( #17332 )
2017-02-09 17:07:42 +08:00
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
b672b94edc
Removed unnecessary assignments ( #17328 )
2017-02-09 10:57:01 +08:00
24af4b3ddb
Fix variable shadowing warning ( #17329 )
2017-02-09 10:55:24 +08:00
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
828fabdeb3
add uniform for mobile too ( #17324 )
2017-02-08 16:39:06 +08:00
5d748f941b
Mitigate cppcheck message ( #17323 )
2017-02-08 15:32:01 +08:00
92704517bc
remove unneeded assignment ( #17320 )
2017-02-08 13:58:11 +08:00
e80f4bb9f6
use stable sort to keep order ( #17321 )
2017-02-08 13:57:41 +08:00
671861c710
[ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically ( #17322 )
2017-02-08 13:57:29 +08:00
5c1fbdae7d
update version to v3-deps-121 ( #17318 )
2017-02-08 11:11:18 +08:00
3d51645d3d
[ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically ( #17319 )
2017-02-08 10:42:18 +08:00
4bf1750cbd
issue #17305 fix: cocos/audio/win32/AudioCache.h fixed include <AL/al.h> ( #17306 )
2017-02-08 10:22:05 +08:00
373e4a904a
Assert that a node cannot be inserted as a child of itself. ( #17296 )
2017-02-08 10:02:10 +08:00
ae60397472
add 'makeRef' for easier making a RefPtr ( #17302 )
2017-02-08 10:00:08 +08:00
9381152ef1
removed support for Windows 8.1 store and phone ( #17311 )
2017-02-08 09:46:47 +08:00
92dfdad12b
Fix typo in ModelData: `matrial` to `material` ( #17308 )
2017-02-08 09:45:05 +08:00
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
75d2e76095
Fix minor typos in comments and docs ( #17294 )
2017-02-07 09:41:52 +08:00
CocosRobot