Commit Graph

1258 Commits

Author SHA1 Message Date
XiaoFeng f410fcd737 Fix issue https://github.com/cocos2d/cocos2d-x/issues/12968 2015-07-27 11:55:18 +08:00
geron-cn a5d41aac0d fix bug:use wrong _modelviewTransform in director to draw bone 2015-07-24 19:48:05 +08:00
geron-cn 4327e4a532 remove include SkinNode.h in cpp 2015-07-24 12:31: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
geron-cn 3341fa0f85 fix the vars' initialize in construct func, and remove using namespace 2015-07-24 10:28:10 +08:00
geron-cn 1389fc3d31 some doxygen comments and copyright 2015-07-24 01:30:34 +08:00
pandamicro a15212dc76 Fix indent 2015-07-23 18:00:23 +08:00
gero 2037616a2d Merge pull request #4 from fusijie/3.7.1
fix compile on iOS/Android/Linux/Win8Universal.
2015-07-23 17:46:28 +08:00
geron-cn 4d58aa2668 remove setcontentsize in skeletonnode 2015-07-23 17:41:37 +08: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 7255b5308b config for mac 2015-07-23 15:13:14 +08:00
geron-cn 16ee74b845 add bonenode to CocoStudio.h 2015-07-23 13:34:11 +08:00
geron-cn 915cefa208 bone node 2015-07-23 11:51:49 +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
Liam d8155a20ae update for code format 2015-07-22 14:11:20 +08:00
Ricardo Quesada 301b55c686 Adds support for Spine runtime 2.3 2015-07-20 10:39:34 -07:00
andyque e4cad50c2f fix tons of warnings 2015-07-15 12:04:48 +08:00
andyque 91dfb07a8c add more descriptive message to ASSET macro. 2015-07-14 15:28:36 +08:00
andyque fc673ee502 Merge branch 'v3.7-release' into v3 2015-07-13 22:44:54 +08:00
Liam c61e09a9e7 update for reader 2015-07-13 10:29:22 +08:00
XiaoFeng 92d78efce0 Fix percentage setting won't effect when UISlider's background resource set to null 2015-07-10 17:00:16 +08:00
Liam e50fc4f184 merge code 2015-07-09 17:12:48 +08:00
pandamicro 893d39c543 Merge pull request #12737 from chengstory/FixReaderBug
Fix cocos reader bug.
2015-07-09 10:33:45 +08:00
Liam c6ebaa19ec add scene 3d test 2015-07-09 10:19:07 +08:00
zhangcheng 0862d313b2 Fix cocos reader bug.
Fixes child nodes can't be rendered when particle and TiledMap as parent and their resource have been removed from disk.
2015-07-08 16:13:38 +08:00
xpol 8179fe04f0 And more warnings. 2015-07-07 23:10:04 +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
XiaoFeng 9a6ffd8904 Add bug test for PageView layout & CCNodeDraw::onDrawGLLine 2015-07-07 09:54:42 +08:00
Ricardo Quesada 4c88be9520 removes -fno-excpetion and -fexception from cmake 2015-07-06 12:09:50 -07:00
Liam 51993d5733 update for reader 2015-07-06 16:14:41 +08:00
Liam fff4e2f34c update for reader 2015-07-06 14:05:06 +08:00
Liam 64b8660873 update for skybox reader 2015-07-03 17:52:42 +08:00
Vincent Yang d26c08de46 Merge branch 'v3_scene3d_fixvisitingcamera' into v3_scene3dtest 2015-07-01 14:47:42 +08:00
andyque 0c1ee8b26a fix studio json reader percentage mode bug 2015-06-25 16:14:22 +08:00
pandamicro ac138a3287 Merge pull request #12474 from xiaofeng11/v3_xiaofeng
Update 3d reader for compatible with cocosstudio 3.1.2 version csd file
2015-06-23 16:27:32 +08:00
andyque 70b709f4a8 fix rapidjson assert error 2015-06-23 13:54:11 +08:00
XiaoFeng 375e80bd70 Update 3d reader for compatible with cocosstudio 3.1.2 version csd file
Update easing default speed
2015-06-23 11:31:16 +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
zhangcheng 1c983f1f39 GBKToUTF8 2015-06-17 13:16:06 +08:00
Dale Stammen 0781978788 added librecast. Updated build properties 2015-06-15 18:44:14 -07:00
pandamicro c9c05ff982 Merge pull request #12314 from xiaofeng11/v3_xiaofeng
Fix when button reader bug
2015-06-15 13:13:39 +08:00
pandamicro 707e9d4d7b Merge pull request #12205 from ffskyfan/v3
Update extension.h, amend a really  dangerous macros that may cause memory allocation error
2015-06-14 20:09:57 +08:00
XiaoFeng 8d19ea7320 Fix when button set to disabled mode and won't have a disable texture will cause simulator won't show button in disabled gray mode 2015-06-12 15:47:34 +08:00
pandamicro 8e3e928efd Merge pull request #12040 from geron-cn/v3
fix bug:  fix actiontimeline can not step to last frame when loop play
2015-06-11 14:36:08 +08:00
XiaoFeng 20a6151f4c Fix indent 2015-06-09 17:40:42 +08:00
XiaoFeng f6083f3490 Fix issue 10258 & 10408 2015-06-09 14:38:48 +08:00
ffskyfan b8a022238f Update extension.h
#define MALLOC(TYPE,COUNT) ((TYPE*)_malloc(sizeof(TYPE) * COUNT, __FILE__, __LINE__))

