Commit Graph

3341 Commits

Author SHA1 Message Date
fusijie ee5e64825a fix Sprite auto-culling bug. 2015-07-30 12:00:57 +08:00
WenhaiLin 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
WenhaiLin a9f27865d3 Fixed the content size of Label is incorrect with GLOW effect. 2015-07-29 16:30:07 +08:00
pandamicro 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
yangxiao 5d677d49bb clamp sin value to -1, 1 2015-07-29 10:35:01 +08:00
pandamicro 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
pandamicro 9fea134de1 Use sendNodeEventToJSExtended instead of sendNodeEventToJS in sub classes 2015-07-28 18:24:03 +08:00
Wenhai Lin c4112e1ce5 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3.8-label-gb2312 2015-07-28 17:02:30 +08:00
WenhaiLin 9edd66d4a7 Label:support font that contains GB2312 char map. 2015-07-28 16:28:32 +08:00
pandamicro 89c722ed4b Add script invocation for onEnter, onExit etc in other classes 2015-07-28 16:07:14 +08:00
pandamicro 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
Damien 7fb4dabcb7 Fixed a compile error when CC_SPRITE_DEBUG_DRAW is on 2015-07-27 14:46:15 -07:00
Vincent Yang 2f996b24ef Fixed #10386 : ui::TextField hitTest not working as expected. 2015-07-27 16:59:35 +08:00
pandamicro 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
WenhaiLin b1bd8338aa Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3.8-label-gb2312 2015-07-24 21:30:28 +08:00
Dale Stammen 8940eb829f added missing cocostudio files 2015-07-24 04:48:14 -07:00
WenhaiLin 37a174ee4a Label:refine the implementation about text layout and support debug draw 2015-07-24 18:38:45 +08:00
geron-cn 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
Vincent Yang e4a8aeee45 Fixed #12962 : Scene can't have std::vector member. 2015-07-24 11:16:45 +08:00
pandamicro 5ffa8efee6 Merge pull request #12977 from chengstory/OptimizationExtensionData
Optimization extension data
2015-07-24 11:01:56 +08:00
zhangcheng be08de6780 Update libcocos2d_8.1 vs project. 2015-07-24 09:32:39 +08:00
Dale Stammen 13149a0bc5 updated version to 3.7.1 2015-07-23 13:26:32 -07:00
Dale Stammen c3935b921c updated version to 3.7.1 2015-07-23 13:02:42 -07:00
Dale Stammen 72427a0a64 updated version to 3.8 2015-07-23 12:46:47 -07:00
Dale Stammen f91e812924 updated version to 3.8 2015-07-23 12:40:36 -07:00
fusijie e9cbb6b084 fix compile on iOS/Android/Linux/Win8Universal. 2015-07-23 17:32:52 +08:00
zhangcheng 4b8248c015 Optimization of Custom Data.
replace ComExtensionData to ObjectExtensionData.
2015-07-23 16:30:23 +08:00
geron-cn 915cefa208 bone node 2015-07-23 11:51:49 +08:00
Vincent Yang 19c8f337da Fixed #12918 : TMXXMLParser.cpp -- In the function getRectForGID have small errors 2015-07-23 11:01:51 +08:00
pandamicro 6029ca3edd Merge pull request #12949 from yangws/issue_12906
Fixed #12906 : Can't add custom member to cocos2d::Scene subclass.
2015-07-22 16:17:14 +08:00
pandamicro 741163db40 Merge pull request #12938 from WenhaiLin/v3.8-deps70
Update deps for support FullType.
2015-07-22 15:42:13 +08:00
pandamicro e0e5ae9d99 Merge pull request #12924 from liamcindy/SkyBox_3.7.1
update for Game3DNodeReader & UserCameraReader
2015-07-22 15:34:18 +08:00
Vincent Yang 3addf38134 Fixed #12906 : Can't add custom member to cocos2d::Scene subclass. 2015-07-22 12:01:34 +08:00
WenhaiLin d0d481fd67 updated version to v3-deps-70 2015-07-21 16:43:47 +08:00
pandamicro 85d4ce0d5a Merge branch 'v3.7-release' of https://github.com/cocos2d/cocos2d-x into v3
Conflicts:
	cocos/scripting/lua-bindings/auto/lua_cocos2dx_ui_auto.hpp
	docs/RELEASE_NOTES.md
	tools/cocos2d-console
	tools/tojs/cocos2dx.ini
2015-07-21 11:39:24 +08:00
andyque c4d8ebc780 add Two APIs to Node.
1. add getNodeToParentTransform(Node* ancestor)

