geron-cn
|
fa5d70fc04
|
add SkeletonNode Nest test case
|
2015-07-28 23:49:25 +08:00 |
geron-cn
|
d2de5b1c85
|
add test case for bug: #13060 and #13005
|
2015-07-28 19:18:58 +08:00 |
pandamicro
|
9fea134de1
|
Use sendNodeEventToJSExtended instead of sendNodeEventToJS in sub classes
|
2015-07-28 18:24:03 +08:00 |
XiaoFeng
|
faee3e7807
|
Fix parser compatible for layer project file
|
2015-07-28 18:11:07 +08:00 |
geron-cn
|
0275e3b773
|
fix set visible
|
2015-07-28 17:25:40 +08:00 |
geron-cn
|
c9991aea81
|
fix bug: BoneNode 's debugdraw can not be controlled by ancestor's visible
|
2015-07-28 16:31:06 +08:00 |
pandamicro
|
89c722ed4b
|
Add script invocation for onEnter, onExit etc in other classes
|
2015-07-28 16:07:14 +08:00 |
XiaoFeng
|
bca6934786
|
Normalization function names
|
2015-07-28 14:05:56 +08:00 |
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 |
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 |
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 |
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
|
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 |
XiaoFeng
|
be20666b65
|
Fix ArmatureAnimation crash
|
2015-05-18 12:08:26 +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 |
Ricardo Quesada
|
10b71464a7
|
No throws in cocos2d-x code
|
2015-05-05 17:17:41 -07: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 |
pipu
|
d1dcf3f620
|
Modify that serialize attribute "Children".
|
2015-04-16 13:58:01 +08: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 |
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 |
geron-cn
|
56bb0a68bb
|
add tween easing to carfare
|
2015-04-09 18:10:37 +08:00 |
pipu
|
e86071e77e
|
Rest CCFrame.
|
2015-04-09 17:21:52 +08:00 |
pipu
|
80ad7bbee8
|
Animation easing.
|
2015-04-09 16:55:15 +08:00 |
minggo
|
8a1aa78f7d
|
Merge pull request #11336 from xiaofeng11/v3
Update reader
|
2015-04-08 18:40:32 +08:00 |
pipu
|
ca74486f60
|
Update CSParseBinary_generated
|
2015-04-08 16:54:58 +08:00 |
minggo
|
e9cdf333f9
|
Merge pull request #11246 from xiaofeng11/v3
V3 reader fix
|
2015-04-08 11:46:40 +08:00 |
Vladimir Perminov
|
105bac2d55
|
Optimize Vec3
small function Vec3 move to Vec3.inl
Added:
add(float xx, float yy, float zz);
setZero();
Change all code:
_vec3 = Vec3(x, y, z); -> _vec3.set(x, y, z);
Vec3 vec3 = Vec3(x, y, z); -> Vec3 vec3(x, y, z);
_vec3 += Vec3(x, y, z); -> _vec3.add(x, y, z);
_vec3 = Vec3::ZERO; -> _vec3.setZero();
|
2015-04-05 13:09:50 +03:00 |
pipu
|
340e26d81a
|
Supplement invoke destroyInstance() of some Reader in destroyCocosStudio().
|
2015-04-01 14:08:09 +08:00 |
pipu
|
41661830ff
|
Remove CCNodeReader.h/.cpp.
|
2015-04-01 13:37:36 +08:00 |
pipu
|
bc7d8f0a09
|
Add method destroyCocosStudio() for CocoStudio
|
2015-03-31 19:55:56 +08:00 |
pipu
|
bb110449be
|
Reset method purge() definition for some Reader.
|
2015-03-31 14:56:24 +08:00 |
pipu
|
91acd6aea9
|
Set macro CC_DEPRECATED_ATTRIBUTE for method purge() for all Reader.
|
2015-03-31 14:21:10 +08:00 |
pipu
|
a0a461f319
|
Supplement some Reader.
|
2015-03-31 11:22:34 +08:00 |
pipu
|
6f20da4444
|
Add destroyCocosStudio()
|
2015-03-30 16:46:33 +08:00 |
minggo
|
326233ab02
|
Merge pull request #11105 from pipu/TextAtlas_parse_avoid_crash
Avoid crash during parse TextAtlas.
|
2015-03-25 13:36:28 +08:00 |
zhangcheng
|
e2e0ed0595
|
Avoid timeline crash when custom widget is placed in scene.
|
2015-03-24 19:59:27 +08:00 |
minggo
|
e50a71609f
|
Merge pull request #11071 from pipu/reconstruct_ColorFrame
Reconstruct ColorFrame.
|
2015-03-24 16:29:55 +08:00 |
pipu
|
90da9dbee5
|
Avoid crash during parse TextAtlas.
|
2015-03-24 15:59:21 +08:00 |
Zhe Wang
|
8e2e1e5723
|
Add comments of async load, to avoid confusions of developers.
|
2015-03-23 20:58:16 +08:00 |
pipu
|
787225ce21
|
Make _alpha of ColorFrame become deprecated attribute.
|
2015-03-23 15:45:32 +08:00 |
pipu
|
c068e60aa6
|
Reconstruct ColorFrame.
|
2015-03-23 13:37:24 +08:00 |
pipu
|
8791e36d3f
|
Create flat buffer format data for "InnerActionSpeed".
|
2015-03-20 11:10:22 +08:00 |
minggo
|
78ff70a8f6
|
Merge pull request #10972 from pipu/fix_armaturenode_load
Avoid crash during parse armature node.
|
2015-03-19 22:10:34 +08:00 |
pipu
|
e9b6ca724d
|
Serialize attribute "InnerActionSpeed" during creating project node from .csd file for cocosstudio simulator.
|
2015-03-19 17:54:26 +08:00 |
minggo
|
194510dacc
|
Merge pull request #10969 from pipu/parse_csd_position
Fix that parse position from .csd file.
|
2015-03-19 11:53:31 +08:00 |
pipu
|
c1f147b7a1
|
Avoid crash during parse armature node.
|
2015-03-19 11:51:34 +08:00 |
pipu
|
46741e1035
|
Fix that parse position from .csd file.
|
2015-03-19 11:22:11 +08:00 |
pipu
|
e7c89dadf1
|
Manage reference count of ActiontimelineData object in ObjectExtensionData.
|
2015-03-18 16:56:16 +08:00 |
pipu
|
faf9d6b01c
|
Avoid crash during parse .csd file.
|
2015-03-18 10:28:12 +08:00 |
minggo
|
aa573a9553
|
Merge pull request #10904 from pipu/fixed_widget_reader_actiontag
Optimize parse action tag for node and widget.
|
2015-03-17 14:18:22 +08:00 |
konopka
|
0387b13bb6
|
Adding missing virtual keywords
|
2015-03-16 16:39:43 +01:00 |
pipu
|
a5e9ebc4e6
|
Fix parse action tag for widget.
|
2015-03-16 20:04:59 +08:00 |
Martin Konopka
|
2c80b6ae3a
|
Get rid of compiler warnings: 'func' overrides a member function but is not marked 'override' [-Winconsistent-missing-override]
|
2015-03-15 00:10:08 +01:00 |
Martin Konopka
|
cd12d08a52
|
Get rid of compiler warnings: 'func' overrides a member function but is not marked 'override' [-Winconsistent-missing-override]
|
2015-03-14 19:33:15 +01:00 |
Nite Luo
|
cfa1f0c84f
|
Merge pull request #10843 from konopka/fix_compiler_reorder_warnings
Get rid of compiler warnings: field '_xxx' will be initialized after field '_yyy'...
|
2015-03-13 21:12:35 -07:00 |
Huabing.Xu
|
639ed335b3
|
Merge pull request #10839 from pipu/node_load_callback
To add the function node load callback called during create node from csb file.
|
2015-03-13 15:06:14 +08:00 |
Martin Konopka
|
350b81501d
|
Get rid of warnings: field '_xxx' will be initialized after field '_yyy' [-Wreorder]
Initialization follows the order of declaration, not the order of the initialization list.
|
2015-03-12 23:47:58 +01:00 |
pipu
|
56c3d1c6f6
|
To add the function node load callback called during create node from csb file.
|
2015-03-12 17:36:39 +08:00 |
pipu
|
7515fc78f5
|
To set csd version for serializing.
|
2015-03-12 16:15:17 +08:00 |
pipu
|
c72c8e865d
|
To reconstruct object extension data.
|
2015-03-12 15:47:15 +08:00 |
pipu
|
90da84a663
|
To modify that check whether or not string is not empty.
|
2015-03-11 09:59:07 +08:00 |
pipu
|
00bf9f5bfb
|
To optimize the situation that source path is existed, but source is not existed.
|
2015-03-10 17:48:48 +08:00 |
m2q1n9
|
c97742072f
|
fix cocostudio anchor point bug
fix a bug which will cause anchor point config not work
|
2015-03-09 14:30:41 +08:00 |
pipu
|
c21538e6e2
|
Merge branch 'v3' into reconstruct_parse_callbackbind
|
2015-03-09 10:38:02 +08:00 |
pipu
|
1fa9b2577a
|
Merge branch 'v3' into reconstruct_parse_callbackbind
|
2015-03-09 10:16:14 +08:00 |
yangxiao
|
8137b01f23
|
merge cocos
|
2015-03-06 18:31:57 +08:00 |
minggo
|
65926a9f0b
|
Merge pull request #10734 from pipu/projectnode_animation_innerspeed
Serialize and parse attribute "innerspeed" for ProjectNode.
|
2015-03-06 15:43:57 +08:00 |
pipu
|
fadac31868
|
Serialize and parse attribute "inner speed" for ProjectNode.
|
2015-03-05 15:48:17 +08:00 |
pipu
|
be1b0b7239
|
To modify layout attribute name that are used in serialized and parsed.
|
2015-03-05 14:34:35 +08:00 |
yangxiao
|
faf299c5a1
|
make path shorter
|
2015-03-05 13:24:06 +08:00 |
pipu
|
010a077fa8
|
To reconstruct callback binding for nest node as WidgetCallBackHandlerProtocol in CSLoader.
|
2015-03-04 17:29:40 +08:00 |
Ray
|
83a7b8012c
|
3DParticle Reader and tests
|
2015-02-26 09:19:14 +08:00 |
Ray
|
2f4fbbf4e8
|
fix the define problem
|
2015-02-25 14:28:39 +08:00 |
Ray
|
94523b667a
|
Merge branch 'v3' of github.com:cocos2d/cocos2d-x into v3
|
2015-02-25 14:19:37 +08:00 |
Ray
|
c66a4f28bc
|
Add CocosStudio UserCameraReader
fix Sprite3DReader Test
|
2015-02-25 14:19:08 +08:00 |
Dale Stammen
|
b39b078593
|
fixed conflict with near and far defined in windows.h for Win32, WP8 and WinRT platforms
|
2015-02-24 14:39:21 -08:00 |
Ray
|
c5cc1ebaa2
|
fix test project
|
2015-02-23 16:35:46 +08:00 |
Ray
|
fbe9e5b767
|
complate project file
|
2015-02-23 00:52:50 +08:00 |
Ray
|
35e3e8d62d
|
Sprite3D Reader and tests
|
2015-02-23 00:34:30 +08:00 |
Ray
|
8eb201797d
|
工程文件修改
|
2015-02-19 17:52:50 +08:00 |
Ray
|
73e40f1c4b
|
Node3DReader Test
|
2015-02-19 16:18:54 +08:00 |
Ray
|
2f01deee89
|
3D Editor Reader
Node3DReader
|
2015-02-19 12:08:09 +08:00 |