Commit Graph

12633 Commits

Author SHA1 Message Date
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
minggo 828fabdeb3 add uniform for mobile too (#17324) 2017-02-08 16:39:06 +08:00
Wilson E. Alvarez 5d748f941b Mitigate cppcheck message (#17323) 2017-02-08 15:32:01 +08:00
minggo 92704517bc remove unneeded assignment (#17320) 2017-02-08 13:58:11 +08:00
minggo e80f4bb9f6 use stable sort to keep order (#17321) 2017-02-08 13:57:41 +08:00
CocosRobot 3d51645d3d [ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically (#17319) 2017-02-08 10:42:18 +08:00
Dmitry 4bf1750cbd issue #17305 fix: cocos/audio/win32/AudioCache.h fixed include <AL/al.h> (#17306) 2017-02-08 10:22:05 +08:00
j-jorge 373e4a904a Assert that a node cannot be inserted as a child of itself. (#17296) 2017-02-08 10:02:10 +08:00
Jeff Wang ae60397472 add 'makeRef' for easier making a RefPtr (#17302) 2017-02-08 10:00:08 +08:00
Dale Stammen 9381152ef1 removed support for Windows 8.1 store and phone (#17311) 2017-02-08 09:46:47 +08:00
mogemimi 92dfdad12b Fix typo in ModelData: `matrial` to `material` (#17308) 2017-02-08 09:45:05 +08:00
Dale Stammen 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
mogemimi 75d2e76095 Fix minor typos in comments and docs (#17294) 2017-02-07 09:41:52 +08:00
mogemimi e2ad8946cb Replace unsigned int with size_t to avoid implicit conversion (#17297) 2017-02-07 09:41:19 +08:00
newnon 88c3fcde67 Full unicode support (#17179)
* Full unicode support

* test for emoji
2017-02-06 16:41:52 +08:00
CocosRobot 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
newnon e33cc3b257 fix when new is zero (#17283) 2017-02-06 15:17:18 +08:00
mogemimi 9820748184 Fix variable shadowing warnings (#17282) 2017-02-06 15:15:16 +08:00
mogemimi c06612251c Use range-based for loops to avoid shadowing (#17281) 2017-02-06 15:14:18 +08:00
mogemimi df24911a23 Fix minor typos in naming (#17280) 2017-02-06 15:13:20 +08:00
minggo d37ac4007b fix memory leak (#17284) 2017-02-06 15:11:42 +08:00
minggo 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
mogemimi aa9ce3ccb3 Fix implicit conversion warnings (#17254) 2017-02-04 10:38:22 +08:00
mogemimi ccf6b99b6d Avoid variable shadowing (#17264) 2017-02-04 10:37:37 +08:00
mogemimi 1d47ae7e90 Fix typo in function name (#17253) 2017-02-04 10:35:56 +08:00
CocosRobot 4e6be0e9da [ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically (#17276) 2017-02-04 10:35:08 +08:00
mogemimi 777a97e141 Fix typo in AudioState (#17258) 2017-02-04 10:34:34 +08:00
Wilson E. Alvarez ca28af0113 Fixed variable order in initializer lists (#17274) 2017-02-04 10:33:58 +08:00
j-jorge 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
j-jorge 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
CocosRobot#Set bdcf461dc3 [ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically 2017-01-23 01:32:57 +00:00
mogemimi 061122514c Fix typo in Sprite (strech -> stretch) (#17241) 2017-01-23 09:25:56 +08:00
mogemimi 323838242f Fix implicit conversion warning (#17242) 2017-01-23 09:24:36 +08:00
minggo 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
mogemimi 2b1d5768f0 Fix typo in RenderTexture: "Bufffer" -> "Buffer" (#17235) 2017-01-20 09:59:02 +08:00
mogemimi 87c29759f8 Fix typos in local variables (#17236) 2017-01-20 09:58:29 +08:00
CocosRobot 1bc016b354 [ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically (#17232) 2017-01-19 14:15:08 +08:00
James Chen 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
Bin Zhang f6f7b2157a Solve the compile error when building platform tizen. (#17216) 2017-01-19 09:43:23 +08:00
mogemimi dad9929aad Fix warnings about implicit conversion loses integer precision (#17220) 2017-01-19 09:41:57 +08:00
mogemimi 86ef735e60 Fix misspelling of setFirstFocusedWidget function (#17219) 2017-01-19 09:41:12 +08:00
mogemimi fd10661050 Fix typo in variable name (#17218) 2017-01-19 09:40:35 +08:00
minggo c4d0d56f3a check pointer before using (#17215) 2017-01-19 09:32:58 +08:00