2. add getNodeToParentAffineTransform(Node* ancestor)
2015-07-20 13:49:23 +08:00
WenhaiLin 63326c2826 Label:Fixed opacity setting is invalid with bitmap font. 2015-07-20 11:10:17 +08:00
WenhaiLin 731de26795 Label:Fixed system font may be invisible when there are multiple cameras. 2015-07-17 17:45:11 +08:00
子龙山人 0ea8dca299 Merge pull request #12881 from WenhaiLin/v3.7-label-gb2312
Label:support font that contains GB2312 char map.
2015-07-17 17:33:52 +08:00
fusijie d828c030cb remove CCClippingRectangleNode transform error support. 2015-07-17 11:56:23 +08:00
子龙山人 89e5307f0c Merge pull request #12867 from WenhaiLin/v3.8-label-letter-color
Label:Fixed the color of letter will be overridden by fade action.
2015-07-17 11:29:58 +08:00
子龙山人 0b0b25c517 Merge pull request #12872 from zilongshanren/remove-emscript-code
remove EMSCRIPTEN related code
2015-07-17 10:08:34 +08:00
WenhaiLin f0b29814c3 Label:support font that contains GB2312 char map.[android] 2015-07-16 21:35:10 +08:00
WenhaiLin a6f8031af9 Label:support font that contains GB2312 char map.[except android] 2015-07-16 17:10:05 +08:00
子龙山人 a72ea73e60 Merge pull request #12863 from fusijie/fix_polygonsprite_setColor
fix polygon sprite setColor, setOpacity, setTexture, setTextureRect.
2015-07-16 14:51:06 +08:00
andyque 7c665e6447 remove EMSCRIPTEN related code 2015-07-16 14:15:41 +08:00
pandamicro 490d5a3747 Remove cleanup from auto bindings add made it support override in JS 2015-07-16 14:09:26 +08:00
WenhaiLin d5d5af5ac3 change ‘auto’ to ‘auto&&’ 2015-07-16 14:08:59 +08:00
WenhaiLin 1c9a181c35 Label:Fixed the color of letter will be overridden by fade action. 2015-07-15 20:17:05 +08:00
Jacky e4b392d4c8 fix polygon sprite setColor, setOpacity, setTexture, setTextureRect. 2015-07-15 16:27:29 +08:00
子龙山人 d291afe295 Merge pull request #12856 from fusijie/fix_rendertexture_backtofront
fixed renderTexture switch foreground to background issue.
2015-07-15 14:32:40 +08:00
Jacky a204b02668 fixed renderTexture switch foreground to background issue. 2015-07-15 13:47:10 +08:00
andyque e4cad50c2f fix tons of warnings 2015-07-15 12:04:48 +08:00
子龙山人 49b47f576d Merge pull request #12828 from WenhaiLin/v3-label-readability
Label:improving the code readability.
2015-07-14 16:38:53 +08:00
andyque 91dfb07a8c add more descriptive message to ASSET macro. 2015-07-14 15:28:36 +08:00
WenhaiLin b701fd9e73 Fixed compile error 2015-07-14 13:47:35 +08:00
WenhaiLin 964713355b Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3-label-createfail 2015-07-14 13:43:43 +08:00
WenhaiLin d4f62a8063 Label:improving the code readability. 2015-07-14 11:30:56 +08:00
andyque ef5d4ddf86 Merge remote-tracking branch 'upstream/v3' into v3
# Conflicts:
#	tests/cpp-tests/proj.win8.1-universal/cpp-tests.Shared/cpp-tests.Shared.vcxitems.filters
2015-07-14 11:24:38 +08:00
andyque fc673ee502 Merge branch 'v3.7-release' into v3 2015-07-13 22:44:54 +08:00
子龙山人 cdc7e5205b Merge pull request #11995 from MAUSMAUSgames/v3
using Action::_tag as flag field
2015-07-13 22:19:03 +08:00
子龙山人 c151ba89e5 Merge pull request #12774 from WenhaiLin/v3-label-createfail
Label:Fixed create fail if the font(TTF) not contain a Unicode charmap.
2015-07-13 21:58:39 +08:00
pandamicro 8944e932a1 Merge pull request #12786 from WenhaiLin/v3-animation-getCurrentFrame
Add Animate:getCurrentFrameIndex
2015-07-13 20:48:01 +08:00
pandamicro 36e1f26570 Fix CCSprite ; missing 2015-07-13 16:44:33 +08:00
WenhaiLin 80dff7f1c4 Rollback pr12299 2015-07-13 11:32:25 +08:00
WenhaiLin dee13756ec Add Animate:getCurrentFrameIndex 2015-07-13 10:40:43 +08:00
WenhaiLin 81bc0b09da Label:Fixed create fail if the font(TTF) not contain a Unicode charmap. 2015-07-10 14:39:21 +08:00
pandamicro 07fd337052 Merge pull request #12763 from folgerhu/v3.7-release
CCTMXXMLParser code negligence
2015-07-10 11:49:30 +08:00
Liam e50fc4f184 merge code 2015-07-09 17:12:48 +08:00
folgerhu@sina.com a79586c052 CCTMXXMLParser code negligence 2015-07-09 17:02:12 +08:00
子龙山人 8e256dcd09 Merge pull request #12718 from WenhaiLin/v3-label-addchild
Label:Support add child nodes.
2015-07-09 15:37:49 +08:00
pandamicro cab670f0ff Merge pull request #12748 from fusijie/refineSetTexture
refine setTexture.
2015-07-09 14:56:06 +08:00
WenhaiLin 41bc3a1900 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3.8
Conflicts:
	AUTHORS
