minggo
f79a138c2b
revert updating flatbuffers ( #17930 )
...
* revert updating flatbuffers
* update external version
2017-06-15 13:42:50 +08:00
minggo
f54c41c074
Update flatbuffers to 1.5 ( #17349 )
...
* update flatbuffers to 1.5
* update windows projects setting
* fix compiling error on linux
* fix compiling error
* fix compiling error
* fix compiling error
2017-02-14 14:32:09 +08:00
mogemimi
fc6c612c4c
Remove duplicate header includes
2016-05-26 23:25:44 +09:00
minggo
a5602cc732
merge v3.11 back to v3
2016-05-04 16:02:23 +08:00
zilongshanren
482788c933
Add tizen support ( #15518 )
...
* add Tizen Support
* fix linter error
* fix tizen audio engine lua bindings config
2016-04-28 09:49:55 +08:00
xpol
1e70fb5eb5
Remove include of cocos2d.h ( #15435 )
2016-04-18 15:09:21 +08:00
肖峰
44331137d8
Fix in cpp-test bugs test scene 13 crash
2016-03-29 16:45:16 +08:00
Xpol Wan
90456d29ba
Fixes 1605 include path in 541 files
...
using the tools/coding-style/include-linter.py with -f options.
2016-03-20 21:53:44 +08:00
beichen.liu
4e4558e509
Modify the interface of localization manager.
2016-03-01 14:27:12 +08:00
beichen.liu
fe917e00fc
Add language localization support for Button, Text, TextField and TextBMFont.
2016-02-29 18:00:14 +08:00
WenhaiLin
df383de894
This is a small optimization about TextReader.
2015-08-31 17:06:11 +08:00
xpol
29dcbe6685
Fixes some warnings and a related bug in CCSprite.
...
This story tells us that we should not just ignore warnings.
2015-07-07 23:01:24 +08:00
zhangcheng
1c983f1f39
GBKToUTF8
2015-06-17 13:16:06 +08:00
XiaoFeng
e94bcbd28c
Remove missing resource label from all UI widget
2015-05-22 18:21:59 +08:00
XiaoFeng
49b465f0f4
Fix wrong shadow & outline color bug for text component
2015-04-29 10:46:23 +08:00
pipu
4b320a1677
Modify that parse text shadow and outline.
2015-04-20 11:39:43 +08:00
pipu
ca74486f60
Update CSParseBinary_generated
2015-04-08 16:54:58 +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
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