CaiWenzhi
|
26a7f3474c
|
Modify reader
|
2013-12-26 21:02:47 +08:00 |
CaiWenzhi
|
ad535e2fcb
|
Add listview and pageview reader
|
2013-12-26 17:53:22 +08:00 |
CaiWenzhi
|
3206727b9c
|
Modify actionnode
|
2013-12-26 17:01:31 +08:00 |
CaiWenzhi
|
eaef723bd7
|
Remove C cast
|
2013-12-25 22:13:19 +08:00 |
CaiWenzhi
|
570b6c95a7
|
Merge branch 'develop' into develop_nutty_modify_framework_newrender
|
2013-12-25 17:29:30 +08:00 |
James Chen
|
142b189305
|
Some warning fixes.
|
2013-12-25 16:06:39 +08:00 |
James Chen
|
538da31773
|
Removes CC prefix for CCSkeleton and CCSkeletonAnimation. Adds namespace `sp` for JSBindings.
|
2013-12-25 11:18:14 +08:00 |
CaiWenzhi
|
2ae8576e0f
|
Merge branch 'develop' into develop_nutty_modify_framework_newrender
|
2013-12-25 10:40:05 +08:00 |
CaiWenzhi
|
0dac69523c
|
Remove "_renderer" from widget
|
2013-12-24 20:22:14 +08:00 |
James Chen
|
0ff85852cc
|
Don’t use FileUtils::getInstance()->getFileData, please use getStringFromFile and getDataFromFile instead.
|
2013-12-24 18:08:40 +08:00 |
James Chen
|
d33b2c41c7
|
Merge branch 'develop' into data-refactor
Conflicts:
tools/tolua/cocos2dx.ini
|
2013-12-24 16:24:17 +08:00 |
James Chen
|
451d76f6b0
|
Merge pull request #4611 from dumganhar/spine-test
Merge PR #4572, Spine JS test support.
|
2013-12-23 22:55:58 -08:00 |
yinkaile
|
67c3480320
|
change std::string.compare() to ==
|
2013-12-24 14:21:25 +08:00 |
yinkaile
|
44e22584a4
|
fixed getFileData
|
2013-12-24 13:35:46 +08:00 |
yinkaile
|
ff053e71fe
|
change std::string compare method
|
2013-12-24 11:05:53 +08:00 |
CaiWenzhi
|
3885477276
|
Remove CCDictionary from GUIReader
|
2013-12-24 10:41:01 +08:00 |
James Chen
|
6bbc6e2dde
|
CCSkeleton is inherited from Node now.
|
2013-12-23 21:12:58 +08:00 |
CaiWenzhi
|
9aa85d2bd6
|
Remove NodeRGBA inherit
|
2013-12-23 15:02:52 +08:00 |
yinkaile
|
ba809a0096
|
change const char* to const std::string&
|
2013-12-23 14:05:46 +08:00 |
yinkaile
|
87103434e3
|
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop
|
2013-12-23 09:30:14 +08:00 |
James Chen
|
21a9f05110
|
Merge branch 'develop' of git://github.com/cocos2d/cocos2d-x into data-refactor
Conflicts:
cocos/2d/CCUserDefault.cpp
cocos/2d/CCUserDefault.mm
cocos/2d/CCUserDefaultAndroid.cpp
cocos/2d/ZipUtils.cpp
cocos/2d/platform/CCFileUtils.h
cocos/2d/platform/CCSAXParser.cpp
|
2013-12-20 21:12:11 +08:00 |
James Chen
|
ab7a273354
|
closed #3465: New spine runtime support, update CMakeLists.txt
|
2013-12-20 20:18:32 +08:00 |
James Chen
|
0db2067f97
|
Merge branch 'develop' of git://github.com/cocos2d/cocos2d-x into new-spine
|
2013-12-20 20:11:41 +08:00 |
yinkaile
|
4f003da8cb
|
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop
|
2013-12-20 10:53:37 +08:00 |
James Chen
|
e56a4a7c00
|
Merge pull request #4567 from dumganhar/for_each-gone
All std::for_each has gone. uses for(const auto& ...) instead.
|
2013-12-19 18:50:50 -08:00 |
minggo
|
756f8f7a11
|
Merge pull request #4482 from dabingnn/develop_gridNode
Develop grid node
|
2013-12-19 18:30:42 -08:00 |
James Chen
|
34382b4a8a
|
More std::for_each —> for(const auto& …)
|
2013-12-20 09:54:50 +08:00 |
Ricardo Quesada
|
59fee6b8d2
|
replaces std::for_each with for()
replaces `std::for_each` with C++11 `for( : )`
|
2013-12-19 13:34:41 -08:00 |
Ricardo Quesada
|
99ae4d86d3
|
fixes compiler warnings
* converts some `int` to `ssize_t`
* adds `const` to `title()` and `subtitle()`
|
2013-12-19 12:23:42 -08:00 |
James Chen
|
cfec4d5b7e
|
Updates spine test.
|
2013-12-19 21:35:43 +08:00 |
yinkaile
|
c58963bd45
|
add support for tweenRotate property
|
2013-12-19 21:12:25 +08:00 |
James Chen
|
df85ba8fd9
|
Merge commit 'refs/pull/4545/head' of git://github.com/cocos2d/cocos2d-x into new-spine
Conflicts:
cocos/editor-support/spine/CCSkeleton.h
|
2013-12-19 21:07:24 +08:00 |
James Chen
|
ec0bdf06af
|
Merge pull request #4555 from 2youyouo2/develop
fixed armature position not right
|
2013-12-19 05:05:25 -08:00 |
yinkaile
|
b367896f94
|
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop
|
2013-12-19 20:50:27 +08:00 |
Huabing.Xu
|
d51ad36613
|
Merge branch 'develop' into develop_gridNode
* develop: (67 commits)
Adds const in ShaderTest2.h
Skew works again!
[AUTO] : updating submodule reference to latest autogenerated bindings
[AUTO] : updating submodule reference to latest autogenerated bindings
Reverts submodule.
Updates submodule of bindings-generator.
Adds `std::for_each` test in invocation
Reverts bindings-generator.
fixed not render
iterator in Sprite fixes
update vs project for removes unneeded files
getNodeToParentTransform fixes
Node cleanup
[AUTO] : updating submodule reference to latest autogenerated bindings
Improves SpriteTest
[AUTO] : updating submodule reference to latest autogenerated bindings
Android and Linux fixes
removes `using namespace std` from header file
Removes unneeded files
change play arguments
...
Conflicts:
cocos/2d/CCNode.cpp
samples/Cpp/TestCpp/Classes/ExtensionsTest/CocoStudioArmatureTest/ArmatureScene.cpp
|
2013-12-19 17:20:22 +08:00 |
boyu0
|
ef54ed3c15
|
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into HEAD
Conflicts:
cocos/2d/CCLabel.cpp
cocos/2d/CCLabel.h
cocos/2d/CCLabelBMFont.cpp
cocos/2d/CCLabelBMFont.h
cocos/2d/CCLayer.cpp
cocos/2d/CCLayer.h
cocos/2d/CCNode.cpp
extensions/GUI/CCControlExtension/CCControl.cpp
extensions/GUI/CCControlExtension/CCControlButton.cpp
extensions/GUI/CCControlExtension/CCScale9Sprite.cpp
tools/tojs/cocos2dx.ini
|
2013-12-19 17:05:59 +08:00 |
yinkaile
|
140bd2ecad
|
fixed armature position not right
|
2013-12-19 15:43:32 +08:00 |
James Chen
|
75b5edb66c
|
Merge commit 'refs/pull/4532/head' of git://github.com/cocos2d/cocos2d-x into armature-test
|
2013-12-19 11:16:03 +08:00 |
yinkaile
|
a6a432d2a2
|
fixed not render
|
2013-12-19 10:42:06 +08:00 |
Ricardo Quesada
|
89701f5006
|
getNodeToParentTransform fixes
Code is cleaner.
`Armature` calls parent to reduce code.
[]: Skew is still not working properly
|
2013-12-18 18:00:55 -08:00 |
byeonggee.seo
|
e673bd80bb
|
new spine runtime applied
|
2013-12-19 10:50:37 +09:00 |
yinkaile
|
93eaf44e9c
|
Merge branch 'develop' into Array
Conflicts:
cocos/scripting/auto-generated
|
2013-12-19 09:42:21 +08:00 |
Ricardo Quesada
|
8390e7eadb
|
Node cleanup
Uses "normal" interation without the lambda to prevent another object in the stack.
removed unused code.
|
2013-12-18 16:56:59 -08:00 |
Ricardo Quesada
|
d1b555614e
|
removes `using namespace std` from header file
... in order to prevent possible collisions.
`using namespace XXX` MUST never be used in header files.
|
2013-12-18 11:45:30 -08:00 |
yinkaile
|
324732b867
|
change play arguments
|
2013-12-18 23:29:54 +08:00 |
yinkaile
|
7be834ea37
|
change play arguments
|
2013-12-18 22:57:18 +08:00 |
yinkaile
|
57c33e0604
|
fixed compile error
|
2013-12-18 22:36:10 +08:00 |
yinkaile
|
d3a575e8cc
|
change for iterator and callfunc
|
2013-12-18 22:07:33 +08:00 |
yinkaile
|
026811ca59
|
Merge branch 'develop' into Array
Conflicts:
cocos/scripting/auto-generated
tools/bindings-generator
|
2013-12-18 22:03:16 +08:00 |
James Chen
|
0695e32fff
|
Some warning fixes in SocketIO, ContriolButton, js_manual_conversion.h/.cpp.
|
2013-12-18 15:40:31 +08:00 |