6cd7314497
cocos2d::Sequence::isDone() checks that the last action is actually done. ( #17437 )
2017-03-07 09:36:09 +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
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
19ffd3a5ff
Remove `const T&` qualifiers from fundamental type arguments ( #17334 )
2017-02-10 10:34:47 +08:00
b672b94edc
Removed unnecessary assignments ( #17328 )
2017-02-09 10:57:01 +08:00
373e4a904a
Assert that a node cannot be inserted as a child of itself. ( #17296 )
2017-02-08 10:02:10 +08:00
9381152ef1
removed support for Windows 8.1 store and phone ( #17311 )
2017-02-08 09:46:47 +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
88c3fcde67
Full unicode support ( #17179 )
...
* Full unicode support
* test for emoji
2017-02-06 16:41:52 +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
df24911a23
Fix minor typos in naming ( #17280 )
2017-02-06 15:13:20 +08:00
aa9ce3ccb3
Fix implicit conversion warnings ( #17254 )
2017-02-04 10:38:22 +08:00
061122514c
Fix typo in Sprite (strech -> stretch) ( #17241 )
2017-01-23 09:25:56 +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
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
8b9c89f6a9
Fix typos in comments and strings ( #17201 )
2017-01-18 15:41:18 +08:00
0de81de721
fix #14936 ( #17190 )
...
* fix #14936
* #14936 testcases
2017-01-17 09:48:30 +08:00
88a1cd73fa
improves fix for issue #17119 (v3) ( #17188 )
2017-01-16 09:30:08 +08:00
15e56c06a4
outline to float ( #17176 )
2017-01-13 14:31:12 +08:00
84a3f73ecb
Particle set display frame ( #17163 )
...
* Fix CCParticleSystemQuad::setDisplayFrame()
* Added tests
2017-01-12 11:48:30 +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
1d2b73166e
Fix typos in docs ( #17132 )
2017-01-11 09:31:45 +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
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
a0acaf5972
Merge pull request #17101 from minggo/merge-v314
...
Merge v314
2017-01-04 11:48:31 +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
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
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
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
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
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
c0291afad7
Merge branch 'v3.14' into merge-v3.14
2016-12-14 17:03:58 +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
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
8791794f39
updated for v3.14 ( #16942 )
2016-12-01 10:37:04 +08:00
56232a136b
correct physics3d debug draw camera ( #16927 )
2016-11-30 14:38:18 +08:00
01f1bf88b4
use correct way to create spriteframe in clone ( #16918 )
2016-11-30 11:36:01 +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
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
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
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
0c664ebc99
some warnings fixed: unused variables, signed-unsigned comparison ( #16878 )
2016-11-21 15:03:41 +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
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
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
2e2b9b81e4
fix missing chinese characters when using ttf label ( #16832 )
2016-11-14 09:51:30 +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
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
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
54d6321ff3
Support float line width ( #16781 )
...
glLineWidth use float but CCDrawNode use int
2016-11-02 17:48:26 +08:00
e183160efe
fixed #16787 : Removes unused code of 'if (sizeof(Vec2) == sizeof(Vec2)'. ( #16791 )
2016-11-02 17:27:49 +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
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
af8b9cc47c
Support MultiView matrix array ( #16723 )
...
* Support MultiView matrix array
Support MultiView matrix array and add new interface in GLProgram to
support shader header definitions.
* support getMatrixStackSize
* optimize code
* remove indents
* rename resetMatrixStack(unsigned int stackCount)
* Add document to interfaces
* Supplement document of render interface
2016-10-28 09:33:31 +08:00
c0e1e91373
Performance tweak: Use range-based for-loops and allocate std::vector size() and *end() on the stack where favorable. ( #16716 )
...
* Use range-based for-loops and allocate std::vector size(), end(), cend(), rend(), crend() on the stack where favorable.
Other minor trivial changes were applied.
* Fixed Android compilation error
* Fixed windows-universal compilation error
2016-10-27 15:10:24 +08:00
323ea7c0d4
Sprite scale9 ( #16702 )
...
* 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
* fixes anchorPoint issues
* adds documentation
* fix: using top-left coordinate for setRect
* sprite: fixes related to scale9 and tiled
* Sprite: slice 9 fixes
works Ok with rotated frames
uses `setCapInsets` instead of `setCenterRect` to be more familiar
with `UIScale9Sprite`
* fixes js and lua bindings for Autopolygon
2016-10-26 18:45:40 -07:00
0a31c7de3a
fixed #16737 : NodeTest (stress test #2 : no leaks) is broken. ( #16741 )
...
'clone' method must invoke the inner object's clone method rather than its raw pointer.
2016-10-26 15:54:01 +08:00
92da63db3d
update visibleTiles rect ( #16331 )
2016-10-17 14:27:38 +08:00
b7d6e427e0
issue #16661 : Replace c style uthash with std::unordered_map<K, V> in CCFontFNT.cpp ( #16662 )
...
* issue #16661 : Replace c style uthash with std::unordered_map<K, V> in CCFontFNT.cpp
* issue #16661 : Removes unused include "base/uthash.h" in CCGLProgram.cpp.
2016-10-17 13:53:54 +08:00
fe52c5fa0a
Fix typos in comments and strings ( #16708 )
2016-10-17 10:12:54 +08:00
06b4a18f6f
Merge pull request #16703 from dumganhar/pr/16689-font-pos
...
Adds test case for PR #16689 (fix font rendering position)
2016-10-17 10:09:50 +08:00
627eba6aac
fixed #16652 : FontFreeType crashes in its destructor. ( #16684 )
2016-10-14 17:49:36 +08:00
dde86b404a
Remove unused local variable ( #16698 )
2016-10-14 17:48:00 +08:00
fd902e52cf
adjustForDistanceMap need to be negative to
2016-10-14 11:45:29 +03:00
f05053329b
fix font rendering position
2016-10-12 16:21:09 +03:00
cdee1e11de
Performance tweak: use range-based for-loops instead of iterator-based for-loops. ( #16642 )
...
* Use ++ prefix instead for non-primitive data types in CCAutoPolygon.cpp
* Use ++ prefix instead for non-primitive data types in SimpleAudioEngine.cpp
* Use ++ prefix instead for non-primitive data types in CCNodeLoaderLibrary.cpp
* Use ++ prefix instead for non-primitive data types in CCActionManagerEx.cpp
* Use ++ prefix instead for non-primitive data types in CCDataReaderHelper.cpp
* Use ++ prefix instead for non-primitive data types in HttpClient-android.cpp
* Use ++ prefix instead for non-primitive data types in CCDevice-linux.cpp
* Use ++ prefix instead for non-primitive data types in ScriptingCore.cpp
* Switched implementation to range-based for loops
* Added readability, fixed loop in CCDataReaderHelper.cpp
Thanks to Dimon4eg for the code review.
2016-10-11 10:59:44 -07:00
59dea5a487
Removed unnecessary comments ( #16649 )
2016-10-07 11:47:48 -07:00
d68eacd10a
Remove unused functions ( #16640 )
2016-10-04 22:10:52 -07:00
c3bbbb6cb2
Refactoring ui related code and fix label atlas and BMFont rendering issue with ETC1 texture format ( #16615 )
...
* refactoring ui related code
* fix label bmfont/charmap etc drawing
* make code more robust
2016-09-30 09:42:21 +08:00
8b703a8d12
Fix implicit conversion warning ( #16598 )
...
* Fix implicit conversion warning
* Change SAXParser::textHandler parameter type from int to size_t
2016-09-26 14:49:47 +08:00
59574f95e0
Fix mismatched memory deallocators ( #16596 )
...
* Fix mismatched memory deallocator in CCFastTMXLayer.cpp
* Fix mismatched memory deallocator on SkeletonRenderer.cpp
* Fix mismatched memory deallocator in CCTMXLayer.cpp
2016-09-26 14:18:48 +08:00
63b3043dc0
Remove extra semicolon after member function definition ( #16595 )
2016-09-20 14:43:48 +08:00
a46b30f8a6
use more plain API FileUtils::getStringFromFile ( #16586 )
2016-09-19 11:49:35 +08:00
84a102edf8
merge v3.13.1 back to v3
2016-09-15 10:08:28 +08:00
5f4fb66f61
fix: staggered hex maps returns correct tile ( #16552 )
...
* fix: staggered hex maps returns correct tile
order was fixed in the array that contains the GIDs.
fixes Github issue #16512
* fix: add fix validation code for issue #16512
2016-09-13 21:47:36 -07:00
74fd5ae3ba
Fix mismatched memory deallocator ( #16560 )
2016-09-12 10:02:48 +08:00
16781b00e8
change EaseBounce to real class instead of typedef ( #16557 )
2016-09-12 09:51:27 +08:00
2b9ac2c950
Remove redundant semicolons ( #16558 )
2016-09-12 09:45:34 +08:00
eca7b2392d
Remove unnecessary inline keywords ( #16562 )
2016-09-12 09:44:21 +08:00
86de22a008
fix crash if FontAtlas pointer is the same ( #16555 )
2016-09-09 11:39:00 +08:00
1c27c12327
updated libcocos2d dll version to 3.13.1 ( #16542 )
2016-09-08 10:38:16 +08:00
fa15ab8212
3.13.1 text color ( #16516 )
...
* fix: Label updateColor() and underline color work as expected (#16486 )
fixes Github issue #15214 correctly. underline uses _displayColor
and not _textColorF. _textColorF is only for the text.
This also emulates the SystemFont underline behavior
fixes Github issue #16471
* fix conflict
* Issue 16471 (#16489 )
* fix: Label updateColor() and underline color work as expected
fixes Github issue #15214 correctly. underline uses _displayColor
and not _textColorF. _textColorF is only for the text.
This also emulates the SystemFont underline behavior
fixes Github issue #16471
* docs: added more internal doc for issue_16471
2016-09-07 09:44:58 +08:00
b48bcc9579
Ease Actions Code De-Duplication
...
* ease action class macros to reduce code duplication
- update bindings for ease actions
- reorder clone method
- add back in create/etc methods to allow for EaseRateAction instances
- fix wrong clone return type
* Add note and minor cleanup
* use create in clone instead of new/init as in latest EaseBezierAction
* fix reverse for EaseIn/Out to match original code
* add assert for null
* refactor to match original code flow
* fix missing CC_DLL for windows builds
* fix win build issues due to abstract methods
* remove unused overrides
2016-09-05 10:18:30 +08:00
857b2143a6
Remove deprecated attribute on Node::_setLocalZOrder() function ( #16470 )
2016-09-05 10:06:42 +08:00
0cd365dd2e
Fix MenuItemSprite::unselected() on disabled items showing _normalImage instead of _disabledImage ( #16482 )
2016-09-02 09:51:47 +08:00
c32000250c
Issue 16471 ( #16489 )
...
* fix: Label updateColor() and underline color work as expected
fixes Github issue #15214 correctly. underline uses _displayColor
and not _textColorF. _textColorF is only for the text.
This also emulates the SystemFont underline behavior
fixes Github issue #16471
* docs: added more internal doc for issue_16471
2016-09-01 16:59:40 +08:00
e57c30c83b
fix: Label updateColor() and underline color work as expected ( #16486 )
...
fixes Github issue #15214 correctly. underline uses _displayColor
and not _textColorF. _textColorF is only for the text.
This also emulates the SystemFont underline behavior
fixes Github issue #16471
2016-08-31 20:20:13 -07:00
04fd2b16b2
merge v3.13 back to v3
2016-08-29 11:57:13 +08:00
a9898b9875
possible memory leak when font size is 0 ( #16424 )
2016-08-24 18:27:44 -07:00
e62af99db7
Fixed Camera::_viewProjectionUpdated state ( #16405 )
...
Camera::_viewProjectionUpdated is not initialised in constructor. Should be initialised to false.
This can lead to redundant visibility checks if _viewProjectionUpdated happens to resolve true.
As Camera::visit() is never called, _viewProjectionUpdated is never actually updated, resulting in no visibility tests when the camera transform changes.
Fixes #16404
2016-08-24 18:15:19 +08:00
4d801ba1d0
#Fix use const std::string& instead a temp string ( #16392 )
...
* #Fix use const std::string& instead a temp string
* #Fix use const std::string& instead a temp string
2016-08-22 09:43:41 +08:00
7afde8c7a6
Remove unnecessary ActionInterval casts ( #16402 )
2016-08-22 09:39:58 +08:00
f0be4f3069
Merge part of Cocos2d-x-lite ( #16380 )
...
* Update js auto binding settings with new ndk version
* Remove unnecessary property from Ref
* Merge part of Cocos2d-x-lite :
1. Improve network bindings
2. Use nullptr instead of NULL
3. Remove usage of some deprecated APIs
4. Add some defensive code and cleanup
* Fix spine track entry circle referencing issue
* cocos2d/cocos2d-x#16327 : Fix global object leak issue in JSB
* Improve ScriptingCore::evalString, old implementation have been deprecated in Spidermonkey
* Update JS versions
* Add docs for web v3.13
* Improve ScriptingCore
* Manual merge cocos2d/cocos2d-x#16383 by DavidDeSimone
* Fix auto bindings configurations
* Update web ref
2016-08-19 16:28:47 +08:00
b1a64ae730
new actions ResizeBy and ResizeTo ( #16275 )
...
* new actions ResizeBy and ResizeTo
* FDP-5580-ResizeBy and ResizeTo fix and Test cpp : added a scale exemple in the test cpp to compare with our new resize + fix
* FDP-5580: actions ResizeBy and ResizeTo : changed some functions visibility
2016-08-16 16:55:31 +08:00
1edaf7e122
Initializes member variable for TMXMapInfo and updates hexa-test.tmx to the latest format. ( #16353 )
2016-08-15 14:10:13 +08:00
02de525cbd
deprecates CCProgressTimer::setReverseProgress() ( #16341 )
...
use CCProgressTimer::setReverseDirection() instead.
fixes github issue #14678
2016-08-15 14:08:42 +08:00
b837dd7a20
Avoid unnecessary allocation if targetGrid is reusable ( #16343 )
2016-08-15 14:07:37 +08:00
3bc662ea7b
fix: not resize textureatlas multiple times on Label::create() ( #16358 )
...
since we know the size before allocating it, just reserve
the needed capacity once.
fixes github issue #16293
2016-08-13 09:38:42 -07:00
0e65025bda
Revert "Match parent's camera mask when adding child." ( #16324 )
2016-08-05 17:28:05 +08:00
abb97b1b71
don't set camera the same as its parent by default ( #16325 )
2016-08-05 17:26:27 +08:00
b135d512d2
Update copyright to 2016. ( #16311 )
2016-08-05 09:42:15 +08:00
73f80f4c73
#Make etc1 alpha support ok for ProgressTimer ( #16296 )
...
* #Make etc1 alpha support ok for ProgressTimer
* #fix issues
* Add comment
2016-08-03 14:29:34 +08:00
ba51370e43
use correct shader ( #16295 )
2016-08-03 10:56:12 +08:00
a2adfaf7df
#Improve node sort performance for 64-bit by std::sort + long long (_localZOrder) ( #16262 )
...
* #improve node sort performance by std::sort + unsigned long long (_localZOrder)
* Use bit field for make _localZOrder storage more clearly.
* #Comment _localZOrder members for meaningful.
* fix issues
* #use explicit bits integer of localZOrder storage
* #Fix compile error, add include <cstdint> to CCNode.h
* use the optimization for 64bit and no optimization solution for 32bit
* Use the optimization for 64bit and no optimization solution for 32bit
* #Improve node sort performance 64-bit by std::sort + long long (_localZOrder)
* fix issues
* test case
* Revert "test case"
This reverts commit 85471d07a433f2b7f0265c3b7dd483fcc28e3e2f.
* fix issues
* use lambda, and any other sort issues.
* skip sotNodes
* fix compile error
* fix compile issue
2016-07-31 22:44:24 +08:00
9cca6eb685
#bug fix etc1 alpha builtin support Sprite ( #16278 )
...
see: https://github.com/cocos2d/cocos2d-x/pull/16118
2016-07-31 22:30:03 +08:00
88eb533f9d
Revert "#improve node sort performance by std::sort + long long (_localZOrder) for 64-bit" ( #16260 )
2016-07-29 10:58:31 +08:00
66fac82f00
fixed #16169 : new android project crash in android 5.0.2 device (Nexus 7) when use 3.12 ( #16214 )
...
* fixed #16169 : new android project crash in android 5.0.2 device (Nexus 7) when use 3.12
* fixed #16169 : Adds comments for why we should not use `assignment operator` of `std::u16string`.
2016-07-28 11:19:22 +08:00
09aa7d9cf4
Win32 move unicode utils global. ( #16234 )
...
* Win32 move unicode utils global.
It need for easy converting utf-8 string in all code.
And use it api in user code also WinRT version.
* Move to CCUtils-win32
Also in WinRT version.
* Copyright
2016-07-28 09:57:29 +08:00
3a14388087
#improve node sort performance by std::sort + long long (_localZOrder) ( #16126 )
...
* #improve node sort performance by std::sort + unsigned long long (_localZOrder)
* Use bit field for make _localZOrder storage more clearly.
* #Comment _localZOrder members for meaningful.
* fix issues
* #use explicit bits integer of localZOrder storage
* #Fix compile error, add include <cstdint> to CCNode.h
* use the optimization for 64bit and no optimization solution for 32bit
2016-07-27 16:58:51 +08:00
1a1241c3fc
Merge pull request #16221 from Microsoft/winrt-v3.13
...
WinRT: update libcocos2d version to v3.13
2016-07-27 15:36:43 +08:00
4e278183ad
Merge pull request #16122 from ricardoquesada/issue_16100
...
testcase: add test case for issue #16100
2016-07-26 23:21:25 -07:00
b336aa3219
testcase: add test case for issue #16100
...
delays camera creation
fix issue #16100
2016-07-26 19:03:54 -07:00
d5809129c4
update libcocos2d version to v3.13
2016-07-26 12:34:36 -07:00
bf80f10dfd
Remove unneeded std::bind, and use const & for input parameters.
2016-07-26 00:55:32 +08:00
bf996c5bac
Add ETC1 builtin alpha support. ( #16118 )
...
* Add ETC1 builtin alpha support.
* Rename setETC1AlphaFileEndix to setETC1AlphaFileSuffix
* Check whether etc1 alpha suffix is empty
* fix Code ident & Add etc1 alpha test case to SpriteTest.
* Remove unused ETC1AA shader programs
* Fix all review issues and endl issues
* Add a new TriangleCommand::init() with Texture2D* instead of GLuint textureID
* #fix issues
2016-07-25 17:31:54 +08:00
15030ad4c3
Fix typos in log messages
2016-07-25 02:53:22 +09:00
94d4971ddc
Fix typos in documentation and comments
2016-07-22 02:05:19 +09:00
35cea378a9
Merge pull request #16172 from cezheng/fix/label_text_formatter_right_alignment
...
fix label text formatter right alignment
2016-07-21 15:21:12 +08:00
35b848e842
fix label text formatter right alignment
2016-07-20 18:08:15 +09:00
b3218c1e58
fix: stagger tilemaps hexa works as expected
...
Github issue #16105
2016-07-19 22:55:05 -07:00
d931c62649
Fix typos in documentation comments
2016-07-16 04:18:40 +09:00
1563d14447
Squashed commit of the following:
...
commit c8349caeca6ff5ebacf497eaa986e71d5f1c2c0d
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Thu Jul 14 11:19:50 2016 -0700
fix: works with odd sized maps
commit da4cf8bc19c9cdab148d60e03a25ee9cc4292b66
Author: zhangbin <zhangbin@cocos2d-x.org>
Date: Wed Jul 13 13:45:57 2016 +0800
Add test case.
2016-07-14 11:21:24 -07:00
261f1ef780
Merge pull request #16094 from stevetranby/patch-1
...
Match parent's camera mask when adding child.
2016-07-13 16:33:17 +08:00
cf18857206
fix crash in EaseExponentialOut::clone()
2016-07-13 14:28:04 +09:00
b9c78ac41c
Use std::abs to avoid overhead of casting float to double
2016-07-13 00:55:11 +09:00
c0e0931838
fix, replace std::sort by std::stable_sort ( #16092 )
...
* fix, replace std::sort by std::stable_sort
2016-07-12 13:46:38 +08:00
f162ffe2ae
Match parent's camera mask when adding child.
2016-07-12 00:07:41 -05:00
3d5789ee77
Merge pull request #16077 from mogemimi/fix-documentation-comments
...
Fix documentation when compile with -Wdocumentation and Clang
2016-07-11 15:49:28 +08:00
9c7d44ccd7
Merge pull request #16080 from minggo/use-std_abs
...
use std::abs instead
2016-07-11 12:02:10 +08:00
2ca1760b78
Merge pull request #16079 from minggo/use-std_srand
...
use std::srand() instead
2016-07-11 12:01:38 +08:00
3dc167a9f9
use std::abs instead
2016-07-11 12:01:09 +08:00
a146f3eec7
use std::srand() instead
2016-07-11 11:17:28 +08:00
7531c5156b
Fix documentation when compile with -Wdocumentation and Clang
2016-07-10 17:38:32 +09:00
6d5a94e569
test: add test case for Github issue #12226
...
Adds test case for Github issue #12226
2016-07-06 16:37:15 -07:00
2650fd1afd
Add missing float suffix to avoid -Wdouble-promotion
2016-07-04 23:12:45 +09:00
2443e09d29
Fix typos and other mistakes in docs
2016-07-04 00:42:10 +09:00
f7d65fbe8a
Squashed commit of the following:
...
commit 3a8ccb54b58f01daaa5b17efcd0e1ab4b7ccf914
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri Jul 1 11:05:02 2016 -0700
Add support for Hex tiled maps
Based on original patch by https://github.com/JustVic
Original patch:
https://github.com/cocos2d/cocos2d-x/pull/13288
fix: tiled hex maps
Hexagonal TileMaps Support
fix: odd, even works as expected
still problems with rendering order
fix: fixes layer position in Hex
fix render ordering
2016-07-01 15:51:00 -07:00
2610ad77cc
#15965 : remove unused _orderOfArrival ( #16009 )
2016-07-01 10:09:25 +08:00
b1f93b2679
fix: not leak Toggle items
...
Github issue: fixes #13351
2016-06-28 20:41:47 -07:00
076e0b488b
Merge pull request #15980 from minggo/merge-v312
...
Merge v312
2016-06-29 09:41:30 +08:00
0c290540df
Merge pull request #9823 from ericmux/frame-independent-ms
...
Making CCMotionStreak _maxPoints framerate independent.
2016-06-28 18:29:14 +08:00
bbd837aefa
merge v3.12 back to v3
2016-06-28 17:53:50 +08:00
2a853ba73e
Avoid const_cast when calling Node::setAdditionalTransform
2016-06-27 19:33:45 +09:00
0872cccd67
fix: collection of vr fixes ( #15948 )
...
* fix: collection of vr fixes
* Node::additionalTransform() and Node::setNodeToParentTransform() can be used at the same time
* Node allocs _additionalTransform in runtime taking 60 bytes lees for 99% of the nodes
* Node calculates the transform faster when an additionalTransform is being used
* VR works when the camera is being moved manually with setNodeToParentTransform
* VR has its own tests
* VR can be disabled and works as expected
* doc: documentation for the new fix
* fix: restore submodule web
* fix: compile and link on iOS
* fix conflicts
2016-06-24 16:55:28 +08:00
69d2ac1786
fix: collection of vr fixes ( #15947 )
...
* fix: collection of vr fixes
Node: additionalTransform() has its own dirty variable
VR: disabling VR works as expected
VR: works with camera3d test
VR: iOS Tracking works even if it doesn't have any input
fix: setNodeToParentTransform() and setAdditionalTransfrom() work...
...at the same time.
Also, this PR makes the size of Node smaller. `_additionalTransform` is
no longer an inline object.
Instead, it is allocated on demand making 99% of the Nodes smaller by 60
bytes.
fix: compile in windows
* doc: documentation for this fix
2016-06-24 10:03:38 +08:00
1042b18999
Merge pull request #15936 from mogemimi/use-nullptr-instead
...
Use nullptr instead of 0 or NULL whenever possible
2016-06-24 09:54:15 +08:00
ee7ceee007
Merge pull request #15874 from mogemimi/fix-unused-variable
...
Fix unused variable warnings when compiling release mode
2016-06-23 15:55:11 +08:00
cbc0612306
Use nullptr instead of 0 or NULL
2016-06-23 12:39:23 +09:00
a31279f8cb
fix: reverse iterator on events + doesn't use additionalTransform
...
use reverse Camera iterator when traversing events (of course).
but somehow setAdditionalTransform() breaks
setNodeToParentTransform(). And since setAdditionalTransform is not
needed, we just don't use it.
Github issue #15909
2016-06-22 11:28:58 -07:00
edafe726cc
fix: reverse iterator on events + doesn't use additionalTransform
...
use reverse Camera iterator when traversing events (of course).
but somehow `setAdditionalTransform()` breaks
`setNodeToParentTransform()`. And since `setAdditionalTransform` is not
needed, we just don't use it.
Github issue #15909
2016-06-22 11:22:47 -07:00
09d5fd3f90
Fix ParticleSystem::_paused varible isn't initialized. Particle will show or hide after being created randomly.
2016-06-22 16:54:57 +08:00
9d0801834e
Merge pull request #15893 from halx99/patch-1
...
Optimize, avoid unnecessary memory alloc & copy
2016-06-22 13:44:40 +08:00
a3bc979452
Fix typos in documentation and comments
2016-06-22 11:22:05 +09:00
414f1d4252
fix: little menu fixes
...
does not execute `dynamic_cast<>` in release mode
uses for(:) instead of the old way
2016-06-21 16:46:27 -07:00
654d17d27c
Update CCFontFNT.cpp
2016-06-21 11:25:11 +08:00
51ba45ae26
Optimize, avoid unnecessary memory alloc & copy
2016-06-21 10:52:25 +08:00
ca677f2be1
fix: not crash if CC_SPRITE_DEBUG_DRAW is enabled in SpriteBatchNode
...
`SpriteBatchNode` was trying to render `DrawNode` when
`CC_SPRITE_DEBUG_DRAW` was enabled.
Github issue #14730
2016-06-20 19:13:53 -07:00
f0028e5459
Fix unused variable warnings when compiling release mode
2016-06-20 09:23:42 +09:00
35008702bf
fix: underline will have the same solor as text in TTF
...
underline will have the same solor as text in TTF when calling
`setColor`. There is another method called `setTextColor` which is
confusing. What does each function?
github issue #15214
2016-06-17 17:23:59 -07:00
6778ebf451
Merge pull request #15853 from ricardoquesada/vr_squashed
...
Squashed commit of the following:
2016-06-17 10:15:20 +08:00
0db0a45fa0
Merge pull request #15863 from zilongshanren/fix-word-clamp-with-only-one-word-left
...
fix TTF and BMFont word wrap
2016-06-16 15:01:27 +08:00
f0f8663fa9
fix TTF and BMFont word wrap
2016-06-16 14:15:00 +08:00
ab0e461b00
Merge pull request #15852 from MSOpenTech/v3-winrt-x64
...
V3: updated to support Windows 10 UWP x64 builds
2016-06-16 11:08:28 +08:00
b0f3d43414
Merge pull request #15834 from Shulepov/rendertexture_opacity_modify_rgb
...
RenderTexture - set opacity modify RGB
2016-06-16 10:52:21 +08:00
9e40fffb13
fix: remove liboculus
2016-06-15 17:53:01 -07:00
180c2f1e9a
Squashed commit of the following:
...
VR support for cocos2d-x
commit 087aff0aec24b81418fa2678ce0cae2d4c1e2e01
Merge: b32d329 fc44d0dfd3b6d4#11 from songchengjiang/riq_vr
daydream VR platform supporting
commit cc936afac44518a00b90ec3133aaac5d00f0b91f
Author: songchengjiang <moses_jc@sina.com>
Date: Mon Jun 6 10:38:27 2016 +0800
remove VR 3rdparty dependence
commit 5f7a1a9c80f84cc915763ad6f52ffc524dd59309
Author: songchengjiang <moses_jc@sina.com>
Date: Mon Jun 6 10:34:37 2016 +0800
remove VR 3rdparty dependence
commit 3f72ecde2a259357a137bec1e99e731a2e78df84
Author: songchengjiang <moses_jc@sina.com>
Date: Mon Jun 6 10:28:43 2016 +0800
remove VR 3rdparty dependence
commit 2e56f032d1daced1b66b984acacc6f5007f5ecc3
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri Jun 3 10:45:44 2016 -0300
fix: started android support
commit 1910c9c488ee4315110081b60438aa1b7c1011f2
Author: songchengjiang <moses_jc@sina.com>
Date: Thu Jun 2 15:58:34 2016 +0800
add CCVRGvrRenderer and CCVRGvrHeadTracker framework
commit 96200eedea9234287153d71b4f198077cc49389a
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Tue May 31 13:07:44 2016 -0300
fix: little fixes
commit a2eb8114b2969beca83762ba829c8cb809b1615a
Merge: 20a74e0 5fddebc
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Tue May 31 12:12:59 2016 -0300
Merge pull request #10 from songchengjiang/riq_vr
bugs fixed
commit 5fddebcae997db9e1a4108413d73b0d057a61e83
Author: songchengjiang <moses_jc@sina.com>
Date: Fri May 27 15:57:30 2016 +0800
parameter corrected
commit 925aad012ae513ebeeec682b003123a3c543759f
Merge: 9b5e02f 20a74e0
Author: songchengjiang <songcheng.jiang@chukong-inc.com>
Date: Fri May 27 15:46:13 2016 +0800
Merge branch 'vr' of https://github.com/ricardoquesada/cocos2d-x into riq_vr
Conflicts:
cocos/2d/CCScene.cpp
commit 9b5e02fa7c9fcdd15cfea99769560ed30b976e9e
Author: songchengjiang <songcheng.jiang@chukong-inc.com>
Date: Fri May 27 14:36:31 2016 +0800
fixed ProjectionMatrix error on oculus platform
fixed ScrollView error on oculus platform
commit 3c63ead1943d1cf8aa3c0fd722a4b3834db323b1
Author: songchengjiang <moses_jc@sina.com>
Date: Fri May 27 10:51:46 2016 +0800
bugs fixed
mobile VR platforms:
fixed ProjectionMatrix error
fixed culling error of ScrollView
commit 20a74e064708e6bf9d15cc5551d1f86af9d24010
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri May 20 09:22:45 2016 -0300
fix: setAdditionalTransform support reference
commit 8341df82a02683b8e4ae02654e90617a2e5ced6d
Merge: 83751de 469d38d
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Wed May 18 07:38:49 2016 -0700
Merge pull request #8 from songchengjiang/riq_vr
Finished VR integration of SKDs based on VRProtocol
commit 469d38d778cd5f947098a08d8fd14ca6f32b0502
Author: songchengjiang <moses_jc@sina.com>
Date: Wed May 18 15:32:32 2016 +0800
fix bug of deepoon's headtracking
commit 83751deac133910c24321ddaddff93bf736de884
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Tue May 17 09:41:17 2016 -0700
fix: Scene inverts the eye matrix
commit 41ae41969a71fd5b07396faac78e777c4afbe5c4
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Tue May 17 06:54:34 2016 -0700
fix: inversed matrix for camera
commit 049dee721356a47b19f5e51a0face6a5a1647095
Author: songchengjiang <songcheng.jiang@chukong-inc.com>
Date: Tue May 17 15:51:57 2016 +0800
add headtracker of oculus
commit 3f6478352a4baebc684105156389655edbac7e6f
Author: songchengjiang <moses_jc@sina.com>
Date: Tue May 17 14:22:56 2016 +0800
add headtracker of SKDs
gearvr/deepoon/cardboard
commit 59df985b72adf0dbb5a4c66c80ae7299b16ae909
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Mon May 16 22:12:23 2016 -0700
fix: head tracker works
commit 306c59da0175708c96b5757f5f27afd6a6592fe3
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Mon May 16 17:55:43 2016 -0700
fix: adds missing methods to `VRIHeadTracker`
commit 91100b8a86d78801fbcd08e99427d6a6363ad69b
Author: songchengjiang <songcheng.jiang@chukong-inc.com>
Date: Mon May 16 14:17:21 2016 +0800
Rename Oculus's files
commit 01ef6215de936a8d8bb15f9ec195cb81b2b4b18f
Author: songchengjiang <moses_jc@sina.com>
Date: Mon May 16 11:41:56 2016 +0800
Rename files based on riq's changes
commit 734efbb045064d24df095c5b8fc604ef2aab1dea
Merge: 91449c9 769a883
Author: songchengjiang <songcheng.jiang@chukong-inc.com>
Date: Mon May 16 09:57:57 2016 +0800
Merge branch 'riq_vr' of https://github.com/songchengjiang/cocos2d-x into riq_vr
Conflicts:
build/cocos2d_libs.xcodeproj/project.pbxproj
cocos/vr/CCVRGeneric.cpp
cocos/vr/CCVRGenericHeadTracker.h
commit 91449c9d23e357549cb1aeae6d1454274def1aab
Merge: d3e4550 a33faaf
Author: songchengjiang <songcheng.jiang@chukong-inc.com>
Date: Mon May 16 09:54:44 2016 +0800
Merge branch 'vr' of https://github.com/ricardoquesada/cocos2d-x into riq_vr
Conflicts:
build/cocos2d_libs.xcodeproj/project.pbxproj
cocos/platform/CCGLView.cpp
commit a33faafa1a2b6cffdc32d87f3c1c321f46f94789
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Sat May 14 00:57:54 2016 -0700
fix: adds head tracker
commit ea348cf72d3e54dc3864571bff1405909dbb65c9
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri May 13 18:40:32 2016 -0700
fix: removes red background
commit 113c7debe9a35fc142183a9012cac40063e17efe
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri May 13 18:39:31 2016 -0700
fix: centers image
commit 769a883c93f4f7c6191462626845f01d6f8596fe
Author: songchengjiang <moses_jc@sina.com>
Date: Fri May 13 20:36:19 2016 +0800
Merge branch 'vr' of https://github.com/ricardoquesada/cocos2d-x into riq_vr
commit d3e45501cd2cada87735390a407fbd44e61cd84e
Author: songchengjiang <songcheng.jiang@chukong-inc.com>
Date: Fri May 13 17:52:46 2016 +0800
update win32 project for VR
commit ba0fdb8b8e1efaf8fdf88e044e701fb5bedb4839
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Thu May 12 23:21:50 2016 -0700
fix: no hardcoded values
code is simpler, fixed a few bugs
commit b30596cdae4cdcf39d960a39661a79200b27c7a8
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Thu May 12 21:50:18 2016 -0700
fix: simplified distortion
commit 37b184f084e7b50bac9a5a3c59a87f8f03440b53
Author: songchengjiang <songcheng.jiang@chukong-inc.com>
Date: Fri May 13 09:39:34 2016 +0800
finished VR rendering of Oculus
commit f7d74cd0a2479541c0546d0ec41fe4f867405fcc
Author: songchengjiang <moses_jc@sina.com>
Date: Thu May 12 10:00:43 2016 +0800
Finished GearVR and Deepoon VR rendering integration
commit 776fb4fd7420f1c14403eb476df1e9716362f1e5
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Wed May 11 16:56:57 2016 -0700
fix: distortion working... with too many hardcoded values
time to "un-hardcode" the values
commit 0584773cca88c5b3dee72821830841f617cfb21c
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Tue May 10 19:49:07 2016 -0700
feat: distortion WIP
commit 9b5ef01776eaa617dd4677c3824e50c1f9da41c6
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Tue May 10 15:49:17 2016 -0700
fix: simpler
one texture that holds both left and right eye
commit bfff504c499c253a0c36b342e6b5bcb0edf4fed7
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Mon May 9 10:50:43 2016 -0700
fix: Camera code is cleaner
commit fcf730bc2afc6c4552787273577e1942088c2e42
Author: songchengjiang <moses_jc@sina.com>
Date: Mon May 9 16:43:58 2016 +0800
support cardboard VR rendering
commit f88b834b70fbfb28db0c8442e68984c61192d7cc
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri May 6 21:16:10 2016 -0700
fix: proj fixes. works ok in any resolution
commit f980a616837b0f259d9564e622c78e0f4869ed53
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri May 6 19:08:47 2016 -0700
fix: renders ok in any device
commit 4799ad32ea38ddd217e80e868c3d9021c03e88ce
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Thu Apr 28 16:46:30 2016 -0700
fix: renders something
fix: passing camera to scene
adds a way to return user camera
fix: stereo rendering works
fix: viewport left is correct
fix: scissor is not needed...
fix: works!
fix: minor fixes
fix: new approach... almost working
fix: camera is moved
whitespace fixes
fix: whitespaces
fix: new line
commit c137a53aba227cf2e2a1809b55cb9b3da25d432b
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Wed Apr 27 18:56:41 2016 -0700
fix: VR refactor... still WIP
commit 16fde77d71b8309e982bf6fa4f4ee0acea5fc0d1
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Tue Apr 26 22:21:21 2016 -0700
feat: VR, initial commit
2016-06-15 11:33:25 -07:00
53321e401a
updated to support Windows 10 UWP x64 builds
2016-06-15 08:50:04 -07:00
7214173e98
Added Particle Emitter Pause option, and tests ( #15836 )
...
* Added Particle Emitter Pause option, and tests
* private field emitter => _emitter
isPaused changed to const
removed erroneously added spaces
renamed unPauseEmissions => resumeEmissions
2016-06-15 18:31:10 +08:00
d7b495c3d1
Merge pull request #15838 from MagicXrEv/rename-end-functions
...
lua binding : Rename end() to endToLua().
2016-06-15 16:24:34 +08:00
a348cbda8b
Move StringUtils functions from deprecated header file to ccUTF8.h ( #15835 )
...
* Move StringUtils functions outside of deprecated header
* Replace deprecated headers with 'base/ccUTF8.h'
2016-06-15 15:01:26 +08:00
dd6fed7928
Fixed ClippingNode not cleaning up _stencil correctly ( #15814 )
...
* Fixed ClippingNode not cleaning up _stencil correctly
_stencil may be running due to onEnter() called by ClippingNode. If onExit() is not called then Node::~Node() will assert when _stencil is released.
* Added onEnterXXX to ClippingNode::setStencil()
ClippingNode::_stencil would not be initialised correctly when set after ClippingNode was adding to the active scene.
2016-06-15 14:55:29 +08:00
51f4deee01
Add system label overflow ( #15827 )
...
* Add system font overflow
1. currently only iOS, Mac and Android platform are supported
add mac label overflow shrink
modify system font overflow test
fix warning and possible memory leaks
add ios system label overflow support
add iOS system font overflow support
fix iOS system font overflow
fix Mac System font overflow
add android system font clamp
add Android system font shrink
cleanup iOS shrink related code
fix Android system font clamp
add core text to project template
fix iOS tests project
fix mac and iOS shrink
improve iOS and Mac clamp feature
fix header file include path
* modify the comments, make it more clearer
2016-06-15 10:43:15 +08:00
8e6ca57f4f
lua binding : Rename end() to endToLua().
2016-06-14 23:35:17 +08:00
7d6d677983
RenderTexture - set opacity modify RGB
2016-06-13 23:07:17 +03:00
4f2b4559b6
Compilation fix while CC_ENABLE_PROFILERS = 1
2016-06-06 16:25:00 +08:00
bd00b2f261
Fix unused parameter warning
2016-06-02 15:30:24 +09:00
3521e605f8
Merge pull request #15723 from urokuta/issue-9367
...
#9367 blend mode does not work with animated sprite
2016-05-30 10:53:15 +08:00
fc6c612c4c
Remove duplicate header includes
2016-05-26 23:25:44 +09:00
785d02a818
#9367 blend mode does not work with animated sprite
2016-05-26 09:39:48 +09:00
b2c7358370
Merge pull request #15722 from ricardoquesada/issue_15154
...
Fix crash on windows when using PolygonInfo
2016-05-25 21:25:31 -03:00
906967c53a
fix: make it compile on iOS and Mac
2016-05-25 20:00:48 -03:00
26781ee592
fixed array overrun in triangulate()
2016-05-25 10:14:09 -07:00
9ad3db0635
fix: make PolygonCode cleaner
...
not sure if this fixes the bug, but it makes the interfaces cleaner.
Github issue #15154
2016-05-24 20:57:40 -03:00
1e04cb5950
Use nullptr instead of 0 or NULL
2016-05-25 03:09:11 +09:00
5caea3a197
Merge pull request #15692 from mogemimi/prevent-c4996-warning
...
Prevent too many C4996 warnings caused by ignoreAnchorPointForPosition()
2016-05-23 14:14:38 +08:00
b6d72e33d8
Fix password style text in UTF-16 ( #15620 )
...
* Fix password style text in UTF-16
Label used UTF-16 in internal.
Need string in UTF-8.
* Set correct char for Max and iOS
* Add test for TextFiledTTF Secure Text Entry
2016-05-23 09:48:15 +08:00
ad3c305172
Prevent too many C4996 warnings caused by ignoreAnchorPointForPosition()
2016-05-22 07:05:35 +09:00
36113f507e
add comments for ps.
2016-05-18 22:25:43 +08:00
948f64631f
Use const references whenever possible
2016-05-17 13:17:56 +09:00
9218329968
Merge pull request #15569 from minggo/issue-15522
...
Fix compile error isnan -> std::isnan
2016-05-05 11:36:24 +08:00
03b38bcee2
Merge branch 'fix_isnan' of https://github.com/gelldur/cocos2d-x into issue-15522
2016-05-05 10:17:17 +08:00
2df9afbe71
Fix typos in documentation and comments
2016-05-05 08:05:20 +09:00
a5602cc732
merge v3.11 back to v3
2016-05-04 16:02:23 +08:00
8429b34010
Reduce unnecessary c_str() calls
2016-05-04 04:18:25 +09:00
f2e5eb332a
Merge pull request #15546 from minggo/issue_15526
...
fix memory leak
2016-05-03 14:02:38 +08:00
fba4bead70
fix memory leak
2016-05-03 11:24:22 +08:00
788dae5a2e
Merge pull request #15531 from pandamicro/v3.11
...
Fix clipping node memory management issue and update web engine
2016-04-28 16:15:59 +08:00
d8d6e55756
Fix clipping node memory management issue
2016-04-28 15:14:03 +08:00
482788c933
Add tizen support ( #15518 )
...
* add Tizen Support
* fix linter error
* fix tizen audio engine lua bindings config
2016-04-28 09:49:55 +08:00
0f19bec99d
Fix compile error isnan -> std::isnan #15111
...
Issue: https://github.com/cocos2d/cocos2d-x/issues/15111
2016-04-27 13:15:08 +02:00
1cc0130bdd
Fixes signed/unsigned mismatch warnings.
...
```
2d\CCFontFNT.cpp(328): warning C4018: '<' : signed/unsigned mismatch
2d\CCLabel.cpp(782): warning C4018: '>' : signed/unsigned mismatch
2d\CCLabel.cpp(784): warning C4018: '<' : signed/unsigned mismatch
scripting\js-bindings\manual\cocos2d_specifics.cpp(2741): warning C4018: '<' : signed/unsigned mismatch
tests\cpp-tests\Classes\Sprite3DTest\Sprite3DTest.cpp(1969): warning C4018: '>=' : signed/unsigned mismatch
tests\cpp-tests\Classes\TextInputTest\TextInputTest.cpp(264): warning C4018: '>=' : signed/unsigned mismatch
ui\UIEditBox\UIEditBoxImpl-common.cpp(113): warning C4018: '<' : signed/unsigned mismatch
ui\UIRichText.cpp(1573): warning C4018: '<=' : signed/unsigned mismatch
ui\UITextField.cpp(89): warning C4018: '>=' : signed/unsigned mismatch
```
2016-04-26 17:53:25 +08:00
86df9b535a
Merge pull request #15493 from njh0602/somefix
...
Renamed ignoreAnchorPointForPosition()
2016-04-26 11:41:09 +08:00
2f2373be87
Merge pull request #15497 from stevetranby/tilemap-csv-support
...
Add CSV format support to tile maps
2016-04-26 11:39:33 +08:00
c8e2dc83d1
Merge pull request #15498 from ynaoto/v3
...
Warn if fontDef.charID exceeds 16bits.
2016-04-26 11:27:06 +08:00
614c3c47d7
Josh/winrt inplace editbox ( #15473 )
...
* WinRT in-place edit box
* Fix static analysis errors
2016-04-25 11:17:09 +08:00
d42cb71a27
Warn if fontDef.charID exceeds 16bits.
2016-04-25 01:02:50 +09:00
510e7b831e
csv support working test
2016-04-23 17:31:10 -06:00
ea2b73c30e
Renamed ignoreAnchorPointForPosition()
2016-04-22 22:29:49 +09:00
401f3a84ac
Renamed ignoreAnchorPointForPosition()
2016-04-22 21:36:02 +09:00
16c7a594c8
Merge pull request #14005 from wighawag/draw_node_shader_fix
...
allow to use custom shader uniforms and attributes on drawNode
2016-04-22 10:49:41 +08:00
2c75a4cf39
Merge pull request #15480 from mogemimi/remove-unary-operator
...
Remove incorrect unary operator to fix warnings
2016-04-21 15:42:29 +08:00
7de8f761d0
Merge pull request #14123 from jgod/patch-2
...
Check that textureAtlas isn't null before removing quads in SpriteBatchNode
2016-04-21 14:44:32 +08:00
de3dac7664
Merge pull request #14090 from SongCF/v3
...
issues #14050 ActionManager memory leak
2016-04-21 14:09:52 +08:00
eae7ec40ef
Remove incorrect unary operator to fix warnings
2016-04-21 14:39:42 +09:00
481c55adb2
Merge pull request #15466 from wefiends/spriteframe-clone
...
Copy polygonInfo when cloning SpriteFrame
2016-04-21 09:49:00 +08:00
b0ae128ec3
Merge pull request #15066 from TheCodez/patch-2
...
setPhysicsBody can be called multiple times again
2016-04-21 09:40:28 +08:00
afdd600045
Fix setPhysicsBody method
2016-04-20 11:46:10 +02:00
4c7e4671d9
Modified the layer follow action class to include a horizontal (x) and vertical (y) offset. ( #15194 )
2016-04-20 17:25:31 +08:00
20b31eb1e8
Copy polygonInfo when cloning SpriteFrame
2016-04-20 03:04:19 -04:00
f9f751834a
Add missing float suffix to avoid warning C4305
2016-04-20 03:54:47 +09:00
a8847ccf5e
Fixed crash and actions may not have been executed.
2016-04-19 16:11:54 +08:00
660002c239
Merge pull request #15446 from xpol/fixes-integer-cast-warings
...
Fixes some integer cast warnings.
2016-04-19 10:27:37 +08:00
3dbabdee05
Merge pull request #15099 from feijing566/v3
...
Add "id" for parser object
2016-04-19 10:18:04 +08:00
810e855f44
Fixes some integer cast warnings.
2016-04-18 16:01:19 +08:00
8c3137b07f
Fixes warning about unused static constants.
2016-04-18 15:38:51 +08:00
69bd994760
added missing _USRJSSTATIC preprocessor define ( #15438 )
2016-04-18 15:10:35 +08:00
cb0e768f32
Fixes warning: field 'isVertsOwner' will be initialized after field 'rect'.
2016-04-14 17:09:37 +08:00
fe84af5dbd
added zlib.dll
2016-04-12 17:18:47 -07:00
f3d824843b
Refine 'CCActionXXXX' ( #15319 )
...
add more check to be more stronger and simplify the codes
2016-04-08 13:40:36 +08:00
8587440e31
remove unneed c_str call
2016-04-01 10:01:37 +08:00
90087ae5a7
improve textfield code
2016-04-01 09:31:18 +08:00
dcb7c58216
fix textField password bug
2016-04-01 00:52:55 +08:00
5f4e8a65c4
Merge pull request #15348 from minggo/action_issue
...
some bugs fixed of Repeat
2016-03-31 14:47:54 +08:00
fcd64e081d
some bugs fixed of Repeat
...
1. action may be ran more than specified times
2. instant action will ran one frame later
2016-03-30 14:05:22 +08:00
6e3d69dded
Merge pull request #15336 from cocos2d/v3.10
...
V3.10
2016-03-29 11:23:11 +08:00
392d1e858f
Merge pull request #15314 from WenhaiLin/v3-0323
...
Refine 'CCFontXXXX'
2016-03-25 21:55:00 +08:00
c3a8cabe5d
refine
2016-03-25 21:21:09 +08:00
ffdfcd4aa9
Merge pull request #15311 from MSOpenTech/v3-winrt
...
Win10 UWP and Windows 8.1 fixes for v3.11
2016-03-25 09:42:13 +08:00
a93cbe8a32
Refine 'CCFontXXXX'
2016-03-24 23:05:22 +08:00
66576f19dc
Merge pull request #14230 from mogemimi/fix-memory-leak-fontfnt
...
Fix memory leak in FontFNT
2016-03-24 19:59:14 +08:00
12e34ca9d4
updated to v3.11
2016-03-23 12:13:44 -07:00
bd72d7a6de
updated chipmunk include path
2016-03-23 12:12:44 -07:00
db00d4944c
Merge pull request #15293 from zilongshanren/fixDetachIME
...
fix systemFontDirty and lineBreakMode issue
2016-03-23 16:37:53 +08:00
de0582844e
Fix memory leak in FontFNT
2016-03-23 15:17:05 +09:00
3c676d9712
Merge pull request #15037 from Shulepov/spriteframecache_pixel_format
...
SpriteFrameCache: take pixelFormat into account if specified
2016-03-23 09:48:35 +08:00
a225130010
Fixes windows universal build.
2016-03-22 18:51:58 +08:00
71f0537734
Merge commit '43db5c052d3a8605ebfd9dc2acc23e26129c4265' into remove-uncessary-search-paths
2016-03-22 16:07:02 +08:00
e7864cdb89
Removed unnecessary search paths.
2016-03-22 16:04:12 +08:00
ff6b7080f5
fix systemFontDirty and lineBreakMode issue
2016-03-22 14:47:33 +08:00
a15a39095f
fix system font dirty issue
2016-03-21 22:31:23 +08:00
90456d29ba
Fixes 1605 include path in 541 files
...
using the tools/coding-style/include-linter.py with -f options.
2016-03-20 21:53:44 +08:00
7993ad93d2
fix jsb API inconsistency.
...
Ticket id: https://github.com/cocos2d/cocos2d-x/issues/15275
2016-03-18 16:18:40 +08:00
c54513bb13
Enumerate getChildren() instead of _children.
2016-03-16 15:03:33 -06:00
fa7d9c7163
Remarks zilongshanren
...
Copy constructor remove from StringUTF8
StringUTF8::set change to StringUTF8::replace
TextFieldTTF::setCursorUse change to TextFieldTTF::setCursorEnabled
TextFieldTTF::_cursorUsechange to TextFieldTTF::_cursorEnabled
2016-03-11 15:09:50 +03:00
6bc36912ae
TextFieldTTF support cursor
...
If TextField active(focused input text) show text cursor( default '|',
change TextFieldTTF::setCursorChar ).
Show/Hide interval CURSOR_TIME_SHOW_HIDE
Change position text cursor control key: KEY_HOME, KEY_END,
KEY_LEFT_ARROW, KEY_RIGHT_ARROW
CC_PLATFORM_MAC, CC_PLATFORM_WIN32, CC_PLATFORM_LINUX default use
cursor( For change state TextFieldTTF::setCursorUse )
Text cursor worked only on LabelType::TTF
2016-03-07 14:22:03 +03:00
b3b047e9ad
Label '\b' - Next char not change x position
...
Add TextFormatter for easy use '\n', '\r', '\b'
2016-03-07 14:07:36 +03:00
e46e392ff5
Merge pull request #15175 from FrostPolaris/v3_localizeManage
...
Add language localization support for Button, Text, TextField and TextBMFont.
It's OK, merged
2016-03-04 11:43:47 +08:00
e6d2bfd014
Merge pull request #15145 from grwhitehead/fontatlas_fix
...
three related bug fixes in FontAtlas::prepareLetterDefinitions
2016-03-04 11:36:36 +08:00
b207d559ae
Change the interface of LocalizationHelper::setCurrentManager.
2016-03-04 10:34:04 +08:00
4f6fd3ef64
Squashed commit of the following:
...
commit 87b7c3e404a9b6cce6d4f6bc8565e7feef429ee0
Author: geron-cn <c.ever.fallen@gmail.com>
Date: Thu Mar 3 13:43:04 2016 +0800
change enum to enum class
use tabitem as pointer to replace _currentTabItemIndex
commit c0830cc581b8a07d6eed63268bf5be6a828c113a
Merge: 3663156 166931a
Author: geron-cn <c.ever.fallen@gmail.com>
Date: Thu Mar 3 11:48:44 2016 +0800
Merge remote-tracking branch 'gero/tabview' into tabcontrol
commit 366315624143ff01c3e2b22b415ab79050e381e4
Author: geron-cn <c.ever.fallen@gmail.com>
Date: Thu Mar 3 11:48:15 2016 +0800
Squashed commit of the following:
commit 166931a28c8736ab58b7c4319c1139b5e4865a9e
Author: geron-cn <c.ever.fallen@gmail.com>
Date: Wed Mar 2 21:35:06 2016 +0800
fix
commit e0eb069846a8ceb4b726c3c945801c944404b102
Author: geron-cn <c.ever.fallen@gmail.com>
Date: Wed Mar 2 21:30:44 2016 +0800
fix active deactive in tabcontrol
commit aeb1c857cab23299e44a86ac1f627c7bd5fa5a6d
Author: geron-cn <c.ever.fallen@gmail.com>
Date: Wed Mar 2 20:16:22 2016 +0800
fix active -1
commit e57796cbbae851e8cff52656b3265c80c2e8f6f7
Author: geron-cn <c.ever.fallen@gmail.com>
Date: Wed Mar 2 16:00:51 2016 +0800
fix merge file
commit cdd44f1c577ad190bc175896107a48fbb36b65bb
Merge: 1658ad6 6bf55ed6bf55ed
2016-03-03 14:17:48 +08:00
dbfb4c793c
Merge pull request #15132 from mogemimi/remove-const-from-return
...
Remove unnecessary const from return types
2016-03-02 11:31:56 +08:00
1420ea2cbc
three related bug fixes in FontAtlas::prepareLetterDefinitions
2016-03-01 16:06:45 -08:00
4dcbf4c263
Merge pull request #15133 from cocos2d/walzer-patch-1
...
Fix typos in CCRenderTexture.cpp comments
2016-03-01 09:30:07 +08:00
bc11e24019
Squashed commit of the following:
...
commit 36c2807d07848448c1fed86f4b119205048691bf
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Mon Feb 29 13:11:40 2016 -0800
binary file 82
commit 9b7cd003b12faefd0522d12f765c027efb001ab2
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Mon Feb 29 12:56:39 2016 -0800
fore multiple in windows phone 8.1 too
commit daea8a3ef8d69915e7a9d962fd745a1103011bab
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Mon Feb 29 12:50:45 2016 -0800
force multiple
commit 0fbabdbf99974e95de083d79c7d6ae7cf735e4b6
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Mon Feb 29 10:44:40 2016 -0800
compiles
commit f817766afcd0ffc4ca93f628d55fabc4b5a96ba5
Merge: 7b2cea3 8bf3d339af2f4e
2016-02-29 13:53:00 -08:00
1fbef195a3
Fix typos in CCRenderTexture.cpp commnets
...
Qualcomm Andreno GPU -> Adreno GPU
2016-02-29 16:22:56 +08:00
2a8d84e7f9
Remove unnecessary const from return types
2016-02-29 16:48:07 +09:00
6b4a0f808f
Add cocostudio localization editor export data parser and demo
2016-02-26 17:15:24 +08:00
c56835d743
improve the api doc for node.
...
fixes https://github.com/cocos2d/cocos2d-x/issues/15100
2016-02-25 11:43:36 +08:00
f1d8a28b96
Add FlatBuffers serialize function for language data used in Cocos Studio.
2016-02-24 14:59:37 +08:00
fda721fae2
Add "id" for parser object
...
Add "id" for parser object
2016-02-23 14:07:04 +08:00
37db8407f1
Merge pull request #14867 from dumganhar/refactor-websocket
...
WebSocket refactoring, bug fixes, improvements, and passes most Autobahn Test (The most standard WebSocket Protocol Test).
2016-02-21 06:59:59 -08:00
9a65b0c7a1
Merge pull request #15065 from mogemimi/add-missing-reference-types
...
Add missing reference-return types
2016-02-19 10:14:07 +08:00
3a2900494f
Merge pull request #15080 from njh0602/somefix
...
fix return value
2016-02-19 10:09:55 +08:00
1d9e688707
Fix typos in documentation
2016-02-18 16:16:36 +09:00
79c69d77d6
fix return value
2016-02-18 11:23:54 +09:00
j-jorge