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
79acf80fb1
Update that avoid crash during load resource which serialize by flat buffers
2014-12-17 19:00:24 +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
d3351a4b11
1. Fix bug that after load .csb file, call Text widget's setString(), content of string dosen't line wrap and content of Text is chaotic.
...
2. Update how to parse attribute scale9Enabled
2014-12-10 17:35:39 +08:00
pipu
e81dca372a
Update that sets default value of font name for ButtonReader, TextFieldReader, TextReader
2014-12-10 15:46:58 +08:00
pipu
6b6fe4129d
Update Reader
2014-12-10 12:36:14 +08:00
pipu
f54254494c
Update CCActionTimelineCache.cpp, LayoutReader.cpp, PageViewReader.cpp, ScrollViewReader.cpp, TextFieldReader.cpp, TextReader.cpp
2014-12-09 15:13:09 +08:00
pipu
56a25a2644
Update reader
2014-12-08 15:48:24 +08:00
pipu
584c7dc7c6
Delete that use protocol buffers
2014-12-01 12:46:29 +08:00
pipu
27261ddcc0
Modify NodeReader, ButtonReader, WidgetReader, TextReader, TextFieldReader
2014-12-01 11:48:04 +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
2ed51e042d
Modify that parsing attribute "fontName" of TextReader
2014-10-30 18:00:03 +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
andyque
d4122d616a
fix text reader binray version setFontName
2014-07-11 13:58:08 +08:00
andyque
43255e2b96
Merge branch 'v3' into addStudio1.4
...
Conflicts:
cocos/editor-support/cocostudio/WidgetReader/TextReader/TextReader.cpp
2014-07-11 13:55:13 +08:00
zhangcheng
a0ecae21c3
1. fixes TextReader load default font error.
2014-07-10 19:29:39 +08:00
andyque
f76f71eb5d
fix win32 & win8 compile error
2014-07-10 16:37:15 +08:00
Dhilan007
6cff8cb564
fixed warn and replace NULL with nullptr.
2014-07-10 00:45:27 +08:00
andyque
037a7dc882
fix TextReader TTF font Reader issue
2014-07-07 15:22:14 +08:00
andyque
c8165bb2d9
fix indent problems
2014-07-04 11:53:06 +08:00
andyque
a429182765
fix windows compile and running error
2014-07-04 11:22:36 +08:00
zhangcheng
d1db470cf2
Merge branch 'macLoader' into v3_OpBinaryParse
2014-07-02 16:11:02 +08:00
zhangcheng
9204ac28df
1. merge v3
2014-07-02 15:37:15 +08:00
andyque
fb3e499d9d
fix Text reader font name
2014-07-02 10:08:04 +08:00
zhangcheng
4b8f818a1d
1、Update binary parse lib.
2014-07-01 16:31:17 +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
aa5df68b96
Merge branch 'v3' into cleanupBinaryLoader
...
Conflicts:
cocos/3d/CCAnimationCurve.h
cocos/3d/CCAnimationCurve.inl
2014-06-18 15:13:34 +08:00
andyque
63475a6f81
refactor Loader
2014-06-18 14:44:00 +08:00
kyokomi
b6ed783b0b
fix use raw char* to represent string.
2014-06-17 17:05:44 +09:00
kyokomi
d7199204bd
Fix bug for TextReader #setFontName.
2014-06-14 23:56:12 +09:00
andyque
5515c43bb2
improve lasers
2014-06-11 15:16:08 +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
e6889dca36
issue #5110 , refactor UIText
2014-05-14 15:26:14 +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