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
Nite Luo
cfa1f0c84f
Merge pull request #10843 from konopka/fix_compiler_reorder_warnings
...
Get rid of compiler warnings: field '_xxx' will be initialized after field '_yyy'...
2015-03-13 21:12:35 -07:00
Huabing.Xu
639ed335b3
Merge pull request #10839 from pipu/node_load_callback
...
To add the function node load callback called during create node from csb file.
2015-03-13 15:06:14 +08:00
Martin Konopka
350b81501d
Get rid of warnings: field '_xxx' will be initialized after field '_yyy' [-Wreorder]
...
Initialization follows the order of declaration, not the order of the initialization list.
2015-03-12 23:47:58 +01:00
pipu
56c3d1c6f6
To add the function node load callback called during create node from csb file.
2015-03-12 17:36:39 +08:00
pipu
c72c8e865d
To reconstruct object extension data.
2015-03-12 15:47:15 +08:00
pipu
1fa9b2577a
Merge branch 'v3' into reconstruct_parse_callbackbind
2015-03-09 10:16:14 +08:00
pipu
fadac31868
Serialize and parse attribute "inner speed" for ProjectNode.
2015-03-05 15:48:17 +08:00
pipu
010a077fa8
To reconstruct callback binding for nest node as WidgetCallBackHandlerProtocol in CSLoader.
2015-03-04 17:29:40 +08:00
Ray
83a7b8012c
3DParticle Reader and tests
2015-02-26 09:19:14 +08:00
Ray
c66a4f28bc
Add CocosStudio UserCameraReader
...
fix Sprite3DReader Test
2015-02-25 14:19:08 +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
kompjoefriek
89152b2856
Tabs to spaces
...
Changed indenting tabs to spaces
2015-01-29 10:40:00 +01:00
kompjoefriek
0c70660551
Fixed warnings
...
- signed/unsigned mismatch
- printing enum with %d
- using int as bool
2015-01-29 01:36:22 +01:00
andyque
ac3d79a516
add constructor to AnimationInfo
2015-01-28 16:59:27 +08:00
geron-cn
df10a974fa
fix projectnode
2015-01-27 23:19:27 +08:00
minggo
15bf919000
Merge pull request #10231 from geron-cn/fixanimationlistclone
...
FIX BUG: animationinfos lost after actiontimeline clone
2015-01-27 15:24:25 +08:00
geron-cn
390c336a19
FIX animationfio lost after actiontimeline clone
2015-01-27 12:04:14 +08:00
geron-cn
a1a7273436
fix bug: fix crash when lack of projected file
2015-01-26 21:20:26 +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
c0a662ff13
Modify bug that parses AnchorPointFrame.
2015-01-22 11:20:01 +08:00
geron-cn
2fc79e2da5
ProjectNode's actiontimeline should jump to 0 frame when after nest into another csd
2015-01-21 15:21:23 +08:00
geron-cn
ab2b86b392
rename variables
2015-01-14 13:02:30 +08:00
pipu
a20cc2b151
Modify that parses plist for cocostudio editor simulator.
2015-01-13 11:12:28 +08:00
pipu
532269c44e
fix bug: cut inner timeline action as outer timeline action's length
2015-01-13 11:07:06 +08:00
pipu
c7a923b658
Update method clone() for InnerActionFrame.
2015-01-12 17:59:30 +08:00
pipu
d364a329db
Merge branch 'v3' into parse_inneractionframe
2015-01-12 14:26:05 +08:00
pipu
7e83336af8
Update InnerActionFrame.
2015-01-12 13:54:17 +08:00
jianglong0156
4cc0dd129a
issue cocos2d/cocos2d-js #2563 : ActionTimelineData need to use its constructor in jsb code. So i modify the constructor to public
2015-01-12 11:57:03 +08:00
pipu
6237115fbf
Fixes bug that clone InnerActionFrame.
2015-01-12 11:09:19 +08:00
pipu
78b32332d3
Parse InnerActionFrame, AlphaFrame, modify cocostudio editor version number.
2015-01-12 10:55:15 +08:00
youyou
1d7a4a5c05
fixed event frame will go twice loop when goto frame
2015-01-09 10:24:38 +08:00
yusheng.lu
ec540fcaa2
Update the reader-get link to http://www.cocos2d-x.org/filedown/cocos-reader
2015-01-05 13:26:46 +08:00
yusheng.lu
a7fb75dc7d
Update the description when the csb reader version dismatches the reader version in Cocos2d-x
2015-01-04 19:12:19 +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
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
geron-cn
70eef1f660
fix play
2014-12-25 17:45:14 +08:00
geron-cn
490b33405d
Merge branch 'v3' of github.com:cocos2d/cocos2d-x into v3_actionline_animationlist
2014-12-25 17:37:05 +08:00
geron-cn
79e5341742
remove animation list binary parse
2014-12-25 17:22:49 +08:00
youyou
f678d1027c
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3
...
Conflicts:
cocos/editor-support/cocostudio/ActionTimeline/CSLoader.cpp
2014-12-25 12:09:31 +08:00
youyou
db6ffd7962
Merge branch 'v3' of https://github.com/2youyouo2/cocos2d-x ; branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3
2014-12-24 15:59:50 +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
kaile.yin
942abfc654
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3
...
Conflicts:
cocos/2d/libcocos2d.vcxproj.filters
2014-12-24 10:53:09 +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
1e05361873
ios/mac project compeleted
2014-12-22 20:08:27 +08:00
youyou
70052b2a3f
support animation list
2014-12-22 18:57:48 +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
minggo
6ac611bd1d
Merge pull request #9573 from pipu/update_parse_resource_path
...
Update that parse resource path with flat buffers for readers
2014-12-22 15:11:24 +08:00
minggo
20beb3b9e0
Merge pull request #9567 from joewan/v3-improve-perf
...
fix serious performance problem of Animate.
2014-12-22 14:57:26 +08:00
pipu
0c6e22dd77
Update that parse resource path with flat buffers for readers
2014-12-22 13:42:18 +08:00
kaile.yin
a8dd2a4e80
Merge branch 'v3' of https://github.com/2youyouo2/cocos2d-x into v3
2014-12-22 11:15:07 +08:00
kaile.yin
b924dafe83
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3
...
Conflicts:
cocos/2d/libcocos2d.vcxproj.filters
tests/cpp-tests/Classes/ExtensionsTest/CocoStudioActionTimelineTest/ActionTimelineTestScene.cpp
2014-12-22 11:14:31 +08:00
joewanchen
c2473b9b99
fix.
2014-12-21 01:03:30 +08:00
minggo
b3731fa06a
Merge pull request #9486 from 2youyouo2/v3_EventFrame
...
fixed frame event
2014-12-16 09:53:43 +08:00
youyou
69824ff07b
add space for readable
2014-12-15 09:36:21 +08:00
Vladimir Timofeev
be01bede63
Fix couple of warnings. Make forward declarations to match to real declarations.
2014-12-14 21:04:14 +03: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
youyou
579bb3f8d8
fixed frame event
2014-12-12 18:02:03 +08:00
pipu
accf66c49f
Update that serialize plist file name
2014-12-11 19:15:04 +08:00
pipu
6b6fe4129d
Update Reader
2014-12-10 12:36:14 +08:00
youyou
41c86de0d4
update csloader
2014-12-09 22:13:17 +08:00
kaile.yin
9fdd8cee06
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3
...
Conflicts:
cocos/editor-support/cocostudio/ActionTimeline/CSLoader.cpp
2014-12-09 16:03:33 +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
c3365a4654
Add interface that create node with flat buffers object for simulator
2014-12-08 14:32:33 +08:00
kaile.yin
1db2bf89e0
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3
2014-12-05 14:42:25 +08:00
youyou
0235c4c377
change head file
2014-12-05 00:10:42 +08:00
pipu
56f7895e27
Modify bugs for flatbuffers
2014-12-04 20:38:46 +08:00
kaile.yin
9f9c4782f1
change file name
2014-12-04 18:51:32 +08:00
kaile.yin
a6653c7d8d
change name
2014-12-04 18:50:00 +08:00
kaile.yin
743166f50b
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3
...
Conflicts:
cocos/editor-support/cocostudio/ActionTimeline/CSLoader.cpp
tests/cpp-tests/Classes/ExtensionsTest/CocoStudioActionTimelineTest/ActionTimelineTestScene.cpp
2014-12-04 15:32:25 +08:00
kaile.yin
9d49f82eb9
Merge branch 'v3' of https://github.com/2youyouo2/cocos2d-x into v3
...
Conflicts:
tools/tolua/cocos2dx.ini
2014-12-03 16:00:32 +08:00
kaile.yin
fd69a5efc3
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3
2014-12-03 15:22:46 +08:00
pipu
ec978905d7
Modify that load .csb file serialized by flat buffers
2014-12-03 10:54:16 +08:00
pipu
22b044805c
Add callback parse
2014-12-01 21:50:05 +08:00
pipu
584c7dc7c6
Delete that use protocol buffers
2014-12-01 12:46:29 +08:00
pipu
ce3ca169d7
Modify that calls createNodeFromProtocolBuffers() for CSLoader
2014-11-27 17:23:22 +08:00
pipu
e38da9f9b6
Add callback framework using flat buffers
2014-11-27 16:49:19 +08:00
pipu
889f84e540
newest v3 flatbuffers
2014-11-26 13:29:23 +08:00
kaile.yin
2a86677619
fixed setCurrentFrame
2014-11-24 10:49:22 +08:00
youyou
966100a511
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3
2014-11-24 10:35:51 +08:00
pipu
f3cb80d8f6
Add flat buffers reader and serialize
2014-11-21 15:15:38 +08:00
youyou
769b2cbc75
add file to mac project
2014-11-19 20:06:10 +08:00
kaile.yin
d764c18271
update Android.mk
2014-11-19 10:57:22 +08:00
kaile.yin
bbd971d910
create ActionTimelineNode
2014-11-17 21:05:20 +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
峰 正博
828715ab8b
;; -> ;
2014-11-04 11:54:48 +09:00
峰 正博
29779a4604
modiry document->Parse((char*)pByte); to document->Parse((const char*)pByte);
2014-11-04 11:51:00 +09:00
峰正博
85fb2c91ab
fix memory leak cocos studiov2.0 engine v3.3
2014-11-04 01:25:58 +09:00
minggo
d0edba2db3
Merge pull request #8975 from 2youyouo2/v3_EventFrame
...
update event frame
2014-10-31 10:32:53 +08:00
kyokomi
2b4cf9ae59
bugfix: setting forget the contentSize.
2014-10-29 19:38:12 +09:00
kaile.yin
dd517813a8
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_EventFrame
2014-10-25 23:02:38 +08:00
kaile.yin
0f184a4982
add arriving last frame event
2014-10-23 17:38:04 +08:00
kaile.yin
e7de544231
1.fixed frame event may forword emit
2014-10-23 17:37:18 +08:00
minggo
47697daf03
remove unneeded codes
2014-10-21 17:28:14 +08:00
minggo
db8dc25b01
fix warning
2014-10-21 11:40:34 +08:00
minggo
f224f275ec
Merge pull request #8851 from pipu/#8838
...
Fixed #8838
2014-10-20 15:14:07 +08:00
minggo
49bd79d14a
Merge pull request #8853 from 2youyouo2/v3_EventFrame
...
fixed emit frame event
2014-10-20 13:57:38 +08:00
pipu
50a8f9f3fb
Modify that parse "AnchorPointFrame"
2014-10-20 12:43:01 +08:00
pipu
8072328ca6
Modify that record path of .csb file
2014-10-20 11:56:48 +08:00
kaile.yin
400cceeae8
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_EventFrame
2014-10-20 10:18:29 +08:00
youyou
03ebe0152b
fixed timeline loop
2014-10-19 21:32:23 +08:00
kaile.yin
5b0e2f0304
fixed emit last frame several times
2014-10-17 20:43:01 +08:00
pipu
1c187a4653
Modify reader in order to parse attribute "Plist"
2014-10-17 16:35:17 +08:00
minggo
ec4d83b646
Merge pull request #8738 from pipu/v3_Modify_Reader
...
Modify Reader:
2014-10-17 09:35:07 +08:00
pipu
20cb663746
Delete the blank block
2014-10-16 19:02:39 +08:00
kaile.yin
7faf2fe1e6
set tag for ActionTimeline
2014-10-16 18:14:58 +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
752eb839c7
Add protocolbuf.a
2014-10-09 18:28:09 +08:00
minggo
3679d66c8e
remove unneeded includes
2014-08-29 15:39:52 +08:00
minggo
6a8270f33b
Merge pull request #7900 from minggo/setposition-optimize
...
not create Vec as possible for setting position
2014-08-28 14:31:54 +08:00
minggo
9fb977ff99
not create Vec as possible for setting position
2014-08-28 11:41:18 +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
kaile.yin
d884054ec9
remove cascade color for CorlorFrame
2014-08-19 15:19:47 +08:00
kaile.yin
3dcdb1cde4
remove some update condition of Frame::apply function
2014-08-01 14:40:42 +08:00
kaile.yin
170e1a5d7b
init widget properties
2014-07-31 17:48:45 +08:00
minggo
2e56a4ce21
Merge pull request #7546 from nutty898/v3_nutty_modifynodereader
...
Fixed bug of NodeReader
2014-07-22 18:34:36 +08:00
cai wenzhi
d14522880d
Fixed bug of NodeReader
2014-07-21 22:45:33 +08:00
zhangcheng
6cfc5b72dc
1. CocosStudio adapt to cocos2d-x v3.2.
2014-07-21 17:45:56 +08:00
zhangcheng
8bf4c8b6c9
1. Fixes CCTimeLine warning.
...
2. Fixes CocoLoader warning.
3. Fixes TriggerTest Bug.
2014-07-15 18:07:33 +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
kaile.yin
d5a79f17ab
fixed set color to parent, it will effect its children
2014-07-08 10:13:15 +08:00
andyque
4e63a3da7d
modify nodeReader to support LabelAtlas and LabelBMFont
2014-07-01 10:11:36 +08:00
2youyou2
b76127231c
add gotoFrameAndPlay and setCurrentFrame interface
2014-06-30 15:53:12 +08:00
minggo
76e2540fd7
Merge pull request #7163 from darkdukey/fixNodeReader
...
Fix NodeReader crash
2014-06-24 10:49:10 +08:00
minggo
fc7b42c0e5
Merge pull request #7157 from 2youyouo2/v3
...
update action timeline
2014-06-23 18:38:46 +08:00
andyque
d2680f2884
fix windows compile error
2014-06-23 18:29:23 +08:00
andyque
87455b0ecb
add constness to some function
2014-06-23 10:12:54 +08:00
Nite Luo
21330860a9
Fix NodeReader will crash when encountered unknown NodeType
2014-06-20 17:24:34 -07:00
yinkaile
1aa07906a1
add new line at the end of the file
2014-06-20 11:36:48 +08:00
yinkaile
510bc23b16
1.fixed action may shake a little
...
2.fixed frame event will emit even they do not in current play section
2014-06-20 11:23:26 +08:00
yinkaile
043c640037
fixed warning and logic error
2014-06-20 10:52:14 +08:00
2youyou2
0ce51162af
support Label widget
2014-06-19 14:11:37 +08:00
2youyou2
b323f5772e
optimize frame
2014-06-18 14:21:33 +08:00
2youyou2
719fdb712d
add frame event test
2014-06-18 11:22:38 +08:00
2youyou2
806d74b6f9
add change play section test
2014-06-17 15:57:30 +08:00
2youyou2
c221a59954
fixed frame's value not right when enter frame
2014-06-17 15:57:06 +08:00
2youyou2
d2a6782a9e
fixed start frame not right
2014-06-17 11:45:57 +08:00
2youyou2
02363c2ae4
read visible property
2014-06-16 17:20:59 +08:00
2youyou2
f9a817a2bf
read flip property
2014-06-16 15:19:58 +08:00