2015-07-09 11:11:34 +08:00
Jacky 1dbb2ab17a refine setTexture. 2015-07-09 10:11:15 +08:00
Jacky 02597eb369 Completed test case and comment. 2015-07-08 22:34:33 +08:00
WenhaiLin 6a33702c80 Refine Label::onDraw 2015-07-08 17:59:24 +08:00
Jacky a59828605b Support TileGrid rectangle. 2015-07-08 17:47:04 +08:00
Jacky 4a9e9f3744 completed api. 2015-07-08 17:26:29 +08:00
Jacky 260ce177d7 refine GridNode with rect. 2015-07-08 15:57:27 +08:00
WenhaiLin 8cf27b9174 Update comments. 2015-07-08 15:30:34 +08:00
子龙山人 3f550ef331 Merge pull request #12663 from xiaofeng11/v3.7-release
Fix drawLine & drawPoints won't use blendFunc bug
2015-07-08 14:38:10 +08:00
子龙山人 2bcd70f681 Merge pull request #12726 from xpol/fixes-warnings-and-related-bug-in-CCSprite
Fixes some warnings and a related bug in CCSprite.
2015-07-08 14:12:40 +08:00
Jacky 06c06a1f03 fix polygon sprite bug. 2015-07-08 10:07:35 +08:00
xpol 29dcbe6685 Fixes some warnings and a related bug in CCSprite.
This story tells us that we should not just ignore warnings.
2015-07-07 23:01:24 +08:00
Neo Kim 160bff8e13 Add a setter for line width in DrawNode 2015-07-07 18:48:02 +09:00
WenhaiLin 581f1ab42b Add test case 2015-07-07 15:41:54 +08:00
WenhaiLin 158d96046e Label:Support add child nodes. 2015-07-07 14:20:23 +08:00
子龙山人 f28fbdd0c4 Merge pull request #12683 from neokim/add_scroll_bar_into_scroll_view
Add scroll bar feature into ScrollView
2015-07-07 13:56:09 +08:00
子龙山人 a6b29666c9 Merge pull request #12674 from WenhaiLin/v3-38-issue12673
Label:Fixed the characters are displayed incorrect with "dark roast.ttf"
2015-07-07 09:50:00 +08:00
Neo Kim 86cbd59bfd Add UIScrollViewBar.cpp into CMake and Windows project configuration. 2015-07-04 09:56:53 +09:00
WenhaiLin c11e91e215 Label:Fixed the characters are displayed incorrect with "dark roast.ttf" 2015-07-03 18:08:32 +08:00
Liam 64b8660873 update for skybox reader 2015-07-03 17:52:42 +08:00
Vincent Yang ca02f167c6 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3 2015-07-03 15:43:58 +08:00
Vincent Yang 1abeb8bf1e Fixbug: CCTargetedAction executes callback twice. 2015-07-03 15:42:49 +08:00
XiaoFeng 993e420ce4 Fix drawLine & drawPoints won't use blendFunc bug 2015-07-03 11:30:38 +08:00
pandamicro 1b22438792 Merge branch 'v3.7-release' of https://github.com/cocos2d/cocos2d-x into merge-v3.7
Conflicts:
	cocos/ui/UICheckBox.cpp
