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
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
konopka
7fb79272ca
Undo changes that are not allowed by spine license
2015-03-16 16:35:41 +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
Dale Stammen
fd11984e0a
disable LTCG
2015-02-27 11:21:36 -08:00
Dale Stammen
e4db9f396e
disable LTCG. set warning level to W3
2015-02-27 11:16:40 -08:00
Dale Stammen
f68a966485
disabled Check SDL to allow CC_DEPRECATED to work as warning and not error
2015-02-27 11:07:51 -08:00
Dale Stammen
b5e936c657
disabled LTCG to speed up release builds
2015-02-27 10:43:13 -08:00
Dale Stammen
2eb919bb7a
disabled Check SDL to allow CC_DEPRECATED to work as warning and not error
2015-02-27 10:36:48 -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
minggo
c2479adc59
Merge pull request #10549 from mogemimi/fix-typo
...
Fix typo in Image::Format
2015-02-25 09:32:58 +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
mogemimi
d384f7ce1e
Fix typo: unkown -> unknown
2015-02-24 02:39:50 +09: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
kompjoefriek
89152b2856
Tabs to spaces
...
Changed indenting tabs to spaces
2015-01-29 10:40:00 +01:00
kompjoefriek
0c70660551
Fixed warnings
...
- signed/unsigned mismatch
- printing enum with %d
- using int as bool
2015-01-29 01:36:22 +01:00
andyque
ac3d79a516
add constructor to AnimationInfo
2015-01-28 16:59:27 +08:00
geron-cn
df10a974fa
fix projectnode
2015-01-27 23:19:27 +08:00
minggo
f09626bcfb
Merge pull request #10235 from pipu/modify_parse_ignoresize
...
Modify that parse ignoreSize for TextAtlas, TextBMFont.
2015-01-27 18:44:01 +08:00
minggo
15bf919000
Merge pull request #10231 from geron-cn/fixanimationlistclone
...
FIX BUG: animationinfos lost after actiontimeline clone
2015-01-27 15:24:25 +08:00
pipu
ed1b7edce7
Modify that parse ignoreSize for TextAtlas, TextBMFont.
2015-01-27 15:09:48 +08:00
geron-cn
390c336a19
FIX animationfio lost after actiontimeline clone
2015-01-27 12:04:14 +08:00
geron-cn
d3baae0304
Merge branch 'v3' of github.com:cocos2d/cocos2d-x into fixProjectNodeLoader
2015-01-26 21:21:31 +08:00
geron-cn
a1a7273436
fix bug: fix crash when lack of projected file
2015-01-26 21:20:26 +08:00
pipu
35c1e73b8f
Checking whether tileset is valid during parses TMXTiledMap in GameMapReader.
2015-01-26 13:14:17 +08:00
kompjoefriek
ca48c5e5dd
Fixed lots of compiler warnings
...
- signed / unsigned mismatches
- using int as bool
- Removed throw() from CCFrame.h, why is explained here:
http://www.gotw.ca/publications/mill22.htm
2015-01-23 02:02:33 +01:00
pipu
c0a662ff13
Modify bug that parses AnchorPointFrame.
2015-01-22 11:20:01 +08:00
geron-cn
2fc79e2da5
ProjectNode's actiontimeline should jump to 0 frame when after nest into another csd
2015-01-21 15:21:23 +08:00
yusheng.lu
f274277367
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_version_1
2015-01-20 14:35:15 +08:00
pipu
ea84ae78dc
Invoke FileUtils::getInstance()->getStringFromFile() instead of FileUtils::getInstance()->getFileData().
2015-01-19 17:16:26 +08:00
yusheng.lu
5dc87f49b0
Moved the version pair to 1st position of its map.
2015-01-19 14:42:43 +08:00
pipu
103fecf3ef
Fixes memory leaks of using FileUtils::getInstance()->getFileData() in FlatBuffersSerialize.cpp.
2015-01-19 11:45:20 +08:00
Nite Luo
4a440e66c9
Refactor draw command
2015-01-15 14:00:49 -08:00
minggo
d57ba984be
Merge pull request #9979 from geron-cn/inneractionframe
...
inneractionframe rename variables
2015-01-14 15:15:51 +08:00
geron-cn
ab2b86b392
rename variables
2015-01-14 13:02:30 +08:00
pipu
e31fe9565a
Modify that parses position type of ParticleSystemQuad.
2015-01-14 10:24:44 +08:00
pipu
a20cc2b151
Modify that parses plist for cocostudio editor simulator.
2015-01-13 11:12:28 +08:00
pipu
532269c44e
fix bug: cut inner timeline action as outer timeline action's length
2015-01-13 11:07:06 +08:00
minggo
7f5f3a2fd9
Merge pull request #9945 from jianglong0156/v3
...
issue cocos2d/cocos2d-js #2563 : cccomrender constructor
2015-01-12 21:13:01 +08:00
jianglong0156
5d781d7eb4
issue cocos2d/cocos2d-js #2563 : cccomrender need to use its constructor in jsb code. So i modify the constructor to public
2015-01-12 20:49:43 +08:00
pipu
aaccdef1eb
Modify cocos/editor-support/cocostudio/CMakeLists.txt.
2015-01-12 19:14:04 +08:00
pipu
c7a923b658
Update method clone() for InnerActionFrame.
2015-01-12 17:59:30 +08:00
pipu
d364a329db
Merge branch 'v3' into parse_inneractionframe
2015-01-12 14:26:05 +08:00
pipu
7e83336af8
Update InnerActionFrame.
2015-01-12 13:54:17 +08:00
jianglong0156
4cc0dd129a
issue cocos2d/cocos2d-js #2563 : ActionTimelineData need to use its constructor in jsb code. So i modify the constructor to public
2015-01-12 11:57:03 +08:00
pipu
6237115fbf
Fixes bug that clone InnerActionFrame.
2015-01-12 11:09:19 +08:00
pipu
78b32332d3
Parse InnerActionFrame, AlphaFrame, modify cocostudio editor version number.
2015-01-12 10:55:15 +08:00
youyou
1d7a4a5c05
fixed event frame will go twice loop when goto frame
2015-01-09 10:24:38 +08:00
yusheng.lu
3c992fe38c
Bug fix:When parsing a plist file as image mergin, if in fact the plist file is a particle, a crush will occur.
...
Now it's fixed.
2015-01-05 16:59:09 +08:00
yusheng.lu
ec540fcaa2
Update the reader-get link to http://www.cocos2d-x.org/filedown/cocos-reader
2015-01-05 13:26:46 +08:00
yusheng.lu
a7fb75dc7d
Update the description when the csb reader version dismatches the reader version in Cocos2d-x
2015-01-04 19:12:19 +08:00
yusheng.lu
89034469f5
Updated the version check description.
2014-12-31 16:01:11 +08:00
minggo
ad443da6a0
Revert "Feature of version check. "
2014-12-31 14:17:18 +08:00
geron-cn
89c39d3f10
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into armaturenodefix
2014-12-31 04:06:11 +08:00
geron-cn
b048b65ae3
make current animation name take effect when autoplay is false
2014-12-31 03:59:36 +08:00
minggo
869a9bb0a9
Merge pull request #9652 from lite3/patch-2
...
fix incorrect font path
2014-12-30 15:43:31 +08:00
yusheng.lu
9a0f302370
revert the layoutComponent codes to prevent the demos crush.
2014-12-30 10:47:00 +08:00
yusheng.lu
e5961047aa
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_version
...
Conflicts:
cocos/editor-support/cocostudio/WidgetReader/WidgetReader.cpp
2014-12-30 10:42:54 +08:00
yusheng.lu
88f0a1e642
prevent the crush of the cocosstudio demos
2014-12-30 10:33:07 +08:00
yusheng.lu
505a4e8ab0
Feature of version check. When reading a csb file, if the engine's reader version dismatch the version saved in the csb file, an assert will be triggered. User must go to a website to get a reader to match the csb file.
...
Removed the version compatible control code before.
2014-12-29 19:37:53 +08:00
pipu
d3783cba95
Modify warning code.
2014-12-29 17:04:23 +08:00
minggo
2b0e287b5f
Merge pull request #9656 from geron-cn/v3_actionline_animationlist
...
fix: auto add search path for armaturenodereader
2014-12-29 09:17:01 +08:00
geron-cn
b25e307dee
fix add search path for armaturenodereader
2014-12-26 18:27:47 +08:00
lite3
b102587590
fix incorrect font path
2014-12-26 16:20:04 +08:00
minggo
f01cc596a3
Merge pull request #9637 from geron-cn/v3_actionline_animationlist
...
V3 actiontimeline animationlist
2014-12-26 16:05:49 +08:00
pipu
bc18bafaa7
Update that parse plist for CheckBoxReader.
2014-12-26 14:18:28 +08:00
geron-cn
70eef1f660
fix play
2014-12-25 17:45:14 +08:00
geron-cn
490b33405d
Merge branch 'v3' of github.com:cocos2d/cocos2d-x into v3_actionline_animationlist
2014-12-25 17:37:05 +08:00
geron-cn
79e5341742
remove animation list binary parse
2014-12-25 17:22:49 +08:00
Liam
fa85faec68
update for cocos reader
2014-12-25 15:02:22 +08:00
Liam
807e63eae3
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into CocoReader
2014-12-25 14:13:02 +08:00
Liam
bd37d806ff
update for cocos reader
2014-12-25 14:11:05 +08:00
youyou
f678d1027c
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3
...
Conflicts:
cocos/editor-support/cocostudio/ActionTimeline/CSLoader.cpp
2014-12-25 12:09:31 +08:00
youyou
db6ffd7962
Merge branch 'v3' of https://github.com/2youyouo2/cocos2d-x ; branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3
2014-12-24 15:59:50 +08:00
yusheng.lu
c64792959c
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_armature_reader
2014-12-24 15:32:02 +08:00
Liam
83fcf74882
update for code format
2014-12-24 10:56:01 +08:00
kaile.yin
942abfc654
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3
...
Conflicts:
cocos/2d/libcocos2d.vcxproj.filters
2014-12-24 10:53:09 +08:00
Liam
33bd5e3f4c
remove unused code
2014-12-23 20:36:18 +08:00
Liam
815ea2a1a5
update for code format
2014-12-23 20:29:53 +08:00
yusheng.lu
2b7c0edfed
license in ArmatureNodeReader.h added.
2014-12-23 15:13:27 +08:00
Liam
e4360b7616
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into Layout
2014-12-23 14:15:55 +08:00
yusheng.lu
7eedef71e6
armature node test completed
2014-12-23 11:13:05 +08:00
yusheng.lu
1e05361873
ios/mac project compeleted
2014-12-22 20:08:27 +08:00
yusheng.lu
02b9269cff
completed multiplatform projects
2014-12-22 19:39:10 +08:00
youyou
70052b2a3f
support animation list
2014-12-22 18:57:48 +08:00
yusheng.lu
b0bfc2906a
change armature codes files path
2014-12-22 18:26:50 +08:00
yusheng.lu
6de7fae114
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_armature_reader
2014-12-22 18:00:08 +08:00
yusheng.lu
62c5df2d9d
armature node reader done (projs incompleted)
2014-12-22 17:35:39 +08:00
Liam
ce9f269680
update object reader for new lay out system
2014-12-22 15:38:47 +08:00
minggo
6ac611bd1d
Merge pull request #9573 from pipu/update_parse_resource_path
...
Update that parse resource path with flat buffers for readers
2014-12-22 15:11:24 +08:00