Lothario
/
axmol
mirror of https://github.com/axmolengine/axmol.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
30,436 Commits 2 Branches 31 Tags 1.1 GiB
Commit Graph

32 Commits

Author SHA1 Message Date
XiaoFeng e94bcbd28c Remove missing resource label from all UI widget 2015-05-22 18:21:59 +08:00
pipu 91acd6aea9 Set macro CC_DEPRECATED_ATTRIBUTE for method purge() for all Reader. 2015-03-31 14:21:10 +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 ed1b7edce7 Modify that parse ignoreSize for TextAtlas, TextBMFont. 2015-01-27 15:09:48 +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 584c7dc7c6 Delete that use protocol buffers 2014-12-01 12:46:29 +08:00
pipu 6b999d53f3 Modify that declare and definition that function return value of createNodeWithFlatBuffers() for all kinds of "NodeReader" 2014-11-26 11:50:42 +08:00
pipu f3cb80d8f6 Add flat buffers reader and serialize 2014-11-21 15:15:38 +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
pipu 7cb2629baa Delete annotate code of all Reader files 2014-10-16 17:44:22 +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
Ricardo Quesada 3dda35b4ef Adds `std::nothrow` to `new` 
Since cocos2d-x doesn't support exceptions, it is important to add
`std::nothrow` to all the `new` statements
 2014-08-27 16:31:57 -07:00
zhangcheng 6cfc5b72dc 1. CocosStudio adapt to cocos2d-x v3.2. 2014-07-21 17:45:56 +08:00
Dhilan007 6cff8cb564 fixed warn and replace NULL with nullptr. 2014-07-10 00:45:27 +08:00
zhangcheng af0613cf32 1、fixes warning. 2014-07-09 00:09:35 +08:00
zhangcheng d1db470cf2 Merge branch 'macLoader' into v3_OpBinaryParse 2014-07-02 16:11:02 +08:00
zhangcheng 4b8f818a1d 1、Update binary parse lib. 2014-07-01 16:31:17 +08:00
andyque fefdc70af9 add default value to widget reader 2014-07-01 14:01:27 +08:00
andyque b9a968680f add default value to widgets reader 2014-07-01 10:57:12 +08:00
andyque 8a463e7964 remove Hungry style 2014-06-23 10:02:09 +08:00
andyque 4d64b166cc refactor - replace magic string with const string 2014-06-19 17:04:14 +08:00
andyque a26ef87783 cleanup reader code 2014-06-19 15:16:56 +08:00
andyque 63475a6f81 refactor Loader 2014-06-18 14:44:00 +08:00
andyque b895018765 update parser 2014-06-11 09:35:24 +08:00
andyque 8690122c96 add version 300 parsing code in widget reader 2014-06-05 10:25:08 +08:00
andyque cbcc1bbbcf let ios project compile correct 2014-03-11 18:48:26 +08:00
CaiWenzhi bd5c11b5ee Modify mk file and solve warnings 2014-03-06 16:15:03 +08:00
CaiWenzhi 4a2dc4a607 Add custom widget and reader 2014-03-04 16:51:35 +08:00