It is a really dangerous macros here.
If use it like this "MALLOC(Type, n+2)", it will alloc sizeof(TYPE) * COUNT + 2 byte memory.but I want it alloc sizeof(TYPE) * (COUNT + 2) byte. It is a typical macro unwind error.
2015-06-05 12:14:27 +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
Dale Stammen dadbbc18d6 added Windows 10 UWP project files 2015-05-28 13:51:25 -07:00
Dale Stammen 9ee4b4af1e Merge branch 'v3' into v3-winrt-audio 2015-05-27 11:54:21 -07:00
anniruddh.koppal 4501a53cfa Added MP3 support to simple audio engine 2015-05-27 10:57:26 -07:00
子龙山人 e044b1ab11 Merge pull request #11785 from geron-cn/fixbug
fix crash when run TestTimelineFrameEvent in cpp-test
2015-05-27 16:28:13 +08:00
geron-cn c19adbdc3c fix bug: fix actiontimeline can not step to last frame when loop play 2015-05-27 10:24:50 +08:00
andyque c668001e73 fix assert failure of NinePatchImageParser and rapidjson 2015-05-26 17:20:10 +08:00
andyque 81d562803b upgrade rapidjson to 1.0.2 2015-05-25 11:43:03 +08:00
XiaoFeng e94bcbd28c Remove missing resource label from all UI widget 2015-05-22 18:21:59 +08:00
Dale Stammen 46a69cf00b ignore warning 4996 2015-05-20 07:59:17 -07:00
XiaoFeng be20666b65 Fix ArmatureAnimation crash 2015-05-18 12:08:26 +08:00
minggo 56d21b6040 Merge pull request #11680 from kaplad/vk_fix_logical_bug
Fix a logical bug that may make wrong behavior
2015-05-13 09:41:20 +08:00
WenhaiLin c70bac7bb4 Add support for visual studio 2015. 2015-05-12 16:26:28 +08:00
geron-cn 3e0b0a0feb fix crash when run TestTimelineFrameEvent in cpp-test 2015-05-11 23:04:26 +08:00
Vladislav Kaplun f67b4761da Fix a logical bug that may wrong behavior 2015-05-11 15:15:00 +03:00
Dale Stammen 351a898a70 removed CC_PLATFORM_WP8 2015-05-08 09:19:13 -07:00
samuele3hu 23e4e0d4e3 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_7_remove_vs2012 2015-05-07 16:21:03 +08:00
samuele3hu 243da71082 Update the project configure of js-tests and js-template on the win32 platform 2015-05-07 11:38:43 +08:00
samuele3hu b2c361f1a1 Fix the compile error for libSpine on the win32 platform 2015-05-06 23:30:08 +08:00
Ricardo Quesada 10b71464a7 No throws in cocos2d-x code 2015-05-05 17:17:41 -07:00
samuele3hu f1b5729183 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_7_remove_vs2012 2015-05-05 16:14:57 +08:00
samuele3hu 037c17fe5d Remove vs2012 support in v3 2015-05-05 16:11:26 +08:00
Vladimir Timofeev 912956a3b3 Correct field initialization order in spine (Xcode warnings). 2015-05-01 12:20:11 +03:00
Vladimir Timofeev 2d8c687d6e Fix the Frame class:
* Field initialization order (warning in Xcode)
* Make conditions with && and || more readable for programmers (warning in Xcode)
2015-05-01 11:51:20 +03:00
XiaoFeng 9d0741544c Fix a logical bug that may cause null pointer been used 2015-04-29 15:58:44 +08:00
XiaoFeng 49b465f0f4 Fix wrong shadow & outline color bug for text component 2015-04-29 10:46:23 +08:00
XiaoFeng 27e3dce628 Fix simulator crash when miss some armature resource 2015-04-28 11:54:36 +08:00
XiaoFeng 28264c0742 Fix simulator crash when add animation under a user defined lua extension 2015-04-27 17:42:20 +08:00
minggo 1f5e5b5058 Merge pull request #11536 from xiaofeng11/v3
Update Node3DReader compatibility
2015-04-22 10:25:49 +08:00
pipu fcd48ce2c3 Reset method purge() definition. 2015-04-21 18:16:38 +08:00
pipu 04cde1c52c Modify that serialize base attribute for Node3DReader. 2015-04-21 18:05:46 +08:00
Vladimir Perminov 6ef1e7e3d0 Optimize Vec3 use constructor default.
Make Vec3 vec3(Vec3::ZERO); to Vec3 vec3;
2015-04-20 12:56:43 +03:00
minggo 15fe283c2e Merge pull request #11515 from xiaofeng11/v3
update compatibility for upgraded node3d come with 2.2.5 version
2015-04-20 17:05:32 +08:00
pipu 388e4b3a93 Modify that parse position for Node3DReader. 2015-04-20 15:56:36 +08:00
minggo 8f88afa123 Merge pull request #11510 from xiaofeng11/v3
Bug fix
2015-04-20 15:50:44 +08:00
pipu 4b320a1677 Modify that parse text shadow and outline. 2015-04-20 11:39:43 +08:00
Vladimir Perminov 4c33050536 Optimize Vec2
small function Vec2 move to Vec2.inl
Added:
setZero();

