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 |
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 |
Liam
|
83fcf74882
|
update for code format
|
2014-12-24 10:56:01 +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
|
33bd5e3f4c
|
remove unused code
|
2014-12-23 20:36:18 +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
|
1e05361873
|
ios/mac project compeleted
|
2014-12-22 20:08:27 +08:00 |
yusheng.lu
|
02b9269cff
|
completed multiplatform projects
|
2014-12-22 19:39:10 +08:00 |
youyou
|
70052b2a3f
|
support animation list
|
2014-12-22 18:57:48 +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 |
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
|
8f3e9d9fb1
|
Merge pull request #9540 from pipu/avoid_crash_during_load_resource_with_flatbuffers
Update that avoid crash during load resource which serialize by flat buffers.
|
2014-12-19 09:58:26 +08:00 |
pipu
|
79acf80fb1
|
Update that avoid crash during load resource which serialize by flat buffers
|
2014-12-17 19:00:24 +08:00 |
minggo
|
9da1317f10
|
Merge pull request #9453 from sxd1140/v3
add stopActionByName()
|
2014-12-17 18:32:04 +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
|
6494a7abae
|
Hide tinyxml2 from user visible header.
|
2014-12-14 20:32:24 +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
|
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 |
Sxd
|
5f47bef320
|
add stopActionByName()
|
2014-12-11 02:57:13 +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 |
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 |
minggo
|
5ab4f16fb1
|
Merge pull request #9411 from pipu/v3_reader_update
V3 reader update
|
2014-12-09 13:44:55 +08:00 |
kaile.yin
|
cb509aa69f
|
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3
|
2014-12-09 13:33:39 +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 |
pipu
|
c3365a4654
|
Add interface that create node with flat buffers object for simulator
|
2014-12-08 14:32:33 +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 |
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
|
3f1cb4338a
|
Merge branch 'v3' of https://github.com/2youyouo2/cocos2d-x into v3
|
2014-12-04 15:33:38 +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 |
youyou
|
4af869fdeb
|
update make file
|
2014-12-03 18:47:41 +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 |
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 |
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
|
fc97a3d0c6
|
Modify serialize property "value" of VisibleFrame
|
2014-12-02 16:11:46 +08:00 |
pipu
|
22b044805c
|
Add callback parse
|
2014-12-01 21:50:05 +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
|
5d3d839886
|
Update Android.mk for cocostudio
|
2014-11-27 17:28:20 +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
|
e1c287d500
|
Modify that parse "actionTag" for WidgetReader
|
2014-11-27 12:12:29 +08:00 |
pipu
|
889f84e540
|
newest v3 flatbuffers
|
2014-11-26 13:29:23 +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 |
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
|
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
|
a689fc4c7e
|
sync with upstream
Conflicts:
CMakeLists.txt
|
2014-11-20 12:19:00 +03:00 |
minggo
|
340e21d57e
|
Merge pull request #9050 from joewan/fix-armature-spriteframe
fix sprite frame cache, and remove unnecessary headers dependencies.
|
2014-11-20 10:54:30 +08:00 |
youyou
|
769b2cbc75
|
add file to mac project
|
2014-11-19 20:06:10 +08:00 |