pandamicro
|
b9602127a4
|
Merge pull request #13187 from xiaofeng11/v3.7.1
Remove file error notice label from TextBMFontReader
|
2015-08-04 13:38:17 +08:00 |
XiaoFeng
|
0f90999419
|
Remove file error notice label from TextBMFontReader to keep consistency with other components
|
2015-08-04 11:45:29 +08:00 |
pandamicro
|
330eaf5239
|
Merge pull request #13161 from xiaofeng11/v3.7.1
Fix 3d particle can not show in simulator
|
2015-08-03 11:11:39 +08:00 |
XiaoFeng
|
17a5d07183
|
Fix 3d particle can not show in simulator
|
2015-08-03 09:53:16 +08:00 |
Liam
|
c93d40869c
|
fix simulator crash when sprite3d resource is error
|
2015-07-29 16:52:40 +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
|
1389fc3d31
|
some doxygen comments and copyright
|
2015-07-24 01:30:34 +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
|
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 |
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 |
XiaoFeng
|
9a6ffd8904
|
Add bug test for PageView layout & CCNodeDraw::onDrawGLLine
|
2015-07-07 09:54:42 +08: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 |
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 |
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 |
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
|
49b465f0f4
|
Fix wrong shadow & outline color bug for text component
|
2015-04-29 10:46:23 +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 |
pipu
|
ca74486f60
|
Update CSParseBinary_generated
|
2015-04-08 16:54:58 +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 |
pipu
|
90da9dbee5
|
Avoid crash during parse TextAtlas.
|
2015-03-24 15:59:21 +08:00 |
pipu
|
c1f147b7a1
|
Avoid crash during parse armature node.
|
2015-03-19 11:51:34 +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 |
pipu
|
a5e9ebc4e6
|
Fix parse action tag for widget.
|
2015-03-16 20:04:59 +08: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 |
pipu
|
c72c8e865d
|
To reconstruct object extension data.
|
2015-03-12 15:47:15 +08:00 |