67c3480320
change std::string.compare() to ==
2013-12-24 14:21:25 +08:00
ba809a0096
change const char* to const std::string&
2013-12-23 14:05:46 +08:00
756f8f7a11
Merge pull request #4482 from dabingnn/develop_gridNode
...
Develop grid node
2013-12-19 18:30:42 -08:00
99ae4d86d3
fixes compiler warnings
...
* converts some `int` to `ssize_t`
* adds `const` to `title()` and `subtitle()`
2013-12-19 12:23:42 -08:00
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
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
a6a432d2a2
fixed not render
2013-12-19 10:42:06 +08:00
93eaf44e9c
Merge branch 'develop' into Array
...
Conflicts:
cocos/scripting/auto-generated
2013-12-19 09:42:21 +08:00
7616edd9f3
Improves SpriteTest
...
Improves SpriteTest.
It is easier to see if Sprite works as SpriteBatchNode (and vice-versa).
Needed for the new renderer.
Also adds `const` to title() and subtitle()
2013-12-18 13:52:10 -08:00
324732b867
change play arguments
2013-12-18 23:29:54 +08:00
57c33e0604
fixed compile error
2013-12-18 22:36:10 +08:00
d3a575e8cc
change for iterator and callfunc
2013-12-18 22:07:33 +08:00
026811ca59
Merge branch 'develop' into Array
...
Conflicts:
cocos/scripting/auto-generated
tools/bindings-generator
2013-12-18 22:03:16 +08:00
7719c692b8
More warning fixes.
2013-12-18 16:03:07 +08:00
25fc3d3c2a
Merge branch 'develop' into develop_gridNode
...
* develop: (105 commits)
update armature to new render
iOS & Mac project fix.
[AUTO] : updating submodule reference to latest autogenerated bindings
use size_t replace unsigned int for record redeque::size returned value.
issue #2171 : Updates CMakeLists.txt.
issue #2171 : Binds New renderer classes, ignores NewTextureAtlas.
issue #2171 : Adds header files of renderer in cocos2d.h.
issue #2171 : Reorder renderer files for iOS & mac project.
issue #2171 : small fix in ccTypes.h
issue #2171 : Don’t ‘using namespace std;’ in header file.
[AUTO] : updating submodule reference to latest autogenerated bindings
issue #2171 : Ignores Director::getFrustum.
issue #2171 : Fixing compilation errors for Linux port.
issue #2171 : NULL —> nullptr for Android warning of CCBAnimationManager.cpp.
issue #2171 : [New Renderer] Fixing compilation errors for Android.
[Win32] fix argument type. - argument of interface is ssize_t.
Update AUTHORS [ci skip]
Update CHANGELOG [ci skip]
Add mouse scrolling support for extension test
issue #3341:fix Incorrect at TextureCache::addImageAsync for repeatedly execute for the same image
...
Conflicts:
cocos/2d/CCNode.cpp
cocos/2d/cocos2d.vcxproj.filters
samples/Cpp/TestCpp/Classes/ExtensionsTest/CocoStudioArmatureTest/ArmatureScene.cpp
2013-12-17 18:16:05 +08:00
6ff45b09e7
Merge branch 'newRenderer' into Array
...
Conflicts:
cocos/editor-support/cocostudio/CCArmature.cpp
cocos/editor-support/cocostudio/CCArmature.h
cocos/editor-support/cocostudio/CCBatchNode.cpp
cocos/editor-support/cocostudio/CCColliderDetector.cpp
cocos/scripting/auto-generated
tools/bindings-generator
2013-12-17 18:06:11 +08:00
bcb07abb7b
Merge pull request #4505 from 2youyouo2/newRenderer
...
update armature to new render
2013-12-17 01:43:07 -08:00
bc868cc004
update armature to new render
2013-12-17 17:00:01 +08:00
12cc6c6153
Merge branch 'develop' of git://github.com/cocos2d/cocos2d-x into iss2171-new-renderer
...
Conflicts:
cocos/2d/CMakeLists.txt
2013-12-17 15:50:24 +08:00
2a38a2c154
[Win32] fix argument type.
...
- argument of interface is ssize_t.
2013-12-17 15:11:37 +09:00
545000a213
Add mouse scrolling support for extension test
2013-12-16 17:40:34 +08:00
81cdbea9c8
change Array to Vector, Dictionary to Map
2013-12-16 14:34:09 +08:00
6aa2908c13
rename：
...
1. class: GridNode->NodeGrid
2. function: setNodeGrid->setGrid getNodeGrid->getGrid setGridTarget->setTarget
3. file: CCGridNode.h&cpp->CCNodeGrid.h&cpp
2013-12-16 14:21:05 +08:00
917bd8c3d9
change Array to Vector
2013-12-13 19:40:38 +08:00
0e8c3409e5
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop
...
Conflicts:
samples/Cpp/TestCpp/Classes/ExtensionsTest/CocoStudioArmatureTest/ArmatureScene.h
2013-12-13 16:28:50 +08:00
6a3aff0861
fixed change animation internal, animation speed not right
2013-12-13 15:58:58 +08:00
08bfbbc582
Fix project can not compile after rebased pull
2013-12-12 16:20:52 +08:00
349724b6fd
Fix ArmatureSceneTest Crash
2013-12-12 15:15:43 +08:00
a71394b122
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into bug3162_opacity_incorrect
2013-12-10 18:03:41 +08:00
d1d5659818
issue #2790 : Uses Vector<T> or Map<K, V> as many as possible for CCBReader.
2013-12-09 17:55:56 +08:00
a884a70045
fix2d compling warning
2013-12-09 13:56:07 +08:00
af5f496861
issue #3162 : Merge Node and NodeRGBA, fix bug: Child's opacity will not be changed when its parent's setCascadeOpacityEnabled was set to true and opacity was changed.
2013-12-06 18:07:16 +08:00
7e96701ef0
fixed create PhysicsSprite
2013-12-06 14:25:08 +08:00
e17b9d839b
1.add TEST_EASING
...
2.add play serveral movement function
3.update TEST_COLLIDER_DETECTOR
4.fixed movement event
2013-12-06 13:40:49 +08:00
940b0ffd56
Fix typos
2013-11-29 12:09:38 -05:00
5c74c938ee
Merge branch 'develop' into constructors_are_protected
...
Conflicts:
cocos/2d/CCLayer.h
2013-11-19 13:13:57 -08:00
c943702bc8
Merge branch 'develop' into constructors_are_protected
...
Conflicts:
cocos/editor-support/cocostudio/CCActionObject.cpp
samples/Cpp/TestCpp/Classes/PhysicsTest/PhysicsTest.h
2013-11-18 11:07:15 -08:00
c7932b6181
fixed ui anmation crash when stop animation
2013-11-19 00:57:22 +08:00
b281a2f06f
Hot fix:repalce unsigned int/int type of params with long to solve tableview bug
2013-11-18 15:55:58 +08:00
cd0ba6850c
Merge branch 'develop' into constructors_are_protected
2013-11-14 11:57:18 -08:00
6acf422f3b
fixed #3185 support for html5.
2013-11-14 17:03:45 +08:00
41975ba445
fixed #3185 ComponentTest and SceneTest NULL to nullptr.
2013-11-14 14:16:14 +08:00
14d51f9f35
fixed #3185
2013-11-14 13:28:42 +08:00
d590986e73
Constructors are protected
2013-11-13 15:55:36 -08:00
4f76141c41
optimize guireader
2013-11-11 18:22:14 +08:00
1f389d3779
Rename event interface
2013-11-08 18:43:06 +08:00
18f411fd1e
Merge branch 'develop' into develop_nutty_Mergemasterbranchtodevelopbranch
2013-11-08 11:36:59 +08:00
109adaf337
Merge pull request #4103 from luisparravicini/issue-2882
...
[ci skip]added | operator for Control::EventType
2013-11-07 18:59:33 -08:00
cbb9c655d9
fixed bugs
2013-11-07 21:10:48 +08:00
e2249c8c3f
Fixed crash
2013-11-07 17:15:52 +08:00
yinkaile