69d92bbe49
fixed #17433 : [webSocket ] webSocket random crash in win32 ( #17440 )
2017-03-06 14:18:58 +08:00
13a438dbfd
win10 uwp fix for new Mouse events ( #17434 )
2017-03-03 12:40:32 +08:00
7dbfc85a8f
[ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically ( #17430 )
2017-03-02 16:08:53 +08:00
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
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
c86d7b0d2f
fixed #17397 : Updates CMakeList.txt for win32 audio module ( #17401 )
2017-02-23 16:13:26 +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
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
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
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
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
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
e2ad8946cb
Replace unsigned int with size_t to avoid implicit conversion ( #17297 )
2017-02-07 09:41:19 +08:00
88c3fcde67
Full unicode support ( #17179 )
...
* Full unicode support
* test for emoji
2017-02-06 16:41:52 +08:00
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
e33cc3b257
fix when new is zero ( #17283 )
2017-02-06 15:17:18 +08:00
9820748184
Fix variable shadowing warnings ( #17282 )
2017-02-06 15:15:16 +08:00
c06612251c
Use range-based for loops to avoid shadowing ( #17281 )
2017-02-06 15:14:18 +08:00
df24911a23
Fix minor typos in naming ( #17280 )
2017-02-06 15:13:20 +08:00
d37ac4007b
fix memory leak ( #17284 )
2017-02-06 15:11:42 +08:00
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
aa9ce3ccb3
Fix implicit conversion warnings ( #17254 )
2017-02-04 10:38:22 +08:00
ccf6b99b6d
Avoid variable shadowing ( #17264 )
2017-02-04 10:37:37 +08:00
1d47ae7e90
Fix typo in function name ( #17253 )
2017-02-04 10:35:56 +08:00
4e6be0e9da
[ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically ( #17276 )
2017-02-04 10:35:08 +08:00
777a97e141
Fix typo in AudioState ( #17258 )
2017-02-04 10:34:34 +08:00
ca28af0113
Fixed variable order in initializer lists ( #17274 )
2017-02-04 10:33:58 +08:00
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
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
bdcf461dc3
[ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically
2017-01-23 01:32:57 +00:00
061122514c
Fix typo in Sprite (strech -> stretch) ( #17241 )
2017-01-23 09:25:56 +08:00
323838242f
Fix implicit conversion warning ( #17242 )
2017-01-23 09:24:36 +08:00
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
2b1d5768f0
Fix typo in RenderTexture: "Bufffer" -> "Buffer" ( #17235 )
2017-01-20 09:59:02 +08:00
87c29759f8
Fix typos in local variables ( #17236 )
2017-01-20 09:58:29 +08:00
1bc016b354
[ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically ( #17232 )
2017-01-19 14:15:08 +08:00
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
f6f7b2157a
Solve the compile error when building platform tizen. ( #17216 )
2017-01-19 09:43:23 +08:00
dad9929aad
Fix warnings about implicit conversion loses integer precision ( #17220 )
2017-01-19 09:41:57 +08:00
86ef735e60
Fix misspelling of setFirstFocusedWidget function ( #17219 )
2017-01-19 09:41:12 +08:00
fd10661050
Fix typo in variable name ( #17218 )
2017-01-19 09:40:35 +08:00
c4d0d56f3a
check pointer before using ( #17215 )
2017-01-19 09:32:58 +08:00
00b9dcd62e
Lua custom handler ( #17211 )
...
* avoid crash if custom handler vector is empty
* simplify codes
2017-01-18 17:05:08 +08:00
42c77247cc
Fixed Scheduler bug occured when unschedule target during update. ( #17203 )
2017-01-18 16:32:36 +08:00
8b9c89f6a9
Fix typos in comments and strings ( #17201 )
2017-01-18 15:41:18 +08:00
efc3e5979b
Fix typo in function name ( #17202 )
2017-01-18 15:40:46 +08:00
0de81de721
fix #14936 ( #17190 )
...
* fix #14936
* #14936 testcases
2017-01-17 09:48:30 +08:00
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
888b985e0e
Fix variable name typo ( #17195 )
2017-01-16 11:21:34 +08:00
21d57bfd39
[ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically ( #17185 )
2017-01-16 11:20:39 +08:00
bebd11f853
Correct spelling of "intersect" ( #17194 )
2017-01-16 11:20:07 +08:00
88a1cd73fa
improves fix for issue #17119 (v3) ( #17188 )
2017-01-16 09:30:08 +08:00
59403ad40d
Propagate onTouchCancelled ( #17174 )
2017-01-13 18:09:01 +08:00
61c856679e
getLetter function for Text ( #17178 )
2017-01-13 18:06:01 +08:00
7b430ce7c2
fix child removing from ListView ( #17177 )
2017-01-13 14:38:28 +08:00
15e56c06a4
outline to float ( #17176 )
2017-01-13 14:31:12 +08:00
f2114f36f8
[ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically ( #17183 )
2017-01-13 14:04:11 +08:00
1b6c8cc5c1
bind FileUtils:getDataFromFile() to lua ( #17182 )
2017-01-13 13:39:58 +08:00
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
84a3f73ecb
Particle set display frame ( #17163 )
...
* Fix CCParticleSystemQuad::setDisplayFrame()
* Added tests
2017-01-12 11:48:30 +08:00
91beb8db86
Fix incorrect function name for calculateBillboardTransform ( #17164 )
2017-01-12 10:14:04 +08:00
71a82f0f0d
Correct spelling of function name `getAncestorWidget` ( #17158 )
2017-01-11 05:36:13 -08:00
6e8ced6c8c
Fix minor typos in function parameters ( #17157 )
2017-01-11 05:34:57 -08:00
21795b71b4
sprite: doc fixes ( #17154 )
2017-01-11 05:33:41 -08:00
3bcf8fc48a
use std::stable_sort to keep order ( #17156 )
2017-01-11 15:47:36 +08:00
afb55253f1
fix dutch language value and add missing languages ( #17160 )
2017-01-11 14:04:45 +08:00
90e0ab0c2e
[ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically ( #17152 )
2017-01-11 10:49:48 +08:00
Tiffanyx