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 |
konopka
|
0387b13bb6
|
Adding missing virtual keywords
|
2015-03-16 16:39:43 +01:00 |
konopka
|
7fb79272ca
|
Undo changes that are not allowed by spine license
|
2015-03-16 16:35:41 +01:00 |
pipu
|
a5e9ebc4e6
|
Fix parse action tag for widget.
|
2015-03-16 20:04:59 +08:00 |
Martin Konopka
|
2c80b6ae3a
|
Get rid of compiler warnings: 'func' overrides a member function but is not marked 'override' [-Winconsistent-missing-override]
|
2015-03-15 00:10:08 +01: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 |
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
|
7515fc78f5
|
To set csd version for serializing.
|
2015-03-12 16:15:17 +08: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 |
m2q1n9
|
c97742072f
|
fix cocostudio anchor point bug
fix a bug which will cause anchor point config not work
|
2015-03-09 14:30:41 +08:00 |
pipu
|
c21538e6e2
|
Merge branch 'v3' into reconstruct_parse_callbackbind
|
2015-03-09 10:38:02 +08:00 |
pipu
|
1fa9b2577a
|
Merge branch 'v3' into reconstruct_parse_callbackbind
|
2015-03-09 10:16:14 +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 |
pipu
|
010a077fa8
|
To reconstruct callback binding for nest node as WidgetCallBackHandlerProtocol in CSLoader.
|
2015-03-04 17:29:40 +08:00 |
Dale Stammen
|
fd11984e0a
|
disable LTCG
|
2015-02-27 11:21:36 -08:00 |
Dale Stammen
|
e4db9f396e
|
disable LTCG. set warning level to W3
|
2015-02-27 11:16:40 -08:00 |
Dale Stammen
|
f68a966485
|
disabled Check SDL to allow CC_DEPRECATED to work as warning and not error
|
2015-02-27 11:07:51 -08:00 |
Dale Stammen
|
b5e936c657
|
disabled LTCG to speed up release builds
|
2015-02-27 10:43:13 -08:00 |
Dale Stammen
|
2eb919bb7a
|
disabled Check SDL to allow CC_DEPRECATED to work as warning and not error
|
2015-02-27 10:36:48 -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 |
minggo
|
c2479adc59
|
Merge pull request #10549 from mogemimi/fix-typo
Fix typo in Image::Format
|
2015-02-25 09:32:58 +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 |
mogemimi
|
d384f7ce1e
|
Fix typo: unkown -> unknown
|
2015-02-24 02:39:50 +09:00 |
Ray
|
c5cc1ebaa2
|
fix test project
|
2015-02-23 16:35:46 +08:00 |
Ray
|
fbe9e5b767
|
complate project file
|
2015-02-23 00:52:50 +08:00 |
Ray
|
35e3e8d62d
|
Sprite3D Reader and tests
|
2015-02-23 00:34:30 +08:00 |
Ray
|
8eb201797d
|
工程文件修改
|
2015-02-19 17:52:50 +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 |
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
|
f09626bcfb
|
Merge pull request #10235 from pipu/modify_parse_ignoresize
Modify that parse ignoreSize for TextAtlas, TextBMFont.
|
2015-01-27 18:44:01 +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 |
pipu
|
ed1b7edce7
|
Modify that parse ignoreSize for TextAtlas, TextBMFont.
|
2015-01-27 15:09:48 +08:00 |
geron-cn
|
390c336a19
|
FIX animationfio lost after actiontimeline clone
|
2015-01-27 12:04:14 +08:00 |
geron-cn
|
d3baae0304
|
Merge branch 'v3' of github.com:cocos2d/cocos2d-x into fixProjectNodeLoader
|
2015-01-26 21:21:31 +08:00 |
geron-cn
|
a1a7273436
|
fix bug: fix crash when lack of projected file
|
2015-01-26 21:20:26 +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
|
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 |
yusheng.lu
|
f274277367
|
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_version_1
|
2015-01-20 14:35:15 +08:00 |
pipu
|
ea84ae78dc
|
Invoke FileUtils::getInstance()->getStringFromFile() instead of FileUtils::getInstance()->getFileData().
|
2015-01-19 17:16:26 +08:00 |
yusheng.lu
|
5dc87f49b0
|
Moved the version pair to 1st position of its map.
|
2015-01-19 14:42:43 +08:00 |
pipu
|
103fecf3ef
|
Fixes memory leaks of using FileUtils::getInstance()->getFileData() in FlatBuffersSerialize.cpp.
|
2015-01-19 11:45:20 +08:00 |
Nite Luo
|
4a440e66c9
|
Refactor draw command
|
2015-01-15 14:00:49 -08:00 |
minggo
|
d57ba984be
|
Merge pull request #9979 from geron-cn/inneractionframe
inneractionframe rename variables
|
2015-01-14 15:15:51 +08:00 |
geron-cn
|
ab2b86b392
|
rename variables
|
2015-01-14 13:02:30 +08:00 |
pipu
|
e31fe9565a
|
Modify that parses position type of ParticleSystemQuad.
|
2015-01-14 10:24:44 +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 |
minggo
|
7f5f3a2fd9
|
Merge pull request #9945 from jianglong0156/v3
issue cocos2d/cocos2d-js #2563 : cccomrender constructor
|
2015-01-12 21:13:01 +08:00 |
jianglong0156
|
5d781d7eb4
|
issue cocos2d/cocos2d-js #2563 : cccomrender need to use its constructor in jsb code. So i modify the constructor to public
|
2015-01-12 20:49:43 +08:00 |
pipu
|
aaccdef1eb
|
Modify cocos/editor-support/cocostudio/CMakeLists.txt.
|
2015-01-12 19:14:04 +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
|
3c992fe38c
|
Bug fix:When parsing a plist file as image mergin, if in fact the plist file is a particle, a crush will occur.
Now it's fixed.
|
2015-01-05 16:59:09 +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 |
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 |
minggo
|
f01cc596a3
|
Merge pull request #9637 from geron-cn/v3_actionline_animationlist
V3 actiontimeline animationlist
|
2014-12-26 16:05:49 +08:00 |
pipu
|
bc18bafaa7
|
Update that parse plist for CheckBoxReader.
|
2014-12-26 14:18:28 +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 |
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 |
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 |