zhangcheng
1c983f1f39
GBKToUTF8
2015-06-17 13:16:06 +08:00
XiaoFeng
8d19ea7320
Fix when button set to disabled mode and won't have a disable texture will cause simulator won't show button in disabled gray mode
2015-06-12 15:47:34 +08:00
andyque
81d562803b
upgrade rapidjson to 1.0.2
2015-05-25 11:43:03 +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
minggo
1f5e5b5058
Merge pull request #11536 from xiaofeng11/v3
...
Update Node3DReader compatibility
2015-04-22 10:25:49 +08:00
pipu
fcd48ce2c3
Reset method purge() definition.
2015-04-21 18:16:38 +08:00
pipu
04cde1c52c
Modify that serialize base attribute for Node3DReader.
2015-04-21 18:05:46 +08:00
Vladimir Perminov
6ef1e7e3d0
Optimize Vec3 use constructor default.
...
Make Vec3 vec3(Vec3::ZERO); to Vec3 vec3;
2015-04-20 12:56:43 +03:00
minggo
15fe283c2e
Merge pull request #11515 from xiaofeng11/v3
...
update compatibility for upgraded node3d come with 2.2.5 version
2015-04-20 17:05:32 +08:00
pipu
388e4b3a93
Modify that parse position for Node3DReader.
2015-04-20 15:56:36 +08:00
minggo
8f88afa123
Merge pull request #11510 from xiaofeng11/v3
...
Bug fix
2015-04-20 15:50:44 +08:00
pipu
4b320a1677
Modify that parse text shadow and outline.
2015-04-20 11:39:43 +08:00
Vladimir Perminov
4c33050536
Optimize Vec2
...
small function Vec2 move to Vec2.inl
Added:
setZero();
Change all code:
_vec2 = Vec2(x, y); -> _vec2.set(x, y);
Vec2 vec2 = Vec2(x, y); -> Vec2 vec2(x, y);
_vec2 += Vec2(x, y); -> _vec2.add(x, y);
_vec2 = Vec2::ZERO; -> _vec2.setZero();
Vec2 vec2(Vec2::ZERO); -> Vec2 vec2;
2015-04-19 20:40:52 +03:00
pipu
d1dcf3f620
Modify that serialize attribute "Children".
2015-04-16 13:58:01 +08:00
pipu
ca74486f60
Update CSParseBinary_generated
2015-04-08 16:54:58 +08:00
pipu
bc7d8f0a09
Add method destroyCocosStudio() for CocoStudio
2015-03-31 19:55:56 +08:00
pipu
bb110449be
Reset method purge() definition for some Reader.
2015-03-31 14:56:24 +08:00
pipu
91acd6aea9
Set macro CC_DEPRECATED_ATTRIBUTE for method purge() for all Reader.
2015-03-31 14:21:10 +08:00
pipu
a0a461f319
Supplement some Reader.
2015-03-31 11:22:34 +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
c1f147b7a1
Avoid crash during parse armature node.
2015-03-19 11:51:34 +08:00
minggo
aa573a9553
Merge pull request #10904 from pipu/fixed_widget_reader_actiontag
...
Optimize parse action tag for node and widget.
2015-03-17 14:18:22 +08:00
pipu
a5e9ebc4e6
Fix parse action tag for widget.
2015-03-16 20:04:59 +08:00
Martin Konopka
cd12d08a52
Get rid of compiler warnings: 'func' overrides a member function but is not marked 'override' [-Winconsistent-missing-override]
2015-03-14 19:33:15 +01:00
pipu
c72c8e865d
To reconstruct object extension data.
2015-03-12 15:47:15 +08:00
pipu
90da84a663
To modify that check whether or not string is not empty.
2015-03-11 09:59:07 +08:00
pipu
00bf9f5bfb
To optimize the situation that source path is existed, but source is not existed.
2015-03-10 17:48:48 +08:00
yangxiao
8137b01f23
merge cocos
2015-03-06 18:31:57 +08:00
minggo
65926a9f0b
Merge pull request #10734 from pipu/projectnode_animation_innerspeed
...
Serialize and parse attribute "innerspeed" for ProjectNode.
2015-03-06 15:43:57 +08:00
pipu
fadac31868
Serialize and parse attribute "inner speed" for ProjectNode.
2015-03-05 15:48:17 +08:00
pipu
be1b0b7239
To modify layout attribute name that are used in serialized and parsed.
2015-03-05 14:34:35 +08:00
yangxiao
faf299c5a1
make path shorter
2015-03-05 13:24:06 +08:00
Ray
83a7b8012c
3DParticle Reader and tests
2015-02-26 09:19:14 +08:00
Ray
2f4fbbf4e8
fix the define problem
2015-02-25 14:28:39 +08:00
Ray
94523b667a
Merge branch 'v3' of github.com:cocos2d/cocos2d-x into v3
2015-02-25 14:19:37 +08:00
Ray
c66a4f28bc
Add CocosStudio UserCameraReader
...
fix Sprite3DReader Test
2015-02-25 14:19:08 +08:00
Dale Stammen
b39b078593
fixed conflict with near and far defined in windows.h for Win32, WP8 and WinRT platforms
2015-02-24 14:39:21 -08:00
Ray
35e3e8d62d
Sprite3D Reader and tests
2015-02-23 00:34:30 +08:00
Ray
73e40f1c4b
Node3DReader Test
2015-02-19 16:18:54 +08:00
Ray
2f01deee89
3D Editor Reader
...
Node3DReader
2015-02-19 12:08:09 +08:00
pipu
ed1b7edce7
Modify that parse ignoreSize for TextAtlas, TextBMFont.
2015-01-27 15:09:48 +08:00
pipu
35c1e73b8f
Checking whether tileset is valid during parses TMXTiledMap in GameMapReader.
2015-01-26 13:14:17 +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
e31fe9565a
Modify that parses position type of ParticleSystemQuad.
2015-01-14 10:24:44 +08:00
pipu
78b32332d3
Parse InnerActionFrame, AlphaFrame, modify cocostudio editor version number.
2015-01-12 10:55:15 +08:00
yusheng.lu
89034469f5
Updated the version check description.
2014-12-31 16:01:11 +08:00
minggo
ad443da6a0
Revert "Feature of version check. "
2014-12-31 14:17:18 +08:00
geron-cn
89c39d3f10
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into armaturenodefix
2014-12-31 04:06:11 +08:00
geron-cn
b048b65ae3
make current animation name take effect when autoplay is false
2014-12-31 03:59:36 +08:00
minggo
869a9bb0a9
Merge pull request #9652 from lite3/patch-2
...
fix incorrect font path
2014-12-30 15:43:31 +08:00
yusheng.lu
9a0f302370
revert the layoutComponent codes to prevent the demos crush.
2014-12-30 10:47:00 +08:00
yusheng.lu
e5961047aa
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_version
...
Conflicts:
cocos/editor-support/cocostudio/WidgetReader/WidgetReader.cpp
2014-12-30 10:42:54 +08:00
yusheng.lu
88f0a1e642
prevent the crush of the cocosstudio demos
2014-12-30 10:33:07 +08:00
yusheng.lu
505a4e8ab0
Feature of version check. When reading a csb file, if the engine's reader version dismatch the version saved in the csb file, an assert will be triggered. User must go to a website to get a reader to match the csb file.
...
Removed the version compatible control code before.
2014-12-29 19:37:53 +08:00
pipu
d3783cba95
Modify warning code.
2014-12-29 17:04:23 +08:00
minggo
2b0e287b5f
Merge pull request #9656 from geron-cn/v3_actionline_animationlist
...
fix: auto add search path for armaturenodereader
2014-12-29 09:17:01 +08:00
geron-cn
b25e307dee
fix add search path for armaturenodereader
2014-12-26 18:27:47 +08:00
lite3
b102587590
fix incorrect font path
2014-12-26 16:20:04 +08:00
pipu
bc18bafaa7
Update that parse plist for CheckBoxReader.
2014-12-26 14:18:28 +08:00
Liam
fa85faec68
update for cocos reader
2014-12-25 15:02:22 +08:00
Liam
807e63eae3
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into CocoReader
2014-12-25 14:13:02 +08:00
Liam
bd37d806ff
update for cocos reader
2014-12-25 14:11:05 +08:00
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
83fcf74882
update for code format
2014-12-24 10:56:01 +08:00
Liam
815ea2a1a5
update for code format
2014-12-23 20:29:53 +08:00
yusheng.lu
2b7c0edfed
license in ArmatureNodeReader.h added.
2014-12-23 15:13:27 +08:00
Liam
e4360b7616
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into Layout
2014-12-23 14:15:55 +08:00
yusheng.lu
7eedef71e6
armature node test completed
2014-12-23 11:13:05 +08:00
yusheng.lu
02b9269cff
completed multiplatform projects
2014-12-22 19:39:10 +08:00
yusheng.lu
b0bfc2906a
change armature codes files path
2014-12-22 18:26:50 +08:00
yusheng.lu
6de7fae114
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_armature_reader
2014-12-22 18:00:08 +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
pipu
0c6e22dd77
Update that parse resource path with flat buffers for readers
2014-12-22 13:42:18 +08: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
accf66c49f
Update that serialize plist file name
2014-12-11 19:15:04 +08:00
pipu
70b9767c56
1. Fixes #4957 that click test TestChangePlaySection, then it will crash.
...
2. Modify default value of selectedState to serialize check box data.
2014-12-11 11:34:31 +08: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
minggo
eef6d08813
Merge pull request #9402 from doomsdayer/v3_listview
...
V3 listview
2014-12-10 11:13:42 +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
minggo
5ab4f16fb1
Merge pull request #9411 from pipu/v3_reader_update
...
V3 reader update
2014-12-09 13:44:55 +08:00
yusheng.lu
7426a32d9f
1. ListView demo compeleted.
...
2. Optimized ListViewReader format.
2014-12-08 19:00:12 +08:00
pipu
56a25a2644
Update reader
2014-12-08 15:48:24 +08:00
Liam
e4b6a2bf57
update for cocos reader
2014-12-05 19:43:40 +08:00
yusheng.lu
2f456a5668
ListViewReader completed and listview callback feature.
2014-12-05 19:31:10 +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
6a64b867df
Modify bugs that parse resource path for ButtonReader, CheckBoxReader, ImageViewReader, LayoutReader, LoadingBarReader, PageViewReader, ScrollViewReader, SliderReader
2014-12-03 15:24:21 +08:00
pipu
57dbb214ca
Modify that serialize "percent" default property for SilderReader
2014-12-01 19:58:48 +08:00
pipu
69729bcd65
Add that parse "color" in NodeReader
2014-12-01 16:27:21 +08:00
pipu
584c7dc7c6
Delete that use protocol buffers
2014-12-01 12:46:29 +08:00
pipu
1447919be1
Merge branch 'v3_flatbuffers' of https://github.com/pipu/cocos2d-x into v3_flatbuffers
2014-12-01 11:49:11 +08:00
pipu
27261ddcc0
Modify NodeReader, ButtonReader, WidgetReader, TextReader, TextFieldReader
2014-12-01 11:48:04 +08:00
Dale Stammen
301e947c37
no initialization list for WP8
2014-11-27 05:21:04 -08:00
pipu
e38da9f9b6
Add callback framework using flat buffers
2014-11-27 16:49:19 +08:00
pipu
e1c287d500
Modify that parse "actionTag" for WidgetReader
2014-11-27 12:12: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
5d50a8ef92
Modify that initialize Color4B for WidgetReader
2014-11-21 19:36:20 +08:00
zhangcheng
32ce3dca2e
1, Update windows project.
2014-11-21 18:12:46 +08:00
pipu
6be17520c7
Config android, linux, wp8
2014-11-21 18:08:09 +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
minggo
6c67c6921d
Merge pull request #8977 from pipu/v3_Modify_TextReader
...
Modify that parsing attribute "fontName" of TextReader
2014-11-11 12:05:49 +08:00
Vladimir Timofeev
2835b094da
Cleanup order of fields initialization.
...
Make initialization order to match declarations.
This change twice reduces number of warnings when compiling on MacOS X with Xcode 6.1
Warnings was like "Field 'XXXX' will be initialized after field 'YYYY'"
2014-10-30 17:28:41 +03:00
pipu
2ed51e042d
Modify that parsing attribute "fontName" of TextReader
2014-10-30 18:00:03 +08:00
pipu
0134e9247d
Fixed #8838
2014-10-20 10:15:44 +08:00
pipu
1c187a4653
Modify reader in order to parse attribute "Plist"
2014-10-17 16:35:17 +08:00
pipu
20cb663746
Delete the blank block
2014-10-16 19:02:39 +08:00
pipu
7cb2629baa
Delete annotate code of all Reader files
2014-10-16 17:44:22 +08:00
pipu
85bbcdd537
Deleting original code that parsing "Visible"
2014-10-16 16:26:46 +08:00
pipu
e77f7f02b0
Modify Reader:
...
1. Parsing "FlipX", "FlipY", "AnchorPoint".
2. Parsing "VisibleForFrame" instead of "Visible"
2014-10-16 15:55:38 +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
ab969db441
Modifying ImageViewReader, UIImageView
2014-10-11 15:43:37 +08:00
pipu
29eb552d00
1. Modifying ButtonReader
...
2. Modifying UILoadingBar
3. Reverting UIScale9Sprite
2014-10-11 15:35:09 +08:00
pipu
752eb839c7
Add protocolbuf.a
2014-10-09 18:28:09 +08:00
Frank.Xu
1c1d917620
Fix pull request #6894 merge conflicts
2014-09-29 16:22:55 +08:00
andyque
c9b959ec82
replace raw string literal with const external variables to keep consistence.
2014-09-29 11:35:03 +08:00
andyque
d4b2e8d154
remove deprecated warning
2014-09-12 17:06:13 +08:00
Ricardo Quesada
c149bfca00
Adds MARK: TODO: FIXME: in code
...
Replaces XXX with FIXME:
Xcode 6 beta 4 supports this new format
2014-08-29 12:54:24 -07: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
boyu0
c7fec217ba
Change atof() to utils::atof()
2014-07-14 20:45:24 +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
zhangcheng
af0613cf32
1、fixes warning.
2014-07-09 00:09:35 +08:00
andyque
037a7dc882
fix TextReader TTF font Reader issue
2014-07-07 15:22:14 +08:00
andyque
0483c64286
fix widget ignoreContentSize issue
2014-07-07 15:21: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
andyque
f82e96daf0
fix layout background image default color & opacity
2014-07-03 16:56:05 +08:00
andyque
32724e559d
fix container default color issue
2014-07-03 14:38:45 +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
andyque
7d2685ba02
fix content Size
2014-07-01 21:02:37 +08:00
zhangcheng
02c7c93e43
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into OpBinaryParse
2014-07-01 16:36:37 +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
199ad9c623
issue #5161 , replace deprecated methods
2014-06-24 10:18:01 +08:00