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
8280f06c1f
Add missing reference-return types
2016-02-18 05:10:42 +09:00
0cb94cc373
Merge branch 'v3_libwebsockets' of https://github.com/xiaofeng11/cocos2d-x into refactor-websocket
2016-02-17 14:56:57 +08:00
1030151047
Fix C++ crash caused by CC_ENABLE_GC_FOR_NATIVE_OBJECTS macro
2016-02-16 13:43:11 +08:00
cb4d24e1ee
Merge pull request #14759 from pandamicro/hbmemory
...
Implement Full GC Relied memory model
2016-02-14 14:48:01 +08:00
85fc074e29
libwebsockets have been compiled as static lib, remove libwebsockets.dll from win10 & win8.1 project
2016-02-14 10:07:00 +08:00
1dbac01659
Bitmap font sizes are not loaded from binary .fnt files.
...
This problem causes bitmap fonts based on .fnt files to not appear at all, and no error is thrown.
Fixes #15042 .
2016-02-12 14:21:18 -05:00
ec664bc08b
Added aliases for PixelFormat names
2016-02-12 17:25:11 +03:00
8ad49c1bbc
SpriteFrameCache: take pixelFormat into account if specified
2016-02-11 15:47:23 +03:00
4992037c5c
Avoid creating temporary string objects
2016-02-03 23:12:37 +08:00
4f388d769a
Merge pull request #15002 from WenhaiLin/v3-TargetedAction-donefix
...
Fixed TargetedAction::isDone always return false!
2016-02-03 17:44:26 +08:00
fefd05e54d
Fix Menu event get released issue
2016-02-02 16:44:32 +08:00
bae36b7a98
Label:Fixed characters are displayed incorrectly with some specific font.
2016-02-02 11:16:36 +08:00
eba594bb41
Fixed TargetedAction::isDone always return false!
2016-02-02 11:07:38 +08:00
e2568b3a6f
Merge branch 'v3' of github.com:cocos2d/cocos2d-x into hbmemory
...
Conflicts:
tests/js-memory-gc-tests/src/tests-main.js
2016-01-28 01:12:49 +08:00
de9b51c0cf
Fix other GC issues
2016-01-28 01:03:50 +08:00
bd4615795e
fixed documentation for better reading clarity
2016-01-27 11:42:25 +10:00
d6cedb88ec
Remove JS::Persistent and move js object reference into JS scope
2016-01-24 19:47:26 +08:00
c4df3ccd10
please ignore just a test
2016-01-22 11:05:43 +10:00
ec2d29ed16
Merge pull request #14930 from ricardoquesada/rich_text_fixes
...
adds JS tests for RichText
2016-01-20 22:47:35 -08:00
4c11432781
fixed bold
2016-01-20 19:08:31 -08:00
2ed4965b6d
Merge pull request #14751 from newnon/v3_get_version_windows
...
getVersion win32 implementation
2016-01-21 10:42:19 +08:00
60d273e31b
underline and strikethrough working ok on system fonts
2016-01-20 18:41:59 -08:00
fd0ed05f18
Merge pull request #14902 from mogemimi/update-docs-to-v3
...
Update docs to reflect latest API changes
2016-01-21 10:35:27 +08:00
e1e87c0205
Merge pull request #14914 from steerlink/font_family
...
Add ability to get the font family
2016-01-21 10:34:13 +08:00
9c5eecacc7
Update docs to reflect latest API changes
2016-01-21 01:08:32 +09:00
639bf3f682
Fix warning and a bug in FontAtlasCache::unloadFontAtlasTTF()
2016-01-20 23:59:45 +09:00
86e8f7d0b3
oops... removing debugging code
2016-01-19 20:46:57 -08:00
27c8e5227d
Adds xml support in UIRichText
...
Supported tags:
- <small>: makes the font 20% smaller
- <big>: makes the font 25% bigger
- <img src="" />: to add an image
- <font face="path to font" size="size" color="#00ffaa">: font
attributes
- <i>: italics
- <b>: bold
- <u>: underline
- <del> strike-through
- </br>: new line
Also adds support for strikethrough, italics, bold and underlie to
`Label`
Contains tests for UIRichText and Label
Squashed commit of the following:
commit a0d6ae0513d40dbf414930210ab032a49d8984a0
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Tue Jan 19 20:39:21 2016 -0800
cleanup LabelTestNew
commit 0cf423af85d88a42fc1317207feeb3d05da7f8ab
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Tue Jan 19 20:34:53 2016 -0800
adds maaaany tests
...and fixes width and height in <img src="">
commit e8ba6acd5d79bbc766d7aa02ef166e166c801d01
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri Jan 15 19:41:37 2016 -0800
Label + URL working Ok
commit 36689e29ee3d77310e92264a09084cc06e30664c
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri Jan 15 18:24:44 2016 -0800
adding this code just in case...
... should use a listener component instead
commit af03708950e74483b875d0baad593aa6ed242a04
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Thu Jan 14 20:23:36 2016 -0800
URL node
plus <de><u> and <a img
commit e3a4930b012c0b3756752dac6ffb5ad43d24ae99
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Wed Jan 13 18:42:18 2016 -0800
strikethrough and underline implemented
they support multiline and horizontal alignment as well
includes test
however vertical alignment might not work
commit 640ccf39f56e153db46785a61be7000e898174c7
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Tue Jan 12 18:14:57 2016 -0800
bug fixes
commit 5e41fb76e91c571639585a609a255eb41797a302
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Tue Jan 12 16:47:20 2016 -0800
adds italics and bold "disable test"
commit 202c5a45bb9c8ea160b9f6880ef858874e07814b
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Tue Jan 12 14:40:13 2016 -0800
adds italics test
commit d1a8b421445053cc36860fc376f52692a3672dfe
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Mon Jan 11 20:53:23 2016 -0800
italics is working ok
commit fdd02087fce920c27c2409301ec88685fe68085b
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri Jan 8 17:18:56 2016 -0800
color, size and face working
commit c01bdef6b1d49f8805b69d4c162b74cd00c8f5b3
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Thu Jan 7 19:02:16 2016 -0800
initial commit
2016-01-19 20:41:31 -08:00
535dfdac27
Fix warning.
2016-01-19 11:47:18 -07:00
41d7a27485
Implement getFontFamily().
2016-01-19 11:43:35 -07:00
fc19435123
Merge branch 'v3' of github.com:pandamicro/cocos2d-x into hbmemory
...
Conflicts:
cocos/base/ccConfig.h
cocos/scripting/js-bindings/manual/ScriptingCore.cpp
cocos/scripting/js-bindings/manual/ScriptingCore.h
cocos/scripting/js-bindings/script/jsb_prepare.js
2016-01-18 16:40:00 +08:00
7e0a1344ca
The fix for BMFontConfiguration::parseConfigFile reads string file.
...
'strchr' finds a char until it gets a '\0', if 'contents' self doesn't end with '\0',
'strchr' will search '\n' out of 'contents' 's buffer size, it will trigger potential and random crashes since
lineLength may bigger than 512 and 'memcpy(line, contents + parseCount, lineLength);' will cause stack buffer overflow.
2016-01-15 00:55:10 +08:00
be6f9c0f03
Merge pull request #14882 from geron-cn/playableframe
...
add PlayableFrame
2016-01-14 09:42:17 +08:00
d589e44b0a
Merge pull request #14692 from CodeAndWeb/spriteframe-anchor-from-plist
...
Load anchor points from plist files
2016-01-13 15:58:02 -08:00
0babe85947
add PlayableFrame
2016-01-12 17:21:01 +08:00
cf6fc000e7
Merge pull request #14709 from kcisoul/v3
...
Fix #14428 CCRenderTexture does not work properly on some devices wh…
2016-01-12 11:35:00 +08:00
41dd44c75d
Fix some typos in docs
2016-01-11 19:23:05 +09:00
ab0efd933a
Merge branch 'v3.10' of https://github.com/cocos2d/cocos2d-x into v3
...
Conflicts:
CHANGELOG
cocos/scripting/js-bindings/manual/cocos2d_specifics.cpp
tests/js-tests/src/RenderTextureTest/RenderTextureTest.js
2016-01-09 18:01:56 +08:00
dc785f63ea
garbage collect when transition is finished
2016-01-07 10:52:03 -08:00
b45e96f77e
fix indent issue
2016-01-05 10:20:05 +08:00
100a119181
add overFlow enum to jsb and lua.
...
1. change clamp to 1 and shrink to 2
2016-01-04 21:43:37 +08:00
69eed4b99c
Updated comment
2016-01-04 11:19:40 +01:00
7cd80cb669
Adds iOS tests, calls GC after replacing scene
...
and some bug fixes
Squashed commit of the following:
commit 36b74ce4e68bf2f4a4c464453e695497716506eb
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Tue Dec 22 19:07:01 2015 -0800
adds missing file
commit 017d03807122faa38fefaa8f4554db8edc83561d
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Tue Dec 22 19:02:27 2015 -0800
disables GC by default
commit a2f3767a952e052eb8f0391bb5cbd1a8d0ce1b38
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Tue Dec 22 18:57:14 2015 -0800
Adds iOS test and calls GC after replacing the scene
commit 7b3b628caeb3366356d9a896aebd9c96887a85ed
Merge: 79e926a e311655
2015-12-29 17:36:02 -08:00
434c79ae90
Merge pull request #14793 from super626/fixsprite2
...
It already been reviewed and compile by jenkins in https://github.com/cocos2d/cocos2d-x/pull/14697 .
We need merge it to V3.10 to file TMX render bug.
2015-12-24 09:40:36 +08:00
707f08c557
Revert "fix setflip for batch sprite"
2015-12-23 09:54:04 -08:00
0d0534a2e1
Merge pull request #14697 from super626/v3.10-fixsprite
...
fix setflip for batch sprite
2015-12-23 09:53:24 -08:00
b0c4adcbd0
Fix method name spelling in AutoPolygon
2015-12-23 19:07:03 +09:00
3fd8f36a90
Limit force GC in menu item only work in lua-binding
2015-12-23 12:30:59 +08:00
82867b0073
Roll back disable force GC change on windows platform, this cause lua binding can not respond mouse click
...
Remove 3d touch demo iOS sdk checking, it SDK defines won't work in cpp compile
2015-12-22 18:41:44 +08:00
6a6407f711
Pass native references to script scope
2015-12-21 00:16:16 +08:00
022bcc24f1
Merge branch 'v3.10' of github.com:cocos2d/cocos2d-x into v3
...
Conflicts:
cocos/scripting/js-bindings/manual/chipmunk/js_bindings_chipmunk_manual.cpp
cocos/scripting/js-bindings/manual/component/CCComponentJS.cpp
cocos/scripting/js-bindings/manual/js_bindings_opengl.cpp
2015-12-20 22:56:33 +08:00
bac68bd0b8
getVersion win32 implementation
2015-12-20 00:09:45 +03:00
8f836162aa
Temporary disable forceGC on win32
2015-12-19 22:45:57 +08:00
12ece31121
Mark the old functions as CC_DEPRECATED_ATTRIBUTE
2015-12-19 01:21:56 +09:00
689ee1081a
Fix spelling of function name
2015-12-19 01:07:08 +09:00
4d9beb9d77
Merge pull request #14699 from WenhaiLin/v3-new-nothrow
...
Adds `std::nothrow` to the `new` statements
2015-12-18 14:38:28 +08:00
2a6cec25fa
Merge pull request #14701 from WenhaiLin/v3-label-letterfix
...
Fixed label's letter can't be hide by `setVisible(false)`.
2015-12-18 11:41:51 +08:00
d3898991af
fix some logical error
2015-12-18 11:03:23 +09:00
8a39c1a06a
Windows/osx/linux build fail bug fixed
2015-12-17 15:40:16 +09:00
afc50be1ed
Fix #14428 CCRenderTexture does not work properly on some devices which does not support "GL_OES_packed_depth_stencil".
2015-12-17 10:34:51 +09:00
89c620eb4b
Merge pull request #14696 from WenhaiLin/v3-labelfix
...
Improved robustness in release mode
2015-12-16 17:00:45 +08:00
05da27338a
Merge branch 'fix/ios9_downloader_bug' of github.com:cezheng/cocos2d-x into v3.10
2015-12-16 15:24:42 +08:00
b91882f150
Fixed label's letter can't be hide by `setVisible(false)`.
2015-12-16 14:59:33 +08:00
4fa58602a8
Adds `std::nothrow` to the `new` statements
2015-12-16 14:02:55 +08:00
74b480c1b6
fix setflip for batch sprite
2015-12-16 13:45:37 +08:00
e5952ad440
Improved robustness in release mode
2015-12-16 11:53:59 +08:00
ba45e2df33
updated lua bindings; updated file format description
2015-12-15 10:56:10 +01:00
727d857c88
Merge pull request #14674 from super626/tilemap
...
fix fast tilemap blend function
2015-12-15 17:23:53 +08:00
18aec7e942
Fix deprecation warning in FontFNT
2015-12-15 02:25:32 +09:00
4dd3595b1e
added test with plist file containing anchor points
2015-12-14 16:17:41 +01:00
033b9aabf0
read sprite anchor point from plist file
2015-12-14 15:42:18 +01:00
b6ec4c9c5d
fix fast tilemap blend function
2015-12-14 16:51:53 +08:00
eee7726f5f
fix setflip for batch sprite
2015-12-14 15:35:26 +08:00
96db089b64
Merge pull request #14665 from zilongshanren/fixMemoryLeak
...
fix memory leaks of stencileStateManager
2015-12-14 13:34:17 +08:00
41218a65e7
Merge pull request #14668 from pandamicro/v3
...
Sync v3 and Fix win32 js project crash issue
2015-12-14 13:12:42 +08:00
3e64e09e69
fix memory leaks of stencileStateManager
2015-12-14 10:40:09 +08:00
1c53920a13
Merge pull request #14660 from chengstory/#24345
...
Fix #24345
2015-12-14 10:38:13 +08:00
b1d700ad33
fix bmfont size error
2015-12-13 13:59:42 +08:00
07673f71cd
Fix inconsistent header include guards
2015-12-12 21:05:22 +09:00
d75767bfc4
Merge pull request #14639 from liamcindy/v3_ui_text
...
update for text effect clone
2015-12-11 13:54:46 +08:00
4c5c6e6d9b
update for code format
2015-12-11 12:04:54 +08:00
2420c942c3
Merge pull request #14617 from chengstory/#24345
...
Fix #24345
2015-12-10 09:19:30 -08:00
e92db43e14
update for text clone
2015-12-10 13:17:31 +08:00
35c855a565
updated dll name to v3.10
2015-12-09 17:33:14 -08:00
2a806a82c6
Fix #24345
...
TMX Iso Zorder and TMX Ortho Zorder rendering error in TestCPP.
2015-12-09 15:07:58 +08:00
f280a31323
Fix typo in documentation and comments
2015-12-09 01:48:24 +09:00
ea5dacedd0
Merge pull request #14608 from xiaofeng11/v3_310fix
...
Bug fix & make test case more clear.
2015-12-08 18:05:36 +08:00
5ef1c92420
Merge pull request #14609 from zilongshanren/fixLabelClampIssue
...
fix horizontal clamp and shrink issue
2015-12-07 19:45:19 +08:00
73d0f8a46e
Bug fix & make test case more clear.
...
1. In CameraBackgroundSkyBoxBrush _actived and _textureValid should set true as default, otherwise will cause user get wrong display status.
2. "Enable Wrap" check box in "31:Node: Label - New API -> 55:Resize content Test" is not used, so set it to disabled, won't let user to change it.
3. When set blank texture to UISlider or UISlider button, use resetRender function to clear texture, use init with blank file name will cause error.
2015-12-07 18:36:28 +08:00
6c17ef4baf
fix horizontal clamp and shrink issue
2015-12-07 18:13:03 +08:00
aebfefd7a8
Merge branch 'v3' into js_more_conversions
2015-12-04 19:01:20 -08:00
1820a006ba
Merge pull request #14502 from xiaofeng11/v3_combine_2d
...
Combine Studio change for 2d components
2015-12-04 16:05:24 +08:00
71217fd393
Fix indent
2015-12-04 15:14:47 +08:00
1171c6aaa1
Remove desktop only function, set ondraw serial function in DrawNode override able.
2015-12-04 14:55:54 +08:00
6fb65b5610
Editing code as comment.
...
Move CocosStudioExtension path and update related files.
2015-12-04 10:43:39 +08:00
01644cb46e
Merge pull request #14569 from mogemimi/fix-docs-typo
...
Fix typos in documentation
2015-12-04 09:55:30 +08:00
2da192a1c2
Remove cocostudio header file from sprite and particle, and adjust tests
...
Fix compile error under iOS & Mac
2015-12-04 09:26:14 +08:00
3100cba5a1
Animation ported to JS
2015-12-03 15:02:39 -08:00
3646d1e9fc
Adds init(array) for Sequence and Spawn
...
it also makes the code cleaner.
this is needed for JS
2015-12-03 12:16:21 -08:00
be213bf306
Fix typos in documentation
2015-12-03 21:03:00 +09:00
70b9183ddb
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_combine_2d
...
Conflicts:
tools/bindings-generator
2015-12-03 14:35:36 +08:00
32b81a69f5
Add test for new API
...
remove Sprite::setOffsetPosFromCenter api add by cocos studio, and reset _unflippedOffsetPositionFromCenter to zero in Sprite::setTexture
2015-12-03 14:21:00 +08:00
48523572b7
label JS fixes
2015-12-02 17:23:23 -08:00
a804c67a12
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_combine_2d
...
Conflicts:
cocos/scripting/lua-bindings/manual/LuaBasicConversions.h
2015-12-02 15:07:58 +08:00
ed55d41858
fix label clamp when scaled with bmfont
2015-12-02 13:48:20 +08:00
89ef6da5b5
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_combine_2d
...
Conflicts:
cocos/2d/CCFontFNT.h
2015-11-28 12:48:55 +08:00
6e0525156b
no message
2015-11-27 23:33:20 +10:00
0f8c3e0c1c
Merge pull request #14435 from zilongshanren/improve-label-layout-v2
...
Add Overflow to Label
2015-11-27 17:31:40 +08:00
8b631f5c9f
Fix compile failed on mobile platform
2015-11-27 15:19:50 +08:00
d69453fa54
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_combine
2015-11-26 19:04:13 +08:00
52f696945d
Remove condition MACRO and remove ASSERT in Sprite::initWithFile function
...
Remove CameraFlag define for Cocos Studio only
2015-11-26 14:47:37 +08:00
5221f8a6fc
improve the code by code review suggestions.
2015-11-26 12:03:18 +08:00
397fa809da
Add default line width to create function
2015-11-26 09:32:57 +08:00
9ec451ca31
Update CCDrawNode, remove condition MACRO
2015-11-25 23:26:57 +08:00
584a5d7407
fix alphaThreshold undefined issue
2015-11-25 18:27:38 +08:00
b1490c96b6
Merge branch 'v3' into fixListViewClippingIssue
2015-11-25 18:25:40 +08:00
b0d88a552a
Merge pull request #14419 from xiaofeng11/v3_combine_ui
...
Combine Studio change for UI components
2015-11-25 17:19:54 +08:00
03046d6fbd
change the default alphaThreshold
2015-11-25 14:31:32 +08:00
759c0bbf31
rename CCStencilBitsManager to StencilStateManager
2015-11-25 14:24:27 +08:00
5fef088695
refactor stencil state management code
2015-11-25 14:14:17 +08:00
9c2130e88a
fix Layout and ClippingNode nested rendering issue
2015-11-24 18:01:50 +08:00
7676b1cb73
improve label layout logic
2015-11-23 17:47:30 +08:00
7ee82f20fc
fix getLetter crash issue.
...
1. make vertical clamp works in non-wrap mode.
2. make the lineHeight and letterSprite scale work correct.
2015-11-20 16:39:48 +08:00
8c25749366
minor improvement
2015-11-20 10:54:05 +08:00
19257d6120
Add Overflow feature char map font.
...
1. fix single line clamp.
2015-11-19 18:14:46 +08:00
ccdb2a75f9
Add Label Overflow and wrap option.
...
Squashed commit of the following:
commit 7176582def3686f78701f92ead4d0976bccd115d
Author: zilongshanren <guanghui8827@126.com>
Date: Thu Nov 19 10:30:54 2015 +0800
add char map font test
commit 7ea7c251ff549e4a74d5c5c3faa49893fe5defc4
Author: zilongshanren <guanghui8827@126.com>
Date: Wed Nov 18 15:00:17 2015 +0800
system font overflow is not supported
commit a02fe0c7f94692b95a0bfd6f194a94c4519cee3a
Author: zilongshanren <guanghui8827@126.com>
Date: Wed Nov 18 11:04:15 2015 +0800
add system font test
commit eb098da8b16f485c86929a9b2ba00a64068264e9
Author: zilongshanren <guanghui8827@126.com>
Date: Tue Nov 17 10:29:35 2015 +0800
Finish resize height mode
commit ca78ba35abdbacc23bf6f8315454ec0a356a6aca
Author: zilongshanren <guanghui8827@126.com>
Date: Mon Nov 16 11:01:27 2015 +0800
fix wrap issue
commit baf1a5e0dc3a08da0a13500aea5afc82017b054a
Author: zilongshanren <guanghui8827@126.com>
Date: Sat Nov 14 08:28:57 2015 +0800
horizontal shrink still has a issue
commit 7e8abc0990cdf299d23c8072c5c1d4aa561bf798
Author: zilongshanren <guanghui8827@126.com>
Date: Fri Nov 13 11:42:34 2015 +0800
finish shrink without wrap
commit c9c45bd1f304ba00a6f9a274fa5631659a075bc1
Author: zilongshanren <guanghui8827@126.com>
Date: Fri Nov 13 10:09:46 2015 +0800
update shrink
commit ad82010ea846679e4d1a09f5127be29ae2e6adae
Author: zilongshanren <guanghui8827@126.com>
Date: Thu Nov 12 17:55:15 2015 +0800
refactor shrink logic
commit effc1ee1cd9f06eaa4f46dd5c2a1401f6a285af6
Author: zilongshanren <guanghui8827@126.com>
Date: Wed Nov 11 18:25:34 2015 +0800
add resize overflow type
commit 194d552adc2a4ba2c439eff969b082556315e0ae
Author: zilongshanren <guanghui8827@126.com>
Date: Wed Nov 11 11:49:51 2015 +0800
no wrap, shrink is working.
commit e2222ef14d5392817bd727895b3c2caec5ce4faf
Author: zilongshanren <guanghui8827@126.com>
Date: Tue Nov 10 16:16:27 2015 +0800
add overflow type to label.
1. optimize the testcase
commit b65e2de4bfb3cb86a0d0cfa118be891a3f9fe858
Author: zilongshanren <guanghui8827@126.com>
Date: Mon Nov 9 17:22:34 2015 +0800
finish bmfont wrap by char
commit f339ff0309dc9e2ca2871f03f4551d329afce5e1
Author: zilongshanren <guanghui8827@126.com>
Date: Mon Nov 9 17:04:51 2015 +0800
finish bmfont wrap by word
commit 4c8edc65204a1294ac81315e72f1299acbdf43c0
Author: zilongshanren <guanghui8827@126.com>
Date: Mon Nov 9 11:29:21 2015 +0800
add BMFont size support
commit 3282481bda9dcb0f88b41f2568f7e5c856af6d53
Author: zilongshanren <guanghui8827@126.com>
Date: Mon Nov 9 09:58:01 2015 +0800
add font size support for BMFONT
commit 0c8e2a0374983625507a183cb2eb53a0b1709e25
Author: zilongshanren <guanghui8827@126.com>
Date: Fri Nov 6 16:36:27 2015 +0800
add toggle wrap option.
1. make hirozontal clamp working
commit 19dcd3e80a34c54b20934d08937eb270e689a7db
Author: zilongshanren <guanghui8827@126.com>
Date: Fri Nov 6 15:12:59 2015 +0800
tweak label layout
commit e36a40babf4817ea7e9830614ac7560f2e69c583
Author: zilongshanren <guanghui8827@126.com>
Date: Thu Nov 5 11:11:02 2015 +0800
finish the test skeleton
commit a144a3a5d388d15c4f37cbfc12563eccabffb8e1
Author: zilongshanren <guanghui8827@126.com>
Date: Wed Nov 4 16:38:54 2015 +0800
add setFontSize api to label.
1. add new chinese-english bmfont
2. beautify base test
commit b22551c9eb3738fbb1c38ae4a3bfd07a202dcaf0
Author: zilongshanren <guanghui8827@126.com>
Date: Wed Nov 4 11:27:18 2015 +0800
add label layout test skeleton
2015-11-19 16:06:13 +08:00
5369f9a84d
Add header file to make this pr can pass jenkins auto build
2015-11-19 10:14:27 +08:00
bb83fe4596
Combine Studio change for UI components
2015-11-18 13:38:29 +08:00
5d8cfa889c
Merge pull request #14252 from neokim/change_pageview_to_derive_from_listview
...
Change PageView to derive from ListView
2015-11-17 12:02:10 +08:00
a5b7674b4d
Merge pull request #14263 from zilongshanren/improve-scale9sprite-v4
...
improve scale9sprite
2015-11-17 10:48:09 +08:00
d47a79c0e4
Remove cocos studio limitation for new functions
2015-11-16 11:08:20 +08:00
140eaf7b6c
Fix function name in cpp file
2015-11-13 09:09:02 +08:00
4c8066e39f
Normalize function names.
2015-11-12 18:23:56 +08:00
1546a062a1
Update
2015-11-12 10:57:22 +08:00
c40a2a3301
Combine Studio change for 2d components
2015-11-12 09:49:49 +08:00
a31cce9a80
Fix minor grammar and typo in documentation
2015-11-04 17:14:00 +09:00
dfe56769a1
added missing Light3DReader files
2015-11-03 08:04:55 -08:00
872141d547
update for light3d reader
2015-11-03 13:34:21 +08:00
ccf4cb5a74
improve scale9sprite
2015-10-29 10:41:58 +08:00
b72e4118f0
PageViewIndicator - Add `PageViewIndicator.cpp` to build configuration files.
2015-10-28 16:56:36 +09:00
b6b9364a84
Merge pull request #14232 from xiaofeng11/v3
...
Fix FadeOutDownTilesTest won't show last tile
2015-10-28 15:44:28 +08:00
6029635493
Remove comment out codes
2015-10-27 18:43:51 +08:00
aa9f0d5bd5
Merge pull request #14049 from CodeAndWeb/v3-sprite-polygoninfo-from-plist
...
Extending SpriteFrameCache to read PolygonInfo from atlas plist file
2015-10-27 17:28:22 +08:00
f374df408e
Fix FadeOutDownTilesTest won't show last tile
2015-10-27 14:41:31 +08:00
94ab41ceb3
use "const string &" in SpriteFrameCache
2015-10-26 09:36:01 +01:00
9df30d2454
Fix typos in documentation
2015-10-23 16:59:51 +09:00
05b277752c
Merge pull request #14105 from WenhaiLin/v3.9-rc
...
ParticleSystemQuad:Fixed incorrectly generate errors "Particle system not enough memory"
2015-10-22 10:36:02 +08:00
c3194ac34d
Fix memory leak in TMXLayer
2015-10-19 19:47:36 +09:00
82881bf92f
Merge pull request #14109 from loadrunner/label3
...
Added line spacing/leading feature to Label
2015-10-19 10:55:53 +08:00
3e3e47de10
added Win10 UWP curl support
2015-10-14 16:47:52 -07:00
40aa4187be
Merge pull request #14138 from songchengjiang/cocos2d-v3-bugfix2
...
fix the #23272 bug
2015-10-14 14:05:09 +08:00
02f20db82a
fix the #23272 bug
2015-10-14 13:24:38 +08:00
b19bf82170
Merge pull request #14108 from loadrunner/label2
...
Changed label font size type to float
2015-10-13 11:55:14 +08:00
5e43cfa129
Merge pull request #14107 from loadrunner/label1
...
Removed scale factor for label shadow
2015-10-13 11:54:14 +08:00
e60ac24e5d
Check that textureAtlas isn't null before removing all quads in SpriteBatchNode
...
See issue #14122 .
2015-10-12 20:42:08 -04:00
3dde02ba93
Merge pull request #14106 from loadrunner/tilemap
...
TMXLayer cast bug
2015-10-11 18:43:24 +08:00
471c23930c
added line spacing/leading
2015-10-10 19:15:45 +03:00
019b549a20
changed font size type to float
2015-10-10 19:15:22 +03:00
aeb268f3cd
cast tile coordinates to int before calculating index
2015-10-10 19:05:51 +03:00
05c235f9fe
ParticleSystemQuad:Fixed incorrectly generate errors "Particle system: not enough memory"
2015-10-10 17:55:05 +08:00
f64105b3dc
Merge pull request #14047 from liamcindy/v3.9
...
update for light3d reader
2015-10-10 11:43:05 +08:00
ee3399a4a4
Merge pull request #14097 from TheCodez/patch-1
...
Add missing getChildByTag<>() api
2015-10-10 09:43:46 +08:00
493d95c3f6
Add missing getChildByTag<>() api
2015-10-10 00:08:38 +02:00
5993304e06
Fix typos
2015-10-09 17:59:11 +09:00
be4724ef47
issues #14050 ActionManager memory leak
2015-10-09 10:07:26 +08:00
a68d07b968
Merge pull request #14075 from TheCodez/getname_byref
...
Node::getName() now returns string by reference
2015-10-08 11:43:03 +08:00
5c816b5d9b
Merge pull request #14063 from kammy/improve_spriteframecache
...
Inprove SpriteFrameCache::addSpriteFramesWithDictionary
2015-10-08 11:23:21 +08:00
eb747cf808
Node::getName() returns string by reference
2015-10-05 21:42:07 +02:00
1e298a2c1a
Merge pull request #14064 from MSOpenTech/v3-win10-fix
...
V3: fixed Windows 10 UWP app manifest by correcting image asset paths
2015-10-04 10:53:52 +08:00
32eeb560c3
clean up include files for WINRT platforms
2015-10-02 18:49:41 -07:00
0469632cf8
Inprove addSpriteFramesWithDictionary
...
- Moved initialization of image to an appropriate
location, because it always called twice in
SpriteFrameCache::addSpriteFramesWithFile()
2015-10-03 03:18:07 +09:00
9f768bc1ab
Add missing override keyword
2015-10-02 18:18:23 +09:00
c49b60ae40
SpriteFrameCache: added plist file format documentation, fixed broken link
2015-10-01 10:36:18 +02:00
9a0ea79b61
remove set/get/hasPolygonInfo methods from js / lua api; fixed C++11 issue
2015-09-30 15:20:53 +02:00
79656ffe13
fixed typo, indentation
2015-09-29 16:50:14 +02:00
ac24612e98
extend SpriteFrameCache to load PolygonInfo from plist file
2015-09-29 15:42:04 +02:00
87a406febe
update for light3d reader
2015-09-29 11:27:01 +08:00
8944f9e1cd
removed scale factor for label shadow
2015-09-28 16:27:20 +03:00
7b85211cfe
Remove ScriptComponent
...
Because windows platform can't successfully compile in previous architecture
2015-09-27 22:18:59 +08:00
ddb636a022
Add ScriptComponent and ComponentJS
2015-09-26 19:43:36 +08:00
26632ec69a
linjia demo finish
2015-09-26 19:43:35 +08:00
95379c5dc2
Merge pull request #13995 from xiaofeng11/v3
...
Fix issue http://punchbox.info:3000/issues/23146
2015-09-24 13:03:59 +08:00
6db2cd7b9c
Fix issue : http://punchbox.info:3000/issues/23182
...
When time scale set to negative value, it will cause emitCounter been set to negative value and cause render crash
2015-09-23 18:37:12 +08:00
6ebdd3baf9
allow to use custom shader uniforms and attributes on drawNode
2015-09-23 10:34:35 +01:00
62e36e8006
fix typos and syntax error. A thorough check by tool VSSpellChecker.
2015-09-22 16:08:23 +08:00
08204ec0bd
Merge pull request #13991 from MSOpenTech/v3-win10-fix
...
V3 Win10 UWP fixes
2015-09-22 02:44:45 +08:00
6a5db06115
added missing CCMotionStreak3D files. Re-added all Physics and 3D files to project
2015-09-21 11:11:34 -07:00
b54a06a55e
Merge pull request #13987 from Dimon4eg/Fix-crash-in-FontFreeType
...
Fix crash in destructor of FontFreeType
2015-09-22 01:59:34 +08:00
deacab9222
Merge pull request #13990 from MSOpenTech/v3-win10-fix
...
V3 Win10 UWP fixes
2015-09-22 01:57:53 +08:00
70e157a44a
removed CCComponentPhysics2d from Win10 UWP project
2015-09-21 10:44:30 -07:00
09b5b7fcc3
Fix crash in destructor of FontFreeType
2015-09-21 18:18:58 +03:00
5511d42cd4
Merge pull request #13716 from fusijie/particle_performance
...
Refactory particle system update.
2015-09-21 14:19:55 +08:00
d871b1aa8a
Refactory particle system.
2015-09-20 16:46:09 +08:00
0cbc1e5f40
Merge pull request #13923 from WenhaiLin/v3-physics-refine
...
Refine components to improve physics performance
2015-09-18 21:56:36 +08:00
add24ccf95
Merge pull request #13913 from fusijie/revert-12889-fix_clippingRectangle_bug
...
Revert "remove CCClippingRectangleNode transform error support."
2015-09-18 21:43:42 +08:00
13f3d46ad4
Merge pull request #13897 from super626/v3
...
SkyboxBrush : Make the shader parameter take effect at once
2015-09-18 16:14:06 +08:00
a17a702cd1
Refine components to improve performance
2015-09-18 14:34:02 +08:00
23246b006b
fixed region x,y scale bug.
2015-09-18 13:39:22 +08:00
eb480fb021
Revert "remove CCClippingRectangleNode transform error support."
2015-09-18 11:31:37 +08:00
757209e59e
make the shader parameter take effect at once
2015-09-17 18:14:17 +08:00
572ee3adb2
merge cocos
2015-09-17 14:24:01 +08:00
0479cca364
Merge pull request #13832 from yangws/downloader
...
Restructure CCDownloader implement on iOS and Android don't use libcurl.
2015-09-16 14:01:28 +08:00
848fa2c0d0
Merge cocos2d.
2015-09-15 18:30:45 +08:00
73d2c5d1b8
Merge pull request #13577 from fusijie/fix_13454
...
Fixed sprite debug draw.
2015-09-15 14:24:23 +08:00
f281ae31b0
Merge pull request #13725 from WenhaiLin/v3-comonent-refine
...
Refine ComponentContainer to improve performance
2015-09-10 18:04:26 +08:00
7611f99ee4
Merge pull request #13746 from WenhaiLin/v3-menuitemtoggle-refine
...
Uncoupling the implementation of MenuItemToggle dependence on tag.
2015-09-10 16:15:18 +08:00
98f29e4dee
Merge pull request #13764 from fusijie/fix_autopolygon_comments
...
[ci skip]Fixed autopolygon comments
2015-09-10 15:22:55 +08:00
d957e0c032
Fixed auto polygon comments out of date.
2015-09-10 15:18:04 +08:00
e251866d23
Uncoupling the implementation of MenuItemToggle dependence on tag.
2015-09-09 15:32:44 +08:00
34be2065e4
Refine ComponentContainer to improve performance
2015-09-09 11:53:55 +08:00
e592a1a02d
fix typos
2015-09-09 11:37:41 +08:00
dc607a1784
Merge pull request #13726 from jianglong0156/actionExtendSquash
...
support custom action, and rewrite update function
2015-09-09 10:25:56 +08:00
badd80bf3a
support custom action, and rewrite update function
...
support custom action in js, and developer can rewrite the update function in custom action class.
useage:
// custom action sample code
var customMoveBy = cc.MoveBy.extend({
ctor:function (duration, deltaPos, deltaY) {
this._super(duration, deltaPos, deltaY);
},
update:function (dt) {
this._super(dt);
if (this.getTarget()) { // rand color
this.getTarget().setColor(cc.color(cc.rand()%255, cc.rand()%255, cc.rand()%255));
}
}
});
2015-09-09 10:08:07 +08:00
8326ed6535
add physics component
2015-09-08 09:54:01 +08:00
00abec6c2c
Merge pull request #13707 from pandamicro/fix_layerrgba
...
[ci skip] Fix compile error in __LayerRGBA
2015-09-07 17:27:46 +08:00
d77045818c
Fix compile error in __LayerRGBA
2015-09-07 17:25:56 +08:00
030157ded0
update libcococs2d name to v3.9 for WinRT platforms
2015-09-04 08:46:08 -07:00
5fdb041856
Use string::empty() to check whether string is empty.
2015-09-01 11:26:09 +08:00
c23805889f
add motionstreak3d
2015-09-01 11:02:22 +08:00
6fa6f1f0da
enable depth write
2015-08-28 11:46:11 +08:00
5f527bfc1d
Fixed sprite debug draw.
2015-08-26 18:18:58 +08:00
2f72a88a20
depth test always
2015-08-26 16:37:48 +08:00
7884138dcc
disable blend when drawing skybox
2015-08-25 14:32:25 +08:00
43687bf7a0
moved CCTextureCube from 3D to renderer
2015-08-24 03:45:55 -07:00
0c5b377f00
Merge pull request #13531 from pandamicro/texturecube
...
Move CCTextureCube From 3d to renderer to solve compilation issue
2015-08-24 14:06:08 +08:00
7dcc3dd982
Move CCTextureCube From 3d to renderer to solve compilation issue
2015-08-24 14:01:50 +08:00
be24586f4b
fix crash of CameraBackgroundColorBrush
2015-08-24 10:23:59 +08:00
b4f2fb0928
added missing CCCameraBackgroundBrush files
2015-08-21 09:23:01 -07:00
486af79a47
Merge pull request #13511 from fusijie/fix_13509
...
fixed renderTexture crash bug.
2015-08-21 18:24:27 +08:00
cbd7eed9c4
fixed renderTexture crash bug.
2015-08-21 17:38:56 +08:00
006f300ac9
Add JS and Lua bindings for CCCameraBackgroundBrush
2015-08-21 12:42:36 +08:00
350182c1aa
Refactor BackGround to Background
2015-08-21 10:43:59 +08:00
3e2001bdb1
Add CCCameraBackgroundBrush
...
including Color, Depth, SkyBox brushes
Squashed from https://github.com/cocos2d/cocos2d-x/pull/13490
2015-08-21 10:43:59 +08:00
d55bc653e0
update c++ debug info settings
2015-08-20 13:25:17 -07:00
7bd5cc4e34
Merge pull request #13486 from fusijie/fix_11677
...
Fixed SpriteProgressToRadialMidpointChanged bug.
2015-08-20 18:06:38 +08:00
f133e5a754
Fixed SpriteProgressToRadialMidpointChanged bug.
2015-08-20 17:07:53 +08:00
f26509efe4
Fix when picture file used by TMX map file missing or broken, create TMX object will cause program crashed
2015-08-19 14:02:12 +08:00
4f9a81198b
Merge pull request #13456 from WenhaiLin/v3.8-label-globalZOrder
...
Fixed `Label::setGlobalZOrder ` is invalid if label create with system font.
2015-08-19 13:46:00 +08:00
31bc04a301
Merge pull request #13455 from MSOpenTech/v3-win10
...
Windows 10 UWP and WP8.1 app certification fixes
2015-08-19 13:36:29 +08:00
827f05c5e1
Fixed `Label::setGlobalZOrder ` is invalid when label create with system font.
2015-08-19 10:22:48 +08:00
47b72ba30e
Merge branch 'v3' into v3-win10
2015-08-18 11:07:38 -07:00
8493365be7
updates to pass Windows App Certification tests
2015-08-18 11:06:47 -07:00
593eb0737f
Merge pull request #13440 from WenhaiLin/v3.8-rc0
...
Fixed `Label::getLetter(index)->setVisible(true)` cause draws duplicate letters.
2015-08-18 17:06:37 +08:00
6bf15885b8
Fixed `Label::getLetter(index)->setVisible(true)` cause draws duplicate letters.
2015-08-18 15:42:05 +08:00
223d5a7a5c
fix copy construct & assignment operator memory leakage.
2015-08-18 14:48:16 +08:00
d2bc03f80f
Merge pull request #13424 from WenhaiLin/v3.8-rc0
...
Label:Fixed display not as expected(Redmine issue:22133).
2015-08-18 10:00:36 +08:00
990a25f759
Label:Fixed display not as expected(Redmine issue:22133).
2015-08-17 22:46:19 +08:00
0473b08dbb
Fix gamenode3d parse failed error
...
- Fix the parser issue
- Add GameNode3DReader to win8 universal project
- Add GameNode3d reader to Android & Linux project
Squashed from https://github.com/cocos2d/cocos2d-x/pull/13369
2015-08-17 22:42:21 +08:00
83de0e798e
Merge pull request #13365 from WenhaiLin/v3-label-ignore-r
...
Label:ignore '\r' character.
2015-08-14 17:22:33 +08:00
d25decb414
Label:ignore '\r' character.
2015-08-14 11:07:34 +08:00
d2cf4bfc79
Squashed commit of the following:
...
commit 2c810a8e931e07b06498c07db37cbf20a2bcfc92
Merge: 61788a0 082caaf5e21580#6 from minggo/downloader_decouple
fix js binding error
commit 8d7388302ff1d8da575b277e47a3f8ceb1017e98
Author: minggo <ming@cocos2d-x.org>
Date: Thu Aug 13 11:09:58 2015 +0800
fix js binding error
commit 2ea66af7684f5ec8a20067b1a49347920dbbbb40
Merge: 8cdb0b6 bc964e8#5 from minggo/downloader_decouple
fix lua-binding error
commit 08eeca9d99b5160c48bac1bfecf03b459d05ed15
Author: minggo <ming@cocos2d-x.org>
Date: Wed Aug 12 10:34:05 2015 +0800
fix lua-binding error
commit 927276589d57432477f8ffc033e19a21a215b246
Merge: 8252464 6f4ed8a#4 from minggo/downloader_decouple
fix linking error in lua-tests on Android
commit 138df42a3acfdcfae29eeab1b03ef5dd062f0145
Author: minggo <ming@cocos2d-x.org>
Date: Tue Aug 11 16:23:53 2015 +0800
fix link error in lua-tests
commit 5dddbb61a1bcda96aa93bfcbe78f42c639eb6247
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri Aug 7 23:22:50 2015 -0700
works for real on win32
commit ddadaf82231b60c8e343718561c0d78657afe7c2
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri Aug 7 22:26:59 2015 -0700
compiles on win32
commit 733f1d4c2e4f8382ff19f1793f7f09950774fe78
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri Aug 7 21:57:49 2015 -0700
compiles on iOS!!
commit f706f97962eb393bf7dfec79739ff8dfdec103d5
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri Aug 7 21:27:03 2015 -0700
compiles and runs Ok on windows.
Tested all downloadertests + assetmanagertest
commit 5e333f4407952d9c2e71e18cb9393d8b6cd170b4
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri Aug 7 20:24:28 2015 -0700
updates windows projects
commit e77fd8a278594fefc24ff13cbee038508429294d
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri Aug 7 19:56:10 2015 -0700
compiles on Android
commit 5f515e3519a0688d11476ea6ef235007e8378c96
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri Aug 7 18:34:33 2015 -0700
trying to fix a compile issue on iOS
WIP
commit b144ea67dfe7a06e7bfb515adf16f536ba2ead98
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri Aug 7 18:25:11 2015 -0700
make bug fixes
adds public `getHeader`
commit a228799ba74eb8642c43d215a802f811a576a4aa
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri Aug 7 17:42:19 2015 -0700
some linux fixes
commit 2cab23d87acc138823ebe9dcec9d42f827690d99
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri Aug 7 16:58:53 2015 -0700
Squashed commit of the following:
commit 86227e9138c1fb523bd28186d355de65cc64c588
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri Aug 7 16:55:17 2015 -0700
works %100
and uses less memory than before
commit a9cafa6f2fe7847e279934d2c162287680760dda
Merge: 0bbc62e 0cbd71f7f215e90d778386831e24a06421b8d836daf744383253d9c4642ccac
2015-08-13 00:14:10 -07:00
c06994de34
Label:Fixed display incorrect if label content is changed after invoking `getLetter(letterIndex)`
2015-08-13 10:29:58 +08:00
eeb4a38715
Label:Fixed letter can be flipped.
2015-08-11 10:06:14 +08:00
2983aed0a9
Label:Fixed crash cause by access an invalid address
2015-08-10 16:50:59 +08:00
3cc06d3f9b
Merge pull request #13267 from yangws/bug_21796
...
Fix bug: #21796 [Android 5.0][Cpp-Tests] Node::Scene3D menu unusable.
2015-08-10 12:40:32 +08:00
f4440f5613
Merge pull request #13229 from fusijie/fix_13228
...
Fixed SpriteBatchNode setFlipped bug.
2015-08-10 11:53:30 +08:00
56204dbef9
Fix bug: #21796 [Android 5.0][Cpp-Tests] Node::Scene3D menu unusable.
2015-08-07 16:30:22 +08:00
9b148b08cd
Fixed SpriteBatchNode setFlipped bug.
2015-08-06 10:53:22 +08:00
e81d5af12d
Spaces should not be lost if label created with Fingerpop.ttf
2015-08-05 23:46:41 +08:00
2c220092e6
Fixed FontAtlasCache::purgeCachedData might cause crash.
2015-08-05 14:12:02 +08:00
b9edd6fc29
Fixed transform
2015-08-05 00:21:06 +08:00
2363622a67
Label:support auto batch with bitmap font or char map.
2015-08-04 21:49:14 +08:00
8d2da20e5f
fix spelling mistake.
2015-08-04 09:36:33 +08:00
4b7b85f113
Merge pull request #12889 from fusijie/fix_clippingRectangle_bug
...
remove CCClippingRectangleNode transform error support.
2015-08-03 18:01:01 +08:00
aaa5793b86
add IF-CASE to fix debug draw under SpriteBatchNode.
2015-08-03 10:47:58 +08:00
3c2e66e425
Merge branch 'v3.7.1' of https://github.com/cocos2d/cocos2d-x into v3
...
# Conflicts:
# .travis.yml
# build/cocos2d_js_tests.xcodeproj/project.pbxproj
# build/cocos2d_tests.xcodeproj/project.pbxproj
# cocos/2d/CCFont.h
# cocos/2d/CCFontAtlas.cpp
# cocos/2d/CCFontAtlas.h
# cocos/2d/CCFontFreeType.cpp
# cocos/2d/CCFontFreeType.h
# cocos/2d/libcocos2d_8_1/libcocos2d_8_1/libcocos2d_8_1.Windows/libcocos2d_8_1.Windows.vcxproj
# cocos/2d/libcocos2d_8_1/libcocos2d_8_1/libcocos2d_8_1.WindowsPhone/libcocos2d_8_1.WindowsPhone.vcxproj
# cocos/2d/libcocos2d_win10/libcocos2d.vcxproj
# cocos/cocos2d.cpp
# cocos/platform/android/jni/Java_org_cocos2dx_lib_Cocos2dxHelper.cpp
# cocos/scripting/js-bindings/auto/jsb_cocos2dx_studio_auto.cpp
# templates/cpp-template-default/proj.ios_mac/HelloCpp.xcodeproj/project.pbxproj
# templates/js-template-default/frameworks/runtime-src/proj.ios_mac/HelloJavascript.xcodeproj/project.pbxproj
# templates/js-template-runtime/frameworks/runtime-src/proj.ios_mac/HelloJavascript.xcodeproj/project.pbxproj
# templates/lua-template-default/frameworks/runtime-src/proj.ios_mac/HelloLua.xcodeproj/project.pbxproj
# tests/cpp-tests/Classes/LabelTest/LabelTestNew.cpp
# tests/cpp-tests/Classes/LabelTest/LabelTestNew.h
# tools/bindings-generator
# tools/simulator/frameworks/runtime-src/proj.ios_mac/simulator.xcodeproj/project.pbxproj
# tools/travis-scripts/generate-bindings.sh
# tools/travis-scripts/generate-cocosfiles.sh
# tools/travis-scripts/travis_mac.yml
2015-08-02 22:28:27 +08:00
0ca48a32f5
Merge pull request #13110 from WenhaiLin/v3.8-label-cropped-fix
...
Label:Fixed the edge of character may be cropped.
2015-08-01 15:36:47 +08:00
3bdc7e4e1e
Merge pull request #13138 from fusijie/fix_spritepolygon_setflip
...
fix polygon sprite setFlipped bug.
2015-08-01 09:59:25 +08:00
dcef1e9d31
fix polygon sprite setflipped bug.
2015-07-31 15:49:44 +08:00
ede9195d14
Merge pull request #13073 from super626/fixtest
...
Bug Fix
2015-07-31 09:58:14 +08:00
fc14efa034
update comment
2015-07-31 09:55:57 +08:00
39721c6eb6
Merge pull request #13105 from fusijie/fix_10487
...
fix Sprite/Label/FastTMX auto-culling bug.
2015-07-30 17:12:37 +08:00
bce279c52e
Label:Fixed the edge of character may be cropped.
2015-07-30 16:24:47 +08:00
17c7848e62
fix FastTiledMap auto-culling bug.
2015-07-30 15:07:03 +08:00
f91a58c8ff
fix Label auto-culling bug.
2015-07-30 13:59:50 +08:00
cd4d8b7880
Merge pull request #13101 from WenhaiLin/v3.8-label-code-style
...
Improve coding style
2015-07-30 13:44:53 +08:00
ee5e64825a
fix Sprite auto-culling bug.
2015-07-30 12:00:57 +08:00
964e7103b5
Improve coding style
2015-07-30 11:33:18 +08:00
c039c7a9bd
Merge pull request #13084 from WenhaiLin/v3.8-label-df-contentsize-fix
...
Fixed the content size of Label is incorrect with GLOW effect.
2015-07-30 11:29:48 +08:00
a9f27865d3
Fixed the content size of Label is incorrect with GLOW effect.
2015-07-29 16:30:07 +08:00
16b03f0ebe
Merge pull request #13065 from pandamicro/widget_onEnter
...
Ensure C++ classes onEnter, onExit can be safely override in JS
2015-07-29 15:36:12 +08:00
96d44e1078
Merge pull request #13076 from WenhaiLin/v3.8-label-gb2312
...
Label:support font that contains GB2312 char map.
2015-07-29 14:51:17 +08:00
5d677d49bb
clamp sin value to -1, 1
2015-07-29 10:35:01 +08:00
cca95c3c51
Merge pull request #13041 from yangws/issue_10386
...
Fixed #10386 : ui::TextField hitTest not working as expected.
2015-07-29 09:52:06 +08:00
9fea134de1
Use sendNodeEventToJSExtended instead of sendNodeEventToJS in sub classes
2015-07-28 18:24:03 +08:00
c4112e1ce5
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3.8-label-gb2312
2015-07-28 17:02:30 +08:00
9edd66d4a7
Label:support font that contains GB2312 char map.
2015-07-28 16:28:32 +08:00
89c722ed4b
Add script invocation for onEnter, onExit etc in other classes
2015-07-28 16:07:14 +08:00
0d7f1e3672
Reorder the logic of script invocation for onEnter, onExit etc to the beginning of the function
2015-07-28 16:05:47 +08:00
3a58668d71
Merge pull request #12744 from fusijie/fix_pageturndown
...
Fix PageTurn3D
2015-07-28 11:35:15 +08:00
7fb4dabcb7
Fixed a compile error when CC_SPRITE_DEBUG_DRAW is on
2015-07-27 14:46:15 -07:00
2f996b24ef
Fixed #10386 : ui::TextField hitTest not working as expected.
2015-07-27 16:59:35 +08:00
fa46a0abb4
Merge pull request #12992 from yangws/v3.7.1
...
Fixed #12962 : Scene can't have std::vector member.
2015-07-25 09:52:00 +08:00
b1bd8338aa
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3.8-label-gb2312
2015-07-24 21:30:28 +08:00
8940eb829f
added missing cocostudio files
2015-07-24 04:48:14 -07:00
37a174ee4a
Label:refine the implementation about text layout and support debug draw
2015-07-24 18:38:45 +08:00
0b09fd5bcb
Merge branch 'v3.7.1' of github.com:cocos2d/cocos2d-x into 3.7.1
...
Conflicts:
cocos/2d/libcocos2d.vcxproj.filters
cocos/2d/libcocos2d_8_1/libcocos2d_8_1/libcocos2d_8_1.Shared/libcocos2d_8_1.Shared.vcxitems.filters
tests/cpp-tests/Classes/ExtensionsTest/CocoStudioActionTimelineTest/ActionTimelineTestScene.cpp
tests/cpp-tests/Classes/ExtensionsTest/CocoStudioActionTimelineTest/ActionTimelineTestScene.h
2015-07-24 11:38:09 +08:00
e4a8aeee45
Fixed #12962 : Scene can't have std::vector member.
2015-07-24 11:16:45 +08:00
5ffa8efee6
Merge pull request #12977 from chengstory/OptimizationExtensionData
...
Optimization extension data
2015-07-24 11:01:56 +08:00
be08de6780
Update libcocos2d_8.1 vs project.
2015-07-24 09:32:39 +08:00
halx99