Change all code:
_vec2 = Vec2(x, y); -> _vec2.set(x, y);
Vec2 vec2 = Vec2(x, y); -> Vec2 vec2(x, y);
_vec2 += Vec2(x, y); -> _vec2.add(x, y);
_vec2 = Vec2::ZERO; -> _vec2.setZero();
Vec2 vec2(Vec2::ZERO); -> Vec2 vec2;
2015-04-19 20:40:52 +03:00
minggo 0e7c096201 Merge pull request #11455 from xiaofeng11/v3
Fix won't load child bug
2015-04-16 14:37:22 +08:00
minggo 97f150a89f Merge pull request #11452 from MSOpenTech/v3-remove-wp8
V3 remove WP8 project files
2015-04-16 14:32:11 +08:00
pipu d1dcf3f620 Modify that serialize attribute "Children". 2015-04-16 13:58:01 +08:00
minggo 2b82c0c837 Merge pull request #11442 from xiaofeng11/v3
Fix action timeline bug
2015-04-16 09:34:45 +08:00
Dale Stammen b700798287 removed WP8 project files 2015-04-15 07:13:54 -07:00
xiaofeng11 a8fcaf4f4f Merge pull request #17 from geron-cn/xiaov3
fix actiontimeline step over frame when (noloop play && timespeed>1)
2015-04-15 13:41:49 +08:00
geron-cn 7b376fd384 fix action timeline step over frame when no (loop play && timespeed>1) 2015-04-15 13:32:04 +08:00
minggo c62b34ac01 update spine runtime to v2.1.25 2015-04-14 15:23:16 +08:00
pipu 755134ba3f Update parse animation easing 2015-04-10 17:05:55 +08:00
xiaofeng11 5ec9b14a33 Merge pull request #13 from geron-cn/xiaov3
fix
2015-04-10 14:27:09 +08:00
geron-cn b8083f2c99 fix 2015-04-10 14:24:48 +08:00
xiaofeng11 dda662a7c1 Merge pull request #12 from geron-cn/xiaov3
add blendfunc frame
2015-04-10 14:04:35 +08:00
geron-cn d238f9905e add blendfunc frame 2015-04-10 13:34:39 +08:00
xiaofeng11 ee98b40af9 Merge pull request #11 from geron-cn/xiaov3
add tween easing to ccframe
2015-04-10 10:46:58 +08:00
geron-cn c206725be5 fix color 2015-04-09 19:13:14 +08:00