15 Commits

Author	SHA1	Message	Date
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	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	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
Vladimir Timofeev	9bd1ab74c7	Replace #include "tinyxml2/tinyxml2.h" to #include "tinyxml2.h" in new cocostudio code. This should fix build with cmake when USE_PREBUILT_LIBS=NO. Because FindTinyXML2.cmake find tinyxml2.h header (without prefix dir). And some systems install tinyxml2 includes without special directory. ... Also this inclusion style match other existing files such as cocos/platform/CCFileUtils.cpp	2014-12-14 12:14:16 +03:00
pipu	accf66c49f	Update that serialize plist file name	2014-12-11 19:15:04 +08:00
pipu	6b6fe4129d	Update Reader	2014-12-10 12:36:14 +08:00
minggo	5ab4f16fb1	Merge pull request #9411 from pipu/v3_reader_update ... V3 reader update	2014-12-09 13:44:55 +08:00
pipu	c3365a4654	Add interface that create node with flat buffers object for simulator	2014-12-08 14:32:33 +08:00
Liam	be929dcde6	update for cocos reader	2014-12-05 19:19:53 +08:00
pipu	56f7895e27	Modify bugs for flatbuffers	2014-12-04 20:38:46 +08:00
pipu	fc97a3d0c6	Modify serialize property "value" of VisibleFrame	2014-12-02 16:11:46 +08:00
pipu	e38da9f9b6	Add callback framework using flat buffers	2014-11-27 16:49:19 +08:00
pipu	f3cb80d8f6	Add flat buffers reader and serialize	2014-11-21 15:15:38 +08:00