2015-07-03 10:23:49 +08:00
pandamicro e7aeb335a3 Merge pull request #12609 from alexpeak/fixCCLabelPurgeResetOrder
Ensure CCLabel atlases are purged before resetting
2015-07-02 19:01:50 +08:00
子龙山人 5b971ee93d Merge pull request #12607 from neokim/add_radio_button_and_group
Add RadioButton and RadioButtonGroup widgets
2015-07-02 17:12:59 +08:00
pandamicro a95edbfb65 Merge pull request #12618 from super626/clippingnode2
Sprite3D Clipping
2015-07-01 18:56:16 +08:00
Vincent Yang cb0e93fc08 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_scene3dtest 2015-07-01 14:58:06 +08:00
WenhaiLin 322bd30d7b Label:Fixed the top of character's texture may be tailored if enable outline effect. 2015-07-01 14:57:01 +08:00
Vincent Yang d26c08de46 Merge branch 'v3_scene3d_fixvisitingcamera' into v3_scene3dtest 2015-07-01 14:47:42 +08:00
pandamicro 2774d6ff1d Merge pull request #12602 from yangws/v3_scene3dtest
Fixed bug: UI component can't click correctly by moving UI and camera far away of origin.
2015-07-01 14:46:35 +08:00
yangxiao 269feeb1f9 remove stencil from Renderstate 2015-07-01 14:06:37 +08:00
Neo Kim a64e50688e Add the new files into CMake and Windows project configurations. 2015-07-01 12:21:42 +09:00
Alex Peak 5328996a18 Fix event listener cleanup in destructor
Event listeners should always be removed at destroy (move out of
if-block)
2015-06-30 18:59:33 -07:00
Alex Peak 7cea464a11 Ensure CCLabel atlases are purged before resetting
The current purge->reset behavior occurs per label according to scene
graph priority.  This has two disadvanages; firstly, any labels that are
initialized but not part of the scene graph will not be reset.
Secondly, any labels which share atlases in the FontAtlasCache may not
be reset since each label will call releaseFontAtlas individually before
resetting its fontConfig.  This means that any shared atlases may not be
released all the way to a reference count of 0 and the invalid atlas
will not be deleted and reset from scratch.

By putting a fixed priority on both the purge and reset steps we can
ensure that firstly: all labels will be reset regardless of whether they
have been added to the scene-graph.  Secondly, ALL labels with the same
atlas must call releaseFontAtlas before any others are allowed to
rebuild their textures.  This will prevent any old atlases from sticking
around after a new GL context is created.

This is a fix for Github issue #8305
https://github.com/cocos2d/cocos2d-x/issues/8305
2015-06-30 13:16:25 -07:00
子龙山人 40521ad1c4 Merge pull request #12600 from fusijie/fix_spritebatchnode_sort_error
Fix SpriteBatchNode sort error.
2015-06-30 17:29:59 +08:00
子龙山人 3b4d134050 Merge pull request #12603 from jianglong0156/autoPolygonFileEncode
change the file encoding,
2015-06-30 16:29:44 +08:00
jianglong0156 bc341edf1f change the file encoding,
It  display a coded warning in current encoding, leading to incredbuild unusable
2015-06-30 15:33:54 +08:00
Vincent Yang 2ba6f266ad Fixed bug: UI component can't click correctly by moving UI and camera far away of origin. 2015-06-30 14:32:14 +08:00
Jacky 25bac2f6a9 Fix SpriteBatchNode sort error. 2015-06-30 14:12:18 +08:00
WenhaiLin 3cb29bbc65 [ci skip]Fixed warns 2015-06-25 10:53:41 +08:00
pandamicro 9445aeacb7 Merge pull request #12456 from super626/camera
quaternion instead of euler angle
2015-06-23 13:16:39 +08:00
WenhaiLin fbe1bd8253 Label should be invisible when the line height is set to zero. 2015-06-23 09:42:48 +08:00
yangxiao d252250968 quaternion instead of euler angle 2015-06-19 18:46:14 +08:00
子龙山人 869e3c5243 Merge pull request #12444 from WenhaiLin/v3-37-label-linewrapfix
Label:Fixed line wrap error without space.
2015-06-19 15:08:13 +08:00
WenhaiLin d32a317ea0 Label:Fixed line wrap error without space. 2015-06-19 13:39:19 +08:00
pandamicro 4d588c7837 Merge pull request #12423 from WenhaiLin/v3-37alpha0-warnfix
Fixed warn
2015-06-18 15:09:36 +08:00
WenhaiLin 05522afaa1 Fixed warn 2015-06-18 14:24:52 +08:00
Huabing.Xu 92824537ac fix compile error for linux 2015-06-18 11:15:45 +08:00
Vincent Yang 187437068f Fixed bug: wrong usage of isVisitableByVisitingCamera, which should only effect draw call. 2015-06-18 10:32:30 +08:00
Vincent Yang f8a5b1e18c Fixed bug: UI component can't click correctly by moving UI and camera far away of origin. 2015-06-18 10:23:52 +08:00
Dale Stammen fd0605416e moved clipper files to external/clipper filter in VS solution 2015-06-17 11:48:56 -07:00
Dale Stammen 9ef92b71dd added missing external/clipper files. Removed obsolete files 2015-06-17 11:40:38 -07:00
pandamicro bb275351f0 Merge pull request #12363 from super626/v3
Fix terrain lod computing bugs
2015-06-17 17:49:39 +08:00
pandamicro 6f6c317f87 Merge pull request #12386 from WenhaiLin/v3-label-spacefix
Label:Fixed wrong letter spacing with outline enabled
2015-06-17 15:16:49 +08:00
Wenhai Lin cbd428f6ac Label:Fixed wrong letter spacing with outline enabled 2015-06-17 13:57:23 +08:00
Jacky 3c5ab4f518 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into fix_spritepolygon2
# Conflicts:
#	cocos/2d/libcocos2d_8_1/libcocos2d_8_1/libcocos2d_8_1.Shared/libcocos2d_8_1.Shared.vcxitems.filters
2015-06-17 13:04:24 +08:00
Jacky 13e0fb22f5 fix compile on linux platform. 2015-06-17 11:34:19 +08:00
songchengjiang c08a355a06 fix the bug of light
replace atanf with atan2f
2015-06-17 11:17:46 +08:00
Dale Stammen eb2bc78970 Merge branch 'v3' into v3-winrt-librecast 2015-06-16 07:13:53 -07:00
WuHao 3b56d2a66f fix cmake for cmake platforms 2015-06-16 16:15:19 +08:00
pandamicro 0866180918 Merge pull request #12162 from namezero111111/patch-4
JumpTo::clone() results in incorrect end position
2015-06-16 13:37:04 +08:00
WuHao aeeed0f4ab Merge remote-tracking branch 'origin' into fix_spritepolygon
# Conflicts:
#	external/config.json
2015-06-16 11:19:20 +08:00
Dale Stammen 8d8e7d6cb9 Merge branch 'v3' into v3-winrt-librecast 2015-06-15 19:27:40 -07:00
子龙山人 0b5c7d74b7 Merge pull request #12160 from namezero111111/patch-3
Blink::stop() access violation
2015-06-16 10:27:38 +08:00
Dale Stammen 0781978788 added librecast. Updated build properties 2015-06-15 18:44:14 -07:00
Dale Stammen 03fc2eca5e added missing navmesh files 2015-06-15 18:19:28 -07:00
Dale Stammen 9262cc95bf fixed project filters broken by recent additions of files 2015-06-15 11:38:52 -07:00
Ricardo Quesada c17da7e90d Removes not-needed draws 2015-06-15 10:40:47 -07:00
WuHao 27d0f51e9b Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into fix_spritepolygon
Conflicts:
	build/cocos2d_libs.xcodeproj/project.pbxproj
	build/cocos2d_tests.xcodeproj/project.pbxproj
	cocos/2d/libcocos2d.vcxproj.filters
	tools/cocos2d-console
	web
