e08cbc1c39
[ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically ( #17453 )
2017-03-07 09:45:23 +08:00
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
6cd7314497
cocos2d::Sequence::isDone() checks that the last action is actually done. ( #17437 )
2017-03-07 09:36:09 +08:00
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
b32c84f8c2
[ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically ( #17449 )
2017-03-06 18:28:58 +08:00
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
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
1d2b73166e
Fix typos in docs ( #17132 )
2017-01-11 09:31:45 +08:00
91ae4b1c03
[ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically ( #17143 )
2017-01-10 16:59:15 +08:00
e9a947b02a
updated location of openssl dlls ( #17133 )
2017-01-10 16:50:22 +08:00
733799f4a1
fix crash if physics3d camera is not set ( #17139 )
2017-01-10 15:37:29 +08:00
e100d02dff
Sprite fixes: color + polygon ( #17135 )
...
* fixes issue #17119
and sanitizes the code a little bit
* more fixes
* fixes issue #17116
* restore xcode "none" sign profile
* code is cleaner
add more documentation in CCSprite.h
* missing assets
* anchor point works with batchnodes again
2017-01-10 15:28:47 +08:00
9d3d869c9d
make webview can clean cached data ( #17130 )
...
* make webview can clean cached data
* add implementatoin
2017-01-10 11:30:11 +08:00
4574896dbb
add some comments for key limitation ( #17122 )
2017-01-09 09:27:38 +08:00
54c32fc669
Fix for issue #17114 . Improves the ability to add placeholder color and font for single line text fields on iOS
2017-01-08 16:02:17 -08:00
af503f4a65
Allow velocity to be applied to Chipmunk's kinematic bodies ( #17094 )
...
* Allow velocity to be applied to Chipmunk's kinematic bodies
* Added check for CP_BODY_TYPE_STATIC
Thanks to @minggo for the code review
2017-01-06 09:35:34 +08:00
44fb4ba3bc
To use some HTTP client library those use `send(null)` like `superagent`,`XMLHTTPRequest` should send a empty request instead of abort. ( #16989 )
2017-01-05 16:12:03 +08:00
69217f0e8b
[ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically
2017-01-05 01:40:38 +00:00
ff8e622b7a
Slice9 Sprite with triangles, not quads ( #17105 )
...
* sprites: use triangles instead of quads
uses less memory
* oops, color should be white by default
* works with flipped sprites
* none for xcode
2017-01-05 09:27:13 +08:00
93d193dfcc
Openssl adjust ( #17106 )
...
* change openssl search path
* copy libopenssl from openssl folder
* update external version
2017-01-05 09:22:38 +08:00
f5a90765fc
fix type conversion warnings ( #17061 )
...
* Fix conversion warning
from unsigned int to float
* Fix type conversion warning
* Fix type conversion warning
* change the return type of getOutlineSize to float
* fix typo
2017-01-04 12:01:07 +08:00
8e21738634
fix text input auto correction type ( #17085 )
2017-01-04 12:00:18 +08:00
a0acaf5972
Merge pull request #17101 from minggo/merge-v314
...
Merge v314
2017-01-04 11:48:31 +08:00
61170c69ee
[ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically ( #17103 )
2017-01-04 11:47:58 +08:00
79126ea72a
make ListView::setGlobalZOrder() work ( #17098 )
...
* make ListView::setGlobalZOrder() work
* revert modification of UIButton
* reset background color
* change global z order to test
2017-01-04 11:06:44 +08:00
f63fad3e27
Merge branch 'v3.14' into merge-v314
2017-01-04 09:49:22 +08:00
b3279bafa7
implements issue #17069 ( #17090 )
...
implemnts suggestion done by @three0s
2017-01-03 09:49:22 +08:00
0564d43478
fix bug, do not add null bones ( #16948 )
2016-12-29 15:44:57 +08:00
e4e872a065
fixed #16849 : Preload many audios may cause crash on devices those use Samsung Exynos CPU. ( #17049 )
...
* fixed #16849 : Preload many audios may cause crash on devices those use Samsung Exynos CPU.
* Adds comment for __SLPlayerMutex variable.
* Fixes wrong comments in AudioDecoder.cpp
2016-12-29 15:41:47 +08:00
ce4685c64f
vec4 operator < seems error ( #17072 )
...
* bug fix
* Vec4 operator <
2016-12-29 15:26:25 +08:00
4c5459660b
Merge pull request #17038 from MrCapone/ui_touch_fixes
...
CheckBox touch fix
2016-12-29 14:20:15 +08:00
163e730849
Fix label disableeffect ( #17075 )
...
* add toggle rendering type test
* fix label additional kerning
* only substract additionalKerning when bold is enabled
2016-12-29 13:59:24 +08:00
208d39151e
Reverts create thread pool code, android doesn't need to create a thread pool in AudioEngine.cpp ( #17081 )
2016-12-29 10:22:45 +08:00
be43c4210f
Fixes crash that playing long audio and then uncacheAll ( #17079 )
...
* Fixes crash of playing long audio then uncacheAll.
* update
* Updates comments in MciPlayer.h
* tab -> 4spaces
* include path fix.
2016-12-29 10:05:13 +08:00
41abefd082
Merge branch 'v3.14' of github.com:cocos2d/cocos2d-x into v3.14
...
# Conflicts:
# CHANGELOG
# cocos/scripting/js-bindings/manual/cocos2d_specifics.cpp
# cocos/scripting/js-bindings/manual/spine/jsb_cocos2dx_spine_manual.cpp
2016-12-26 18:53:42 +08:00
88be66218b
Small fix to CallbackWrapper
2016-12-26 00:08:59 +08:00
7c2ea03b00
Improve TrackEntry issue solution with internal unordered_map
2016-12-26 00:08:18 +08:00
c4a20a032f
creator c++ support bug fixes ( #17051 )
...
I need these 2 changes applied to v3.14 in order to
support C++ correctly in Creator.
Thanks!
2016-12-21 16:17:32 +08:00
c071839e85
#17037 cocos/ui/UICheckBox.cpp fix: touch event logic
2016-12-21 13:21:40 +07:00
a715e3169f
Sync issue fixes from creator ( #17041 )
...
* Add EventDispatcher#hasEventListener (sync from creator)
* Fix function wrapper using js object during its gc
* Support more system languages
* Direct log/error for better understanding problems & add sys.now
* Synchronize Editbox APIs
* Synchronize Scheduler.PRIORITY_NON_SYSTEM const
* Upgrade web engine
* Upgrade test cases
* Manually bind EventDispatcher::addCustomEventListener to avoid memory issue
* Manual bind EventListeners’ create to avoid memory issue
* Fix compilation issue when COCOS_DEBUG = 2
* Unify function name of Texture2D::releaseTexture
* Fix compilation issues and update web & bindings-generator
* Fix lua compilation issue
* Use %ld instead of %zd
* Separate FinalizeHook for ref objects and non ref objects
* Fix spine TrackEntry recursive conversion issue by using getter
* Fix crash during Wrappers deallocation (possible to have leak)
* Increase default JS heap to 32 mb
* Update engine version
* Add change log of web engine
* Improve cc.formatStr
* Fix chipmunk crash issues when using setDefaultCollisionHandler
* Add change log for JSB and update web engine ref
2016-12-21 13:39:34 +08:00
100c027054
Fix chipmunk crash issues when using setDefaultCollisionHandler
2016-12-21 11:07:18 +08:00
a3d6705b02
Improve cc.formatStr
2016-12-21 11:05:49 +08:00
24be2acde0
Merge branch 'v3.14' of github.com:cocos2d/cocos2d-x into v3.14
...
# Conflicts:
# cocos/scripting/js-bindings/manual/cocos2d_specifics.cpp
# cocos/scripting/js-bindings/manual/js_manual_conversions.cpp
# cocos/scripting/js-bindings/manual/jsb_event_dispatcher_manual.cpp
# tests/js-tests/src/SpineTest/SpineTest.js
2016-12-19 12:39:55 +08:00
149bdf125e
Update engine version
2016-12-19 12:15:41 +08:00
51a09048bd
Increase default JS heap to 32 mb
2016-12-19 11:51:43 +08:00
a508b7d751
Fix crash during Wrappers deallocation (possible to have leak)
2016-12-19 11:51:23 +08:00
46dbb32fd9
Fix spine TrackEntry recursive conversion issue by using getter
2016-12-19 11:50:52 +08:00
2b6e84e9a2
Separate FinalizeHook for ref objects and non ref objects
2016-12-19 11:50:32 +08:00
57dffa3a12
fix issue #17022 ( #17025 )
...
for branch 3.14
don't re-flip the letters
2016-12-16 17:22:13 +08:00
77cf6de2e5
[label] Fixes shadow is drawn incorrect while also enabling outline. ( #17024 )
2016-12-16 14:56:36 +08:00
77d0e8292a
[ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically ( #17016 )
2016-12-15 10:03:04 +08:00
a66215916e
Added support for larger tilemaps in CCFastTMXTiledMap ( #17006 )
...
* Added option to use 32 bit indices for large maps
* Added option to use 32 bit indices for large maps
2016-12-15 10:01:37 +08:00
effb6f077a
[mac, ios] 'ExtAudioFileRead' may return 0 frame while it doesn’t reach the end of very short audio file. ( #17011 )
...
* [mac, ios] Adds AudioDecoder::readFixedFrames. And uses readFixedFrames to simply code.
* [mac, ios] ‘ExtAudioFileRead’ may return 0 frame while it doesn’t reach the end of very short audio file.
* [mac, ios] Adds test case for small file test.
* [mac, ios] Adds small audio file.
* [mac, ios] Macro ‘BREAK_IF’ logic fix.
* [mac, ios] Returns false of AudioDecoder::open if total frames is 0.
2016-12-15 09:58:47 +08:00
cdcdaffe98
don't force write depth info for transparent mesh ( #17013 )
2016-12-14 18:10:08 +08:00
c0291afad7
Merge branch 'v3.14' into merge-v3.14
2016-12-14 17:03:58 +08:00
966d47c251
fix crash if create and delete downloader quickly ( #17010 )
2016-12-14 14:44:36 +08:00
9903de8f30
Inform eventdispatcher on node reordering ( fixes #16992 ) ( #17007 )
...
When changing the order of a node associated to the scene graph priority listener, inform eventdispatcher of the change
2016-12-14 14:08:00 +08:00
3302781dae
fix tizen compile issue ( #17002 )
...
* fix tizen compile issue
* fix linux compile issue
2016-12-14 11:55:38 +08:00
edca6862b9
[ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically ( #17009 )
2016-12-14 09:37:46 +08:00
5823f5792b
Synchronize creator engine bug fixes and upgrade web engine ( #17003 )
...
* Add EventDispatcher#hasEventListener (sync from creator)
* Fix function wrapper using js object during its gc
* Support more system languages
* Direct log/error for better understanding problems & add sys.now
* Synchronize Editbox APIs
* Synchronize Scheduler.PRIORITY_NON_SYSTEM const
* Upgrade web engine
* Upgrade test cases
* Manually bind EventDispatcher::addCustomEventListener to avoid memory issue
* Manual bind EventListeners’ create to avoid memory issue
* Fix compilation issue when COCOS_DEBUG = 2
* Unify function name of Texture2D::releaseTexture
* Fix compilation issues and update web & bindings-generator
* Fix lua compilation issue
* Use %ld instead of %zd
2016-12-14 09:27:47 +08:00
a73485a1bc
Use %ld instead of %zd
2016-12-13 18:12:50 +08:00
d89bde4e8e
Fix compilation issues and update web & bindings-generator
2016-12-13 15:37:46 +08:00
bedde74df5
Fix compilation issue when COCOS_DEBUG = 2
2016-12-13 14:29:25 +08:00
00b57c9565
Manual bind EventListeners’ create to avoid memory issue
2016-12-13 14:29:24 +08:00
3d6b1367cd
Manually bind EventDispatcher::addCustomEventListener to avoid memory issue
2016-12-13 14:29:24 +08:00
6b25a73a93
Synchronize Scheduler.PRIORITY_NON_SYSTEM const
2016-12-13 14:29:24 +08:00
d4618e60ef
Synchronize Editbox APIs
2016-12-13 14:29:24 +08:00
ae5ccd16f2
Direct log/error for better understanding problems & add sys.now
2016-12-13 14:29:23 +08:00
b50ea4afce
Support more system languages
2016-12-13 14:29:23 +08:00
197dac204b
Fix function wrapper using js object during its gc
2016-12-13 14:29:23 +08:00
7ff5e8858b
Add EventDispatcher#hasEventListener (sync from creator)
2016-12-13 14:29:23 +08:00
ed72691bc9
[ios/macOS] Fixed a compilation error after enabling ‘CD_USE_STATIC_BUFFERS’. ( #16997 )
2016-12-13 13:37:31 +08:00
26f1ae813f
[win32] Fixes crash of getSubStringOfUTF8String. ( #16991 )
2016-12-13 11:58:28 +08:00
a2603d70ef
[android] Catches ‘NumberFormatException’ while invoking Integer.parseInt. ( #16988 )
...
* [android] Catches ‘NumberFormatException’ while invoking Integer.parseInt.
* [android] Catches ‘NullPointerException’ while converting Integer to int in Cocos2dxActivity.hideVirtualButton.
2016-12-12 11:44:31 +08:00
64994a2471
make it support .luac file too ( #16981 )
2016-12-09 17:52:45 +08:00
77f5204877
[ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically ( #16972 )
2016-12-09 14:30:01 +08:00
3b7ffcf5d0
unscheduleAll() does not unschedule scheduled with performFunctionInCocosThread. ( #16856 )
...
* Fixing issue where Scheduler::unscheduleAll() would not unschedule functions scheduled with Scheduler::performFunctionInCocosThread.
* Removing clear of _functionsToPerform from unscheduleAll, based on code review feedback. Adding a function removeAllFunctionsToBePerfomedInCocosThread, which will remove all pending functions scheduled with performFunctionOnCocosThread.
* Adding test case for Scheduler::removeAllFunctionsToBePerformedInCocosThread
* Adding proper cleanup code to Scheduler test for SchedulerRemoveAllFunctionsToBePerformedInCocosThread
2016-12-08 11:58:58 +08:00
b288821bdd
use GLsizei to avoid overflow ( #16962 )
2016-12-06 23:05:56 -08:00
3db39a27ea
Vibrate test ( #16966 )
...
* only show vibrate test on iOS and Android device
* vibrate no matter it is silient or not
2016-12-07 11:12:38 +08:00
1b0a6c2c5c
Sync editbox improvement from cocos creator ( #16965 )
...
* sync the changes from creator
* fix editbox vertical alignment
* improve android editbox multiline text vertical alignment
2016-12-07 09:21:17 +08:00
5ef072de03
[ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically
2016-12-05 01:43:54 +00:00
84a6ab312c
use correct downloader implementation on mac ( #16955 )
2016-12-05 09:36:35 +08:00
2e0881e284
Scale9Sprite / Slider / LoadingBar fixes ( #16949 )
...
* WIP
* loadingbar issues fixed
* fixes clone in slider
* slider bug fixes
* slider: sets texturesize correclty before seting capsInsets
* sprite: scale9 avoid negativa values
* yeah! works!
* cloneIn -> copyTo
* restore xcode team: none
* fixes issue #16924
* correct issue number
* yeah! fixes issue #16928 and #16930
2016-12-03 07:35:22 -08:00
b80e316150
fixed #16938 : Audio could not be played entirely on iOS/macOS. And refactored some code of decoding. ( #16946 )
...
* fixed #16938 : Audio could not be played entirely on iOS/macOS. And refactored some code of decoding.
* Adds license header, removes unused macros.
* issue #16938 : Corrects remaining frame count calculation.
* Updates include path.
* Adds comments for AudioDecoder class.
* Adds const for getter functions in AudioDecoder.
* issue #16938 : Adds test case.
* Updates license years.
* Deletes trailing white spaces.
2016-12-02 13:52:37 +08:00
8791794f39
updated for v3.14 ( #16942 )
2016-12-01 10:37:04 +08:00
c5a4e87d4a
fix issue #16921 ( #16932 )
...
call setupScale9() always
2016-11-29 22:58:53 -08:00
56232a136b
correct physics3d debug draw camera ( #16927 )
2016-11-30 14:38:18 +08:00
fdb94d59d2
update engine version ( #16929 )
2016-11-30 11:53:53 +08:00
01f1bf88b4
use correct way to create spriteframe in clone ( #16918 )
2016-11-30 11:36:01 +08:00
f72b950465
[ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically ( #16926 )
2016-11-30 11:33:49 +08:00
066adfe204
Adds missing Scale9Sprite::initXXX overrided methods after refactoring Scale9 logic. Otherwise, `setupSlice9` will not be invoked. ( #16916 )
...
* Adds missing Scale9Sprite::initXXX overrided methods after refactoring Scale9 logic. Otherwise, `setupSlice9` will not be invoked.
Test case is: 1. Node: Scene3D -> Description -> Scale9Sprite display is wrong.
* Some fixes:
* Call Sprite::initWithFile(filename) in Scale9Sprite::initWithFile(filename) rather than Scale9Sprite::initWIthFile(filename, Rect::ZERO). Otherwise content size will be zero which is incorrect.
* setCapInsets in updateCapInset only when it’s in slice mode.
* setCapInsets should reset _insetLeft, _insetTop, _insetRight, _insetBottom member variables.
* Remove _previousCenterRectNormalized, just updateCapInset while switching to SLICE mode.
* Fixes JSTest -> ExtensionTest -> EditBoxTest: no background of editbox.
* Avoids an unused `setCapInsets` invocation in setupSlice9.
2016-11-30 09:26:40 +08:00
575ed756d1
should check validation of _stencil ( #16913 )
2016-11-29 10:46:20 +08:00
964b65e44e
Linux Application::openURL return fixed ( #16903 )
2016-11-28 10:41:36 +08:00
ba321e3ecc
fix opengl context conflict when multiple contexts coexist ( #16904 )
2016-11-28 09:59:04 +08:00
48dd8c25c7
Avoids to creating element in map in SpriteFrameCache::getSpriteFrameByName & removeSpriteFrameByName. ( #16910 )
2016-11-28 09:57:18 +08:00
0c06029532
fixed #16894 : RenderTexture does not support Sprite3D ( #16909 )
2016-11-28 09:50:54 +08:00
b397c93b01
fixed #16894 : RenderTexture does not support Sprite3D ( #16908 )
2016-11-28 09:50:45 +08:00
7556b60103
check VAO with correct way ( #16901 )
2016-11-25 09:33:20 +08:00
fce13ba607
fix: Scale9Sprite test case 18 ( #16897 ) ( #16902 )
...
* fix: Scale9Sprite test case 18
Bug calculating rotated frames.
the width was being used instead of the height and vice-versa
* fixes test cases 8 and 9
2016-11-25 09:27:20 +08:00
5848c02d16
fix: Scale9Sprite test case 18 ( #16897 )
...
* fix: Scale9Sprite test case 18
Bug calculating rotated frames.
the width was being used instead of the height and vice-versa
* fixes test cases 8 and 9
2016-11-24 01:06:56 -08:00
81f854e82e
fix: Scale9Sprite test case 18 ( #16898 )
...
Bug calculating rotated frames.
the width was being used instead of the height and vice-versa
2016-11-24 15:35:57 +08:00
129838d960
[ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically ( #16896 )
2016-11-24 11:39:02 +08:00
2d35fda9eb
fixed wrong display of rotating a 2d sprite by setRotation3D. ( #16895 )
...
Test case is Sprite3DRotationTest.
2016-11-24 11:38:37 +08:00
e63a2d0dc2
Scale9Sprite refactor ( #16891 )
...
* Squashed commit of the following:
commit 026eee59c9ece7fc59d71fead41104f375f72eb5
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Tue Nov 22 21:45:12 2016 -0800
yay!
everything works!
commit a645c99d44f0d7674e6238afae7628d8d2a030b1
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Tue Nov 22 14:55:31 2016 -0800
more fixes in Scale9Sprite
commit 3a688f4ea70c0abe311232c65ed14a7e9acc7611
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Mon Nov 21 23:06:45 2016 -0800
rotated sprites
commit 45e2085df3aa4b52236c817f7db7c1f6602c1e95
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Mon Nov 21 17:10:44 2016 -0800
android patch 9: fixes
is not 100% backward compatible since the previous version
had some artifacts. fixed the artifacts. now it renders ok
commit 4655d894387fa40a7e63b074a36bfed20e41d5f9
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Mon Nov 21 16:31:29 2016 -0800
sprite: correct size for "fake scale9"
commit cb98aba27cc1c82a986268d5b74afb55b6cca2f3
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri Nov 18 21:55:51 2016 -0800
sprite: adds setStrechEnabled for backward compatibility
and other fixes
commit c0fe67aac54cd62e3846810d56f87133f3a7343b
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri Nov 18 18:49:42 2016 -0800
implemts missing functions in scale9sprite
commit e471ef318725ccabc9eca2c062e285e9ca4f9a81
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri Nov 18 18:42:30 2016 -0800
"batched" works
commit 33124bfb14d1f275d4b0ffca8989975625a8a76d
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Wed Nov 16 18:59:38 2016 -0800
more fixes
commit 149f8206269843af63a1739885c00ed8d94c239c
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Wed Nov 16 18:37:12 2016 -0800
scale 9 rotated not fixed yet.
but making progress
commit 27f98275d94ce00c8d5ff0b6f74b5c22723cc3c3
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Wed Nov 16 15:32:57 2016 -0800
sprite: streching works ok with normal sprites
commit 2519498cac8b77a32dee5bdf1805be56fbda5ed6
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Wed Nov 16 12:12:28 2016 -0800
somes fixes... still not working
commit 43580d0b4aa976b0200717611a286bf1035c472d
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Tue Nov 15 23:15:22 2016 -0800
more bug fixes related to untrimmed setCenterRect...
...in SCale9Sprite
commit 407247616e506afaa0415c58ad7fce38efed0cd9
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Tue Nov 15 22:13:38 2016 -0800
spritecale9: untrimmed vs. trimmed capInsets
WIP. there still a few bugs
commit 3d845b2af3500be287fabb04bb6ba0ec04dbb401
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Mon Nov 14 23:11:17 2016 -0800
started progressbar
commit 0a44b00daf723869b7105689890f29cd53a62608
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Mon Nov 14 17:43:23 2016 -0800
adds EditBox test
commit 330304bd9b2e762de95c2f27f1ae3ceee83b2fbf
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Wed Nov 9 16:57:08 2016 -0800
adds elastic to scroll view
commit a06a35f8691ff56a143953c44acd947b519150b6
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Wed Nov 9 15:58:29 2016 -0800
yay! scrollview works
commit 37748a885c62eca8c00d2c9c11ee103f1d95e71c
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Wed Nov 9 15:33:58 2016 -0800
yet more scrollview fixes
commit a6e563b497adef7b141ac7c92c844d479b244c59
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Wed Nov 9 14:48:28 2016 -0800
initial scroll view
commit 4243edd7548e5533ca03c26d5042f8dc5517445a
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Tue Nov 8 17:50:15 2016 -0800
sanity check in frames.
missing files
commit 159d88603ad22f3c01761b60bacec98d52b9041d
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Mon Nov 7 19:21:00 2016 -0800
three buttons working
commit 6764cfc7937a1a81d6993d5e32a21f17457b8e0d
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Mon Nov 7 18:50:22 2016 -0800
missing files
commit 11c1fa3812e706a7d34137fe2626f05ab73ee3e6
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Mon Nov 7 18:49:59 2016 -0800
button works!
commit 26b6de4c28fc973e332dd51fcd763a6249c0b4c2
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Mon Nov 7 18:19:47 2016 -0800
Scale9: more fixes.
complies with odd Rect::ZERO behavior
commit ce561268096afe322f25034eeab3508a60027afd
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Mon Nov 7 11:50:42 2016 -0800
label: setTitleLabel
commit 51b5536cd2af36896002621f75c7310960c3f5e7
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Wed Nov 2 17:41:08 2016 -0700
UIButton kind of working
commit 7562a49a761ef70c383a99d2addefc63d77e279f
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Wed Nov 2 11:11:42 2016 -0700
missing resoruces
commit a9890dee5da0104bff6872cc04e8786a6c0a9018
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Wed Nov 2 10:54:55 2016 -0700
setCenterRect to .cpp file
commit c9c4bb55ed3fc55709eca46c43d1bfe5301c317f
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Wed Nov 2 00:19:51 2016 -0700
removed unused paramter
commit e47732934cca79c08e6fe96e46ebdf075508e568
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri Oct 28 18:19:31 2016 -0700
flipping works!
commit c9769bacd321aeddf84e1772dd270f12194d2f04
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri Oct 28 17:57:53 2016 -0700
spirte flip fixes... not finished yet
commit 1cbdc8e12cc6d0d2728c06dfabaada001784a178
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri Oct 28 09:53:16 2016 -0700
centerRect changes
commit aeb1b14c00331dabba640f52d79ab0e255fa3407
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri Oct 28 09:10:41 2016 -0700
changes from v3
commit e7a61c4a20d786c2bc1d6f57e33bf3ac95cb6f21
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Wed Oct 26 17:01:15 2016 -0700
sprite: rotated slice 9 works as expected
commit 91049389426051deb49a9d951364bf60abaf4532
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Wed Oct 26 15:39:54 2016 -0700
more bug fixes in scale9sprite support
commit 9feb12449078441c439df16dc7bcfb4506c7a226
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Wed Oct 26 13:22:52 2016 -0700
Android's Patch 9 works as expected
commit 1cf46afe3e7f7f5f714d30779caefc25a9bb1b3b
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Wed Oct 26 10:18:47 2016 -0700
Sprite: uses capInsets instead of centerRect
just to share the same API as Scale9Sprite
commit e944fa0248a7eb58012aacb229de1a9b814e0aef
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Tue Oct 25 18:59:42 2016 -0700
scale9sprite support fixes
commit b08765740d480b6ae1491800161b40d88f458767
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Tue Oct 25 17:38:47 2016 -0700
more scale9sprite fixes
commit 388a34d93de5e6007a2cecea959c929f26427cab
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Tue Oct 25 17:20:01 2016 -0700
UI::Scale9Sprite refactoring
subclass of Sprite... much cleaner!
commit c84ec8ee654f74d4b38be2d0a3d7ffe6adbc6faf
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Mon Oct 24 20:58:36 2016 -0700
supports tiled sprites
commit d2b18eb47a647b29319488bd53edac9f304acb84
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Mon Oct 24 19:21:57 2016 -0700
testing tiled sprite
commit b4832ab2facc01cbb624db587ede01fe7acf23e8
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Mon Oct 24 16:53:19 2016 -0700
using correct top-left coordinates for setCenterRect
commit 29d8de86a71cc597b2338f59f7951a28ee0c93b2
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Mon Oct 24 16:46:13 2016 -0700
fixes from scale_sprite9 branch
commit ccbe1063bea7db75397ecaf9046aac3dd977a621
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Thu Oct 20 19:01:50 2016 -0700
updated example
commit 24f7f85d4eba80f8e543810dcbc1a02447900bdc
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Thu Oct 20 18:47:28 2016 -0700
more fixes in nine slice
commit df3358fae68f2d81baf3a8cbe033a4c400ea50da
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Thu Oct 20 18:22:14 2016 -0700
anchor point fixes
commit 4ac7409bc72425abb0dc747b956ec346fbd1b2fa
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Thu Oct 20 17:01:48 2016 -0700
support for slice-9 from creator
commit a3221375d3a9defc2e03df0b1c2da1b36dfdd491
Merge: 73e5389 d7490d9
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Thu Oct 20 14:13:38 2016 -0700
Merge branch 'sprite_scale9' into creator_cpp_support
commit d7490d94896ad0ce8705dc0695252cee34329b5e
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Thu Oct 13 14:34:52 2016 -0700
Adds slice9 support for Sprite.
how to use it:
// points coords
sprite->setCenterRect(Rect(x,y,w,h));
// normalized coords
sprite->setCenterRectNormalized(Rect(x,y,w,h));
starts scale9sprite in sprite
more slice 9 changes
sprite 9 slice works?
kind of works
correct anchor point
slice 9 works, at least with non-rotated atlases
streched works ok
better Y invert code.
cleaner, compatible with the previous code
yay, scaling workings...
need a better api now
sets scale correctly
yay! works as expected!
more fixes and tests
better test for box
setContentSize() changes size in non-9-slice mode sprites as well
setCenterRect() -> setCenterRectNormalized()
yet another test
adds setPositionNormalized()
adds setCenterRect() tests
remove devel team from xcode
tests: add one more tests
fun test!
improved test
yet another test for slice 9
commit 73e5389ef719880096067d0f7d0bffd6e1f3cfd1
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Sun Oct 9 18:54:22 2016 -0700
kind of ProgressBar support
commit 4db5e9e7369e93ceba1d9512ab88c26b843c43d5
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri Oct 7 16:23:54 2016 -0700
new generatred ui files
commit 75aa06f3d39df8c6aa898d5e6810b3cd8015c07b
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Thu Oct 6 10:44:59 2016 -0700
bette canvas support
commit 89beacac478fc7f58ef930963b6393f3da4a743c
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Wed Oct 5 21:47:11 2016 -0700
sprites tests
commit 5fe930ad50c2c1b6d868982709c7b659176f9889
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Wed Oct 5 18:35:44 2016 -0700
more label tests
commit d3f615a097d080d78f2ebd95f3e2388da45f92db
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Wed Oct 5 18:08:24 2016 -0700
label tests
commit 2a4018922ce8d36117f7092fc324e37cf75fdeab
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Tue Oct 4 21:52:56 2016 -0700
label fixes
commit 41fafbd023de63e376d014311605f2b156add307
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Tue Oct 4 19:14:58 2016 -0700
updated test
commit 06919fc28fffbc5a20cd14bdcc2ad2ff997e0da1
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Tue Oct 4 18:50:45 2016 -0700
creator tests: works
commit 6e362e7cc7f68dc216b569a7f7f90aaa110c0e4a
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Tue Sep 27 23:15:56 2016 -0700
autogen: new data
commit e78078b2ad84b4e364827a66f1c459de7384a91d
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Mon Sep 26 18:18:57 2016 -0700
fix: initial test for CPP support for Creator
* adds more documentation
* adds more documentation
2016-11-24 09:59:00 +08:00
1e1ac655b1
fixes for iOS 7 and earlier ( #16879 )
...
* initialize Director::_invalid on first init
* fix: Setting the GLView should be done after creating the RootViewController
* restore 2016 copyright on templates/cpp-template-default/proj.ios_mac/ios/AppController
* remove old iOS js and lua templates
* copy actual iOS templates from cpp to js and lua
2016-11-23 09:28:34 +08:00
3056269531
Various small performance tweaks ( #16881 )
...
* These variables can be accessed by reference
* Assign values in initialization list
* _range can also be in initialization list
* Prefixed ++ and added 'auto' to loops
Also removed extra whitespace
* Prefixed ++/--, and changed for-loop implementation to use 'auto' on some loops
2016-11-22 09:54:04 +08:00
0c664ebc99
some warnings fixed: unused variables, signed-unsigned comparison ( #16878 )
2016-11-21 15:03:41 +08:00
18204c1e37
[ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically ( #16880 )
2016-11-21 15:00:00 +08:00
0d0dd05287
The return statement is not used in some cases ( #16874 )
2016-11-21 09:33:06 +08:00
88f6825c48
reset stencil program when alpha threshold is set to 1 ( #16858 )
2016-11-18 09:28:01 +08:00
8460fb53e7
remove duplicate codes ( #16860 )
2016-11-18 09:27:37 +08:00
7c6f0598b2
[ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically ( #16861 )
2016-11-18 09:27:20 +08:00
460c68125f
Use resolved file name (through dictionary lookup) in font atlas creation ( #16797 )
...
* Use resolved file name (through dictionary lookup) in font atlas creation, to prevent creating multiple atlases for the same file.
Add font tests with and without font name replacement (through dictionary lookup).
* Fix cpp-tests xcode and cmake project
* Additional fix for cmake project
2016-11-18 09:23:44 +08:00
663bb4d7ed
No CC_UNUSED_PARAM ( #16812 )
...
* Added -Wno-unused-parameter and removed all uses of the CC_UNUSED_PARAM macro
* Commented unused parameter names in .cpp files which previously used CC_UNUSED_PARAM
* Reverted -Wno-unused-param flag.
Moved deprecated touch methods definitions to .cpp file.
Commented more unused parameter names.
* Fixed some errors and warnings caused by the previous commit.
* Commented remaining unused parameter names in .cpp files.
* Fixed unused parameter warnings in headers.
* Fixed some more unused parameter warnings.
* Fixed some more unused parameters warnings.
* Fixed mistake in previous commit, missing ComAudioReader:: in method. Other warnings.
* Fixed build errors.
* Added missing file to CMakeLists
2016-11-16 09:48:37 +08:00
ae48e0bf69
Android setMultipleTouchEnabled ( #16830 )
...
* Added method to switch between single and multitouch on Android.
* Moved variable definitions to the beginning of the class. Handle single touch for ACTION_MOVE and ACTION_CANCEL.
* Cleaner code by using if/else instead of break
2016-11-16 09:41:07 +08:00
ee8305ed52
fix editbox can't input on macos 10.12 ( #16842 )
...
* fix editbox can't input on macos 10.12
fix editbox can't input characters on mac os 10.12
* update external to 114
2016-11-16 09:38:42 +08:00
f99dae383f
Fixed math error (issue #16837 ) in Lua function radian2angle ( #16848 )
2016-11-16 09:35:47 +08:00
e1e6ac1760
Removes unused rapjson includes. ( #16839 )
2016-11-14 14:13:33 +08:00
a429469d62
required check for nullptr with new(std::nothrow) ( #16822 )
...
* tequired check for new
* check for init()'s return value too; deleting unused texture
2016-11-14 10:05:26 +08:00
0d2e58b9da
fix compile error if "USE_STD_UNORDERED_MAP == 0". ( #16831 )
2016-11-14 10:00:55 +08:00
2e2b9b81e4
fix missing chinese characters when using ttf label ( #16832 )
2016-11-14 09:51:30 +08:00
fd6e10f0f5
Let FMOD autodetect the best output mode for Linux ( #16819 )
...
Thanks to filippovdaniil for the suggestion
2016-11-10 11:30:30 +08:00
d0705d9e25
[ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically ( #16828 )
2016-11-09 17:33:47 +08:00
c6f98cd95b
jsb.addRoot is not a function ( #16509 )
...
* jsb.addRoot is not a function
jsb.addRoot is not a function
* Update jsb_cocos2d.js
remove jsb._root
2016-11-09 15:19:32 +08:00
c3c6681b9e
Add Horizontal Text Alignment to UIEditBox ( #16772 )
...
* Add Horizontal Text Alignment to UIEditBox
* Fix compile error
* Fix win32 compile
2016-11-09 10:38:00 +08:00
e9b39a99e2
cocos2dInternal cleaned of some warnings ( #16818 )
...
* cocos2dInternal cleaned of some warnings: unused parameters and signed-unsigned comparisons
* -Werror removed
* tab fixed
* indent fixed
* more warnings fixed
2016-11-09 10:34:50 +08:00
fb9c1f2de0
Fixed EditBox placeholder font not being set correctly for multiline text fields on iOS. ( #16821 )
2016-11-09 10:27:34 +08:00
4b3525f7a8
use STL emplace when possible ( #16815 )
...
* replaced some unordered_map::insert(std::make_pair(foo, bar)) with unordered_map::emplace(foo, bar)
* replaced some vector::push_back(std::make_pair(foo, bar)) with vector::emplace_back(foo, bar)
The old way will construct a std::pair first then call move constructor
when putting it into the container, while using emplace will construct
the pair in-place in the container. Also, the emplace way is shorter &
more concise.
2016-11-08 11:50:00 +08:00
2d18d703a0
[ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically ( #16810 )
2016-11-04 14:07:25 +08:00
9204c87cfc
Adding performance.now() to cocos2d-js. ( #16766 )
...
* Adding performance.now() to cocos2d-js. See https://developer.mozilla.org/en-US/docs/Web/API/Performance/now
* Fixing improper logic for converting from microseconds, to milliseconds with micro-precision
* Adding performance.now tests
2016-11-04 11:58:48 +08:00
fa02f24f0d
add fbs files needed to update flatbuffer ( #16808 )
2016-11-04 10:13:06 +08:00
6be4ec8ee5
Add new methods to get the number of actions running in a given node with a specific tag. ( #16789 )
...
* Add new methods to get the number of actions running in a
given node with a specific tag.
This is useful for cases that we want to know how many
animations with a **specific** tag is running in our target.
For example:
auto tag1Count = this->getNumberOfRunningActionsByTag(kMyTag1);
auto tag2Count = this->getNumberOfRunningActionsByTag(kMyTag2);
While this could be achieved (more or less) with callbacks
to increment the tagCount at start of action and decrement
at the end the proposed API is much more concise and less error
prone.
* Replace the old C casts to static_casts.
As discussed in #16789 issue thread @minggo asked
to change the old style of cast to newer, more safer
static_casts.
* Add the required parenthesis and normalize the spaces.
Normalize all the static_cast<Action *> to static_cast<Action*>
some places we have spaces, other places haven't.
Fix the missing parenthesis.
2016-11-04 09:41:03 +08:00
e20c1e0a9a
Misc. UIEditBoxImpl-winrt fixes ( #16773 )
...
* SENSITIVE doesn't imply password, fixes crash on static cast in
* onTextChanged
* Fix type fontName instead of pFontName
* Set attributes that affect text content before setting initial text
2016-11-04 09:38:48 +08:00
7e14812240
fixed #16492 : RapidJSON Crashes in Release mode on Android. ( #16792 )
...
* fixed #16492 : RapidJSON Crashes in Release mode on Android.
* Updates external/config.json
* json/filestream.h -> json/filereadstream.h
2016-11-04 09:36:59 +08:00
f32effeb96
More: Uses c++11 multi-line string literal ( #16803 )
2016-11-04 09:36:26 +08:00
9eb177c6cc
[ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically ( #16802 )
2016-11-03 15:29:09 +08:00
9f31a1e43c
Add reason for edit end to UIEditBoxDelegate ( #16771 )
...
* Add reason for edit end to UIEditBoxDelegate
* Adds "NEXT" action button for iOS and Android for easier form
* navigation
* Fix compile error
2016-11-03 14:02:53 +08:00
925b4fa96f
Update CCObjLoader.cpp ( #16790 )
...
In the case of a simple MTL file such as
newmtl cube
Ns 10.0000
Ni 1.5000
d 1.0000
Tr 0.0000
Tf 1.0000 1.0000 1.0000
illum 2
Ka 0.0000 0.0000 0.0000
Kd 0.5880 0.5880 0.5880
Ks 0.0000 0.0000 0.0000
Ke 0.0000 0.0000 0.0000
map_Ka cube.png
map_Kd cube.png
The entire istringstream would be consumed by LoadMTL and result in a 'not found' error due to the null check being in the wrong place
2016-11-02 10:22:48 -07:00
54d6321ff3
Support float line width ( #16781 )
...
glLineWidth use float but CCDrawNode use int
2016-11-02 17:48:26 +08:00
3b87e46280
Support compile & run project on Tizen by cocos command. ( #16783 )
...
* Add config files for build engine source code on tizen.
* Add config files for cpp-empty-test on tizen.
* Add missing files.
* Add config files for cpp-tests on tizen.
* Add Tizen config files for lua-bindings.
* Add Tizen config files for lua-empty-test.
* Solve the error when build lua-empty-test for Tizen.
* Add Tizen config files for lua-tests.
* Solve the error when build lua-tests for Tizen.
* Add tizen config files for templates.
* Update submodule cocos2d-console.
2016-11-02 17:41:26 +08:00
e183160efe
fixed #16787 : Removes unused code of 'if (sizeof(Vec2) == sizeof(Vec2)'. ( #16791 )
2016-11-02 17:27:49 +08:00
d5dacd4f0e
Use C++11 multiline string literal instead ( #16765 )
...
* Undo pull request #16742 while keeping fixed indentation on ccShader_UI_Gray.frag
* Removed unnecessary whitespace
* Switched implementation to C++11 string literal
Thanks to stevetranby for the suggestion
2016-11-02 14:13:34 +08:00
a888f42d7f
Lua: have cc.Ray:intersects additionally return the distance ( #16677 )
...
cc.Ray:intersects now returns two results, an indication of hit or
not, plus the distance along the ray. The function can still be called
expecting a single argument and hence is backward compatible.
Also correct the debug error message
2016-11-02 09:45:24 +08:00
40b5c9f4b7
Mac edit box bug fixes ( #16656 )
...
* Don't allow multiline to overflow bounds of box
* Fix bug w/ performSelector
2016-10-31 15:16:18 +08:00
1a258f7ed4
Merge pull request #16776 from CocosRobot/update_lua_bindings_1477789224
...
[ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically
2016-10-31 00:01:08 -07:00
1667a5c444
Toggle between windowed/fullscreen on desktop ( #16762 )
...
* GLViewImpl methods for desktop window management - toggle between fullscreen/windowed
* Window management tests (mac)
* Added window management tests to Win32 and Linux
* Added const keyword. Removed platform macros.
2016-10-31 14:02:02 +08:00
ef380298bb
fix issue#16756 tileGid may overflow when use horizontal flip ( #16758 )
...
* tileGid may overflow when use horizontal flip
kTMXTileHorizontalFlag = 0x80000000
when use horizontal flip, gid will bigger chan 0x7FFFFFFF
* use unsigned int to convert string to gid
2016-10-31 10:42:09 +08:00
cc1b7808f0
fixed #16735 : [native] The behavior of (setRotation + setSkewX) is wrong ( #16736 )
...
* fixed #16735 : [native] The behavior of (setRotation + setSkewX) is wrong.
Since I removed some logic, this patch may also improve a little bit performance.
* Adds test case for issue #16735
2016-10-31 10:29:04 +08:00
57903077d0
[ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically
2016-10-30 01:00:27 +00:00
e0809d869c
Sprite::capInsets -> Sprite::centerRect ( #16770 )
...
* Sprite::capInsets -> Sprite::centerRect
as requested by @minggo
* fixes flip issues in Sprite with slice 9
2016-10-29 17:52:33 -07:00
3ab1be61a7
[ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically ( #16764 )
2016-10-28 10:13:57 +08:00
CocosRobot