f54254494c
Update CCActionTimelineCache.cpp, LayoutReader.cpp, PageViewReader.cpp, ScrollViewReader.cpp, TextFieldReader.cpp, TextReader.cpp
2014-12-09 15:13:09 +08:00
6a64b867df
Modify bugs that parse resource path for ButtonReader, CheckBoxReader, ImageViewReader, LayoutReader, LoadingBarReader, PageViewReader, ScrollViewReader, SliderReader
2014-12-03 15:24:21 +08:00
584c7dc7c6
Delete that use protocol buffers
2014-12-01 12:46:29 +08:00
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
f3cb80d8f6
Add flat buffers reader and serialize
2014-11-21 15:15:38 +08:00
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
1c187a4653
Modify reader in order to parse attribute "Plist"
2014-10-17 16:35:17 +08:00
7cb2629baa
Delete annotate code of all Reader files
2014-10-16 17:44:22 +08:00
e77f7f02b0
Modify Reader:
...
1. Parsing "FlipX", "FlipY", "AnchorPoint".
2. Parsing "VisibleForFrame" instead of "Visible"
2014-10-16 15:55:38 +08:00
d3f972c139
Modifying warning of *Reader
2014-10-15 17:20:54 +08:00
0d73c51a09
Modifying cocostudio/CSParseBinary.pb.h
2014-10-12 17:46:09 +08:00
38ac6533a3
Removing ../../ in header file include
2014-10-11 15:50:44 +08:00
752eb839c7
Add protocolbuf.a
2014-10-09 18:28:09 +08:00
c9b959ec82
replace raw string literal with const external variables to keep consistence.
2014-09-29 11:35:03 +08:00
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
6cfc5b72dc
1. CocosStudio adapt to cocos2d-x v3.2.
2014-07-21 17:45:56 +08:00
6cff8cb564
fixed warn and replace NULL with nullptr.
2014-07-10 00:45:27 +08:00
a429182765
fix windows compile and running error
2014-07-04 11:22:36 +08:00
f82e96daf0
fix layout background image default color & opacity
2014-07-03 16:56:05 +08:00
32724e559d
fix container default color issue
2014-07-03 14:38:45 +08:00
d1db470cf2
Merge branch 'macLoader' into v3_OpBinaryParse
2014-07-02 16:11:02 +08:00
02c7c93e43
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into OpBinaryParse
2014-07-01 16:36:37 +08:00
4b8f818a1d
1、Update binary parse lib.
2014-07-01 16:31:17 +08:00
b9a968680f
add default value to widgets reader
2014-07-01 10:57:12 +08:00
312ab4f396
Merge branch 'v3' into feature5161
...
Conflicts:
cocos/editor-support/cocostudio/CCSGUIReader.cpp
cocos/editor-support/cocostudio/WidgetReader/ButtonReader/ButtonReader.cpp
cocos/editor-support/cocostudio/WidgetReader/ImageViewReader/ImageViewReader.cpp
cocos/editor-support/cocostudio/WidgetReader/LoadingBarReader/LoadingBarReader.cpp
cocos/editor-support/cocostudio/WidgetReader/WidgetReader.cpp
tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UIListViewTest/UIListViewTest.cpp
2014-06-24 09:51:18 +08:00
8a463e7964
remove Hungry style
2014-06-23 10:02:09 +08:00
5f5b705bee
refactor setSize to setContentSize and deprecated the old interface
2014-06-20 14:03:33 +08:00
4d64b166cc
refactor - replace magic string with const string
2014-06-19 17:04:14 +08:00
a26ef87783
cleanup reader code
2014-06-19 15:16:56 +08:00
63475a6f81
refactor Loader
2014-06-18 14:44:00 +08:00
1d01fe8bbc
refactor
2014-06-15 16:12:24 +08:00
5515c43bb2
improve lasers
2014-06-11 15:16:08 +08:00
b895018765
update parser
2014-06-11 09:35:24 +08:00
c96a6086c3
improve parsing code
2014-06-05 11:43:43 +08:00
8690122c96
add version 300 parsing code in widget reader
2014-06-05 10:25:08 +08:00
dc711643cd
Squashed commit of the following:
...
commit a9572b8913f3a38b59adbd7b4017ab9848a6b2b5
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Wed May 14 10:03:44 2014 -0700
math renames
`Vector2` -> `Vec2`
`Vector3` -> `Vec3`
`Vector4` -> `Vec4`
`Matrix` -> `Mat4`
commit 4e107f4bd854c26bfceb52b063d6bd9cea02d6a3
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Wed May 14 09:24:28 2014 -0700
raw version of rename Vector3
commit 1d115573ebe96a5fc815fa44fbe6417ea7dba841
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Wed May 14 09:07:14 2014 -0700
rename Vector2 after merge
commit ab2ed58c129dbc30a4c0970ed94568c5d271657b
Merge: 1978d2d 86fb75a
2014-05-14 10:07:09 -07:00
a0a4df5ac5
closed #5118 , remove WidgetType and refactor LayoutType to Type
2014-05-12 18:00:54 +08:00
09a53e7b03
issue #5057 , refactor BackGroundColorType
2014-05-09 17:05:36 +08:00
e8e0d007bd
issue #5057 , refactor LayoutType
2014-05-09 16:49:00 +08:00
6a7277c38f
issue #5057 , refactor TextureResType to strong typed enum
2014-05-09 14:56:05 +08:00
aa04176d83
Merge pull request #6386 from pipu/fixed_bug_ui_layout_clip
...
fixed the clipping of ui layout read from CocoStudio could not work
2014-04-28 11:08:40 +08:00
c492f4d3c3
fixed ui layout clip
2014-04-28 10:06:11 +08:00
63b52dd287
replace Point with Vector2 in cocos folder cpp file
2014-04-15 18:13:57 +08:00
a4e0c1a6e2
issue #4636 . refactor LayoutReader
2014-04-04 17:21:23 +08:00
51404500b7
issue #4636 . fixed WidgetReader error
2014-04-04 16:24:54 +08:00
733b364b51
Fixed bugs for Editor
2014-03-28 18:54:06 +08:00
cbcc1bbbcf
let ios project compile correct
2014-03-11 18:48:26 +08:00
bd5c11b5ee
Modify mk file and solve warnings
2014-03-06 16:15:03 +08:00
4a2dc4a607
Add custom widget and reader
2014-03-04 16:51:35 +08:00
pipu