2015-06-15 16:13:36 +08:00
pandamicro 0216d05eee Merge pull request #12102 from super626/navigation2
3D Navigation
2015-06-15 13:39:05 +08:00
yangxiao 16a0ddc74e rename CCNavMeshTool to CCNavMeshUtils 2015-06-15 12:52:55 +08:00
Ricardo Quesada 32aae46343 fixes 2015-06-12 15:37:29 -07:00
Ricardo Quesada 2a3347dd49 RenderState: default state fixes
parts of cocos2d code calls GL directly.
This should be avoided since v3.7 since the
`RenderState::StateBlock::_defaultState` won't know that
and the state will be invalid.
In order to fix this issue, after calling GL directly, you should
update the `_defaultState` manually.
2015-06-12 15:03:48 -07:00
pandamicro 9806c09b0e Merge pull request #12299 from WenhaiLin/v3-label-cropped
Label:the texture of character have not cropped if character cross the axis-aligned bounding-box.
2015-06-12 21:33:09 +08:00
pandamicro f9057b3f32 Merge pull request #12284 from pandamicro/v3
Fix template android compilation issue on physics3d
2015-06-12 21:10:40 +08:00
子龙山人 c01d1fe00a Merge pull request #12310 from WenhaiLin/v3-particlefile-key
Fixed ParticleSystem may using wrong texture if the particle PLIST file created via ParticleDesigner.
2015-06-12 16:44:12 +08:00
Jacky 29c108bdef Merge remote-tracking branch 'origin' into fix_spritepolygon2
# Conflicts:
#	cocos/2d/libcocos2d_8_1/libcocos2d_8_1/libcocos2d_8_1.Shared/libcocos2d_8_1.Shared.vcxitems.filters
2015-06-12 16:28:41 +08:00
WenhaiLin 9f5a36b817 Fixed ParticleSystem may using wrong texture if the particle PLIST file created via ParticleDesigner. 2015-06-12 11:03:32 +08:00
pandamicro b1b9c808eb Merge pull request #12074 from samuele3hu/v3_material
Issue #10570: Make getItemForTouch of Menu virtual.
2015-06-12 08:21:18 +08:00
WenhaiLin 5aa31ea83a Label:the texture of character have not cropped if character cross the axis-aligned bounding-box. 2015-06-11 17:16:44 +08:00
yangxiao 44c2b0d5ad merge cocos 2015-06-11 15:54:42 +08:00
samuele3hu 17b1dee363 Merge branch 'fix_spritepolygon2' of https://github.com/Wu-Hao/cocos2d-x into v3_update_spritepolygon 2015-06-11 14:39:35 +08:00
samuele3hu 1b20e463d8 Update the Lua binding about the Polygon and update the test case. 2015-06-11 14:38:38 +08:00
Vincent Yang 097bf455c2 Rename CCRenderBufferObject to CCRenderBuffer in windows projects. 2015-06-11 11:45:10 +08:00
Jacky a32fec8471 change clipper version to 6.1.3. 2015-06-11 10:45:37 +08:00
pandamicro 70606caa14 Fix template android compilation issue on physics3d 2015-06-10 19:37:52 +08:00
Jacky 4b5bcc06a1 remove draw points and add expand precision. 2015-06-10 18:54:53 +08:00
Jacky b41c60dbdb Merge remote-tracking branch 'origin/v3' into fix_spritepolygon2
# Conflicts:
#	external/config.json
2015-06-10 10:23:43 +08:00
Huabing.Xu 10352c40b2 Merge branch 'v3' into v3FrameBufferObject
# Conflicts:
#	cocos/2d/CCCamera.h
2015-06-10 10:16:42 +08:00
Jacky 88b3fc3c7e fix memory leakage about operation= 2015-06-09 18:45:55 +08:00
Huabing.Xu b79eec0b20 fix grid bug for viewport 2015-06-09 17:24:30 +08:00
Huabing.Xu ef4978f0cd move viewport to experimental namespace 2015-06-09 16:21:50 +08:00
Jacky d8369dda94 fix on the wp8 universal. 2015-06-09 16:00:51 +08:00
Huabing.Xu 3e331128c6 file rename CCFrameBufferObject->CCFrameBuffer 2015-06-09 15:32:12 +08:00
yangxiao e433ad305b decopule physics and navmesh from Director 2015-06-09 13:49:07 +08:00
Jacky 74aed5ae85 fix on the android. 2015-06-09 13:47:29 +08:00
Jacky 562d4b9a78 fix on the windows. 2015-06-09 11:23:37 +08:00
Huabing.Xu 9acab65e4f rename FrameBufferObject->FrameBuffer
Move FrameBufferObject related class to experimental namespace
2015-06-09 10:59:43 +08:00
Dale Stammen a2b677d300 Merge branch 'v3' into v3-winrt-ogg 2015-06-08 08:22:46 -07:00
子龙山人 54e23f15e6 Merge pull request #12179 from WenhaiLin/v3-37-physics-ap
Node:Fixed the anchor point can only be Vec2::ANCHOR_MIDDLE after setting physics body.
2015-06-08 16:12:56 +08:00
WuHao a67e570ef7 deleted more leftover comments, placed polygon test further down the tests 2015-06-08 15:40:18 +08:00
WuHao e175815c70 deleted some leftover comments in sprite 2015-06-08 15:17:46 +08:00
WuHao 2650de030c modified tests to show current epsilon 2015-06-08 15:08:16 +08:00
子龙山人 03892caed5 Merge pull request #12206 from super626/fixphysics3d2
3D Physics: remove addChildToPhysics
2015-06-08 14:13:38 +08:00
WuHao a555b2fb52 added documentation for auto polygon 2015-06-08 13:59:44 +08:00
WuHao 0808b6aff9 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into fix_spritepolygon
Conflicts:
	cocos/2d/MarchingSquare.cpp
