youyou
0235c4c377
change head file
2014-12-05 00:10:42 +08:00
pipu
56f7895e27
Modify bugs for flatbuffers
2014-12-04 20:38:46 +08:00
kaile.yin
743166f50b
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3
...
Conflicts:
cocos/editor-support/cocostudio/ActionTimeline/CSLoader.cpp
tests/cpp-tests/Classes/ExtensionsTest/CocoStudioActionTimelineTest/ActionTimelineTestScene.cpp
2014-12-04 15:32:25 +08:00
kaile.yin
fd69a5efc3
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3
2014-12-03 15:22:46 +08:00
pipu
ec978905d7
Modify that load .csb file serialized by flat buffers
2014-12-03 10:54:16 +08:00
pipu
22b044805c
Add callback parse
2014-12-01 21:50:05 +08:00
pipu
584c7dc7c6
Delete that use protocol buffers
2014-12-01 12:46:29 +08:00
pipu
ce3ca169d7
Modify that calls createNodeFromProtocolBuffers() for CSLoader
2014-11-27 17:23:22 +08:00
pipu
e38da9f9b6
Add callback framework using flat buffers
2014-11-27 16:49:19 +08:00
Ricardo Quesada
9e10d2d32b
Revert "Merge pull request #9193 from pipu/v3_flatbuffers"
...
This reverts commit fa22b12628
, reversing
changes made to 8dce62b94c
.
2014-11-24 10:19:53 -08:00
pipu
f3cb80d8f6
Add flat buffers reader and serialize
2014-11-21 15:15:38 +08:00
kaile.yin
d764c18271
update Android.mk
2014-11-19 10:57:22 +08:00
kaile.yin
bbd971d910
create ActionTimelineNode
2014-11-17 21:05:20 +08:00
Vladimir Timofeev
27ef26270c
Unify TinyXML2 usage.
...
* should be included as simple "tinyxml2.h", but on some files was "tinyxml2/tinyxml2.h", replace this.
* Add cmake/Modules/FindTinyXML2.cmake
* As tinyxml2 for now has not prebuilt, instead sources included, add their as subdirectory if USE_PREBUILT_LIBS
2014-11-15 14:43:50 +03:00
峰 正博
29779a4604
modiry document->Parse((char*)pByte); to document->Parse((const char*)pByte);
2014-11-04 11:51:00 +09:00
峰正博
85fb2c91ab
fix memory leak cocos studiov2.0 engine v3.3
2014-11-04 01:25:58 +09:00
kyokomi
2b4cf9ae59
bugfix: setting forget the contentSize.
2014-10-29 19:38:12 +09:00
pipu
8072328ca6
Modify that record path of .csb file
2014-10-20 11:56:48 +08:00
pipu
1c187a4653
Modify reader in order to parse attribute "Plist"
2014-10-17 16:35:17 +08:00
pipu
20cb663746
Delete the blank block
2014-10-16 19:02:39 +08:00
pipu
7cb2629baa
Delete annotate code of all Reader files
2014-10-16 17:44:22 +08:00
pipu
85bbcdd537
Deleting original code that parsing "Visible"
2014-10-16 16:26:46 +08:00
pipu
e77f7f02b0
Modify Reader:
...
1. Parsing "FlipX", "FlipY", "AnchorPoint".
2. Parsing "VisibleForFrame" instead of "Visible"
2014-10-16 15:55:38 +08:00
pipu
d3f972c139
Modifying warning of *Reader
2014-10-15 17:20:54 +08:00
pipu
0d73c51a09
Modifying cocostudio/CSParseBinary.pb.h
2014-10-12 17:46:09 +08:00
pipu
38ac6533a3
Removing ../../ in header file include
2014-10-11 15:50:44 +08:00
pipu
752eb839c7
Add protocolbuf.a
2014-10-09 18:28:09 +08:00