2015-06-08 13:59:26 +08:00
Jacky 3e62dd0473 remove unused file and code. 2015-06-06 13:31:25 +08:00
Dale Stammen 47b5085ade Merge branch 'v3' into v3-winrt-ogg 2015-06-05 05:36:15 -07:00
子龙山人 c5c96042ef Merge pull request #12181 from namezero111111/patch-5
TintBy::clone() incorrect cast
2015-06-05 15:27:43 +08:00
yangxiao d50c1823d4 merge cocos 2015-06-05 14:25:37 +08:00
yangxiao 761944f507 remove addChildToPhysicsWorld for 3d object 2015-06-05 13:54:09 +08:00
Dale Stammen 3f3ace05a7 added ogg support for Windows 10 UWP 2015-06-04 14:42:11 -07:00
Jacky afa422d898 fixed copy constructor and operation = bug. 2015-06-04 18:27:58 +08:00
WuHao 5b572ab803 Polyinfo is no longer a pointer 2015-06-04 16:20:00 +08:00
Namezero 19f95c5542 TintBy::clone() incorrect cast
TintBy::clone() incorrectly casts the GLshort members to GLubyte, resulting in an object that isn't a clone and an incorrect tint.
2015-06-04 10:13:34 +02:00
pandamicro 2c168130ed Fix jsbinding calls for CCComponent 2015-06-04 15:59:05 +08:00
pandamicro 86d372222c Merge branch 'v2_addOnEnterAndOnExitToCCNode' of https://github.com/chengstory/cocos2d-x into compJSB 2015-06-04 15:54:58 +08:00
WuHao 0a51c9bd27 Finished AutoPolygon and Sprite 2015-06-04 15:43:31 +08:00
WenhaiLin bd718bb85f Node:Fixed the anchor point can only be Vec2::ANCHOR_MIDDLE after setting physics body. 2015-06-04 14:57:37 +08:00
zhangcheng 6a53cfdc76 1, modify space format. 2015-06-04 14:08:47 +08:00
zhangcheng 8d3d3a0348 1, Add onAdd and onRemove function to replace onEnter and onCancel used in onAdd and onRemove of ComponentContainer. 2015-06-04 14:06:31 +08:00
yangxiao ded5c36271 Merge branch 'navigation2' of https://github.com/super626/cocos2d-x into navigation2 2015-06-04 12:46:12 +08:00
yangxiao 8b5333a5c9 Merge branch 'newcode' into navigation2 2015-06-04 12:44:39 +08:00
anniruddh.koppal 84fad34daf Added ogg support to audio engine. Fixed issues #150 and #151 2015-06-03 20:57:14 -07:00
子龙山人 831ca47b13 Merge pull request #12158 from WenhaiLin/v3-letter-space
Label:Fixed letter spacing may be wrong.
2015-06-04 10:51:25 +08:00
zhangcheng 55995ece1a Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v2_addOnEnterAndOnExitToCCNode 2015-06-04 10:38:39 +08:00
zhukaixy f891a0b124 configure navi for winodow phone 2015-06-04 10:00:15 +08:00
子龙山人 95934bf310 Merge pull request #12168 from MSOpenTech/v3-winrt-js-fix
V3: Fixes for Windows 8.1 Universal App JavaScript
2015-06-04 09:22:21 +08:00
Dale Stammen 18ce48dc2a /NODEFAULTLIB:MSVCRT to fix linker warning 2015-06-03 09:26:15 -07:00
Namezero c09e280b58 JumpTo::clone() results in incorrect end position
JumpTo::clone() passes incorrect value to (_delta) to create() rather than _endPosition
2015-06-03 13:14:11 +02:00
Namezero 89915a084c Blink::stop() access violation
Blink::stop() is calles twice when inside a Repeat action. This results in an access violation
2015-06-03 12:39:16 +02:00
WenhaiLin ffa7dc6b5a Label:Fixed letter spacing may be wrong. 2015-06-03 16:28:44 +08:00
zhangcheng a51a32fa9d 1, add onEnter and onExit of components to CCNode's onEnter and onExit function. 2015-06-03 15:10:48 +08:00
zhukaixy 76ad42bb0b configure recast project for win8.1 project 2015-06-03 14:31:12 +08:00
Ricardo Quesada 5f6f38616a Merge remote-tracking branch 'cocos2d/v3' into material_custom_uniforms 2015-06-02 17:05:05 -07:00
Ricardo Quesada 87a3a1844a Adds support for Autobindings in Shader
...part of Material
2015-06-02 16:56:59 -07:00
yangxiao 3d4606921b merge cocos 2015-06-02 14:27:31 +08:00
WuHao 3c5326ba1f removed spritePolygon, merge into sprite and draft of AutoPolygon 2015-06-02 10:10:09 +08:00
Huabing.Xu 27d0f6328f origin code of viewport 2015-06-01 14:26:08 +08:00
Huabing.Xu 739923a4a3 Merge branch 'v3' into v3Viewport 2015-06-01 09:41:45 +08:00
Dale Stammen e0c65c203a Merge branch 'v3' into v3-uwp 2015-05-29 08:09:05 -07:00
WuHao 3d62805d04 Merge branch 'v3' into fix_spritepolygon
# Conflicts:
#	build/cocos2d_libs.xcodeproj/project.pbxproj
#	cocos/2d/MarchingSquare.cpp
2015-05-29 18:10:41 +08:00
yangxiao c782d63bef add 3d navigation 2015-05-29 16:45:33 +08:00
Jacky e69a6116fa make SpritePolygonInfo extend from Ref. 2015-05-29 16:44:06 +08:00
Huabing.Xu 9bf15877e5 add applyViewport in camera. 2015-05-29 15:52:06 +08:00
Jacky 8df4920f6e fixed file name. 2015-05-29 15:03:36 +08:00
Huabing.Xu 2f32fcabba Merge branch 'v3FrameBufferObject' into v3Viewport 2015-05-29 14:10:49 +08:00
Huabing.Xu b2579a754a refactor, use Camera::apply() to apply Rendertarget and Viewport 2015-05-29 14:08:20 +08:00
Huabing.Xu 1fb0ba112b init code for viewport 2015-05-29 13:47:29 +08:00
Vincent Yang b714dde0ea Add opengl version project/unproject function in camera. 2015-05-29 10:44:48 +08:00
Huabing.Xu 22ddf53539 Merge branch 'v3FrameBufferObject' into v3 2015-05-29 10:38:42 +08:00
Dale Stammen 8584f5f399 removed old WP8 files 2015-05-28 15:03:36 -07:00
Dale Stammen 2a71407501 fixed double to float conversion compiler warning 2015-05-28 15:00:49 -07:00
Dale Stammen dadbbc18d6 added Windows 10 UWP project files 2015-05-28 13:51:25 -07:00
Dale Stammen 962393233f removed old winrt property sheets 2015-05-28 13:12:37 -07:00
子龙山人 a76018041e Merge pull request #12077 from WenhaiLin/v3-label-mlinefix
Text:Fixed the scale factor may be incorrect with multiline text.
2015-05-28 17:20:33 +08:00
Huabing.Xu 2d6d1b7a8c add android background and foreground switch support for framebufferobject 2015-05-28 17:08:36 +08:00
MAUSMAUSgames 847cba026c added _flags to Action, change API to stopActionsByFlags 2015-05-28 09:52:49 +02:00
WenhaiLin c60112a634 Text:Fixed the scale factor may be incorrect with multiline text. 2015-05-28 11:56:43 +08:00
samuele3hu 9a4a545025 Issue #10570: Make getItemForTouch of Menu virtual. 2015-05-28 11:41:49 +08:00
子龙山人 b8fdb152fd Merge pull request #12026 from andyque/fix-android-9-patch-asset-issue
fix assert failure of NinePatchImageParser and rapidjson
2015-05-27 11:17:31 +08:00
Dale Stammen 06a5f7ed7a moved CCNinePath files to base folder in solution 2015-05-26 09:48:25 -07:00
Dale Stammen d146f26144 define RAPIDJSON_ENDIAN=RAPIDJSON_LITTLEENDIAN to fix broken ARM builds 2015-05-26 09:46:15 -07:00
Vincent Yang d7ad7221e4 ciskip add doc for camera::getnear/farplane(). 2015-05-26 18:14:37 +08:00
andyque c668001e73 fix assert failure of NinePatchImageParser and rapidjson 2015-05-26 17:20:10 +08:00
Vincent Yang 246913c092 Fix bug: skybox can't move to other position except origin point in world space. 2015-05-26 17:14:26 +08:00
Huabing.Xu 83bae15caf Merge branch 'v3FrameBufferObject' of github.com:dabingnn/cocos2d-x into v3FrameBufferObject
# Conflicts:
#	cocos/2d/libcocos2d.vcxproj.filters
#	cocos/2d/libcocos2d_8_1/libcocos2d_8_1/libcocos2d_8_1.Shared/libcocos2d_8_1.Shared.vcxitems.filters
2015-05-26 12:06:05 +08:00
Huabing.Xu c22a8e81ce Merge branch 'v3' into v3FrameBufferObject 2015-05-25 16:56:22 +08:00
minggo bcc1bf8d32 Merge pull request #11983 from dabingnn/v3_SpriteWithTrianglesCommand
use trianglescommand for sprite
2015-05-25 16:48:22 +08:00
MAUSMAUSgames 98c3ba6f4b using Action::_tag as flag field
adding options to use tag as flag field to Node::stopAllActionsByTag
and ActionManager::removeAllActionsByTag
2015-05-24 17:30:26 +02:00
minggo 311f453ea0 Merge pull request #11973 from dabingnn/v3_fixCameraVisitError
Fix visiting scene error with multiple camera
2015-05-22 17:16:30 +08:00
Huabing.Xu 6d9f850e2c use trianglescommand for sprite 2015-05-22 15:54:56 +08:00
minggo 27b7f2dd19 Merge pull request #11969 from WenhaiLin/v3-TMXTiledMap-crash
TileMap:Fixed crash if referring a non-existent layer in TMX.
2015-05-22 14:37:23 +08:00
Huabing.Xu 0644efc55e isVisitableByVisitingCamera should not affect the calculation of transform 2015-05-22 13:59:45 +08:00