756f8f7a11
Merge pull request #4482 from dabingnn/develop_gridNode
...
Develop grid node
2013-12-19 18:30:42 -08:00
59fee6b8d2
replaces std::for_each with for()
...
replaces `std::for_each` with C++11 `for( : )`
2013-12-19 13:34:41 -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
0695e32fff
Some warning fixes in SocketIO, ContriolButton, js_manual_conversion.h/.cpp.
2013-12-18 15:40:31 +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
d16fa07661
Removes Vector<T>::forEach, please use std::for_each instead. The same as Vector<T>::sort.
2013-12-17 17:45:29 +08:00
2a38d4fe94
issue #2171 : Fixing compilation errors for Linux port.
2013-12-17 14:50:40 +08:00
c7d350c83e
Merge branch 'develop' into newRenderer
2013-12-16 20:43:43 -08:00
f797dea827
bug fix
2013-12-16 12:27:30 +08:00
b1eacd52cb
Merge branch 'develop' into develop_gridNode
...
* develop:
fix compile error related to ssize_t.
issue #2771 : add and change some physics API, and add more documents
[AUTO] : updating submodule reference to latest autogenerated bindings
Some fixes for XXX:getDescription.
Reverts CCSpriteBatchNode.h
size_t —> ssize_t in CCTMXLayer.cpp
issue #2771 : add PhysicsWorld function set/getUpdateRate and set/getSpeed. Change name PhysicsQueryRectCallbackFunc and PhysicsPointQueryCallbackFunc to PhysicsRectQueryCallbackFunc and PhysicsQueryPointCallbackFunc
Fix:Add lua binding of ’registerScriptHandler’、’unregisterScriptHandler’ and ’removeObjectAllHandlers’ of ScriptHandlerMgr and some constants define
[AUTO] : updating submodule reference to latest autogenerated bindings
More renames of description() to getDescription()
getDescription() works as expected
fix compiling error after fixing conflicts
fix compiling error after fixing conflicts
use ssize_t for index
use ssize_t for index and capacity
use ssize_t for capacity and index in containers
Fix:Remove some needless lua binding functions and resolve a bug
2013-12-16 10:43:49 +08:00
c15ad14ed3
Merge branch 'develop' of git://github.com/cocos2d/cocos2d-x into bug3162_opacity_incorrect
2013-12-16 03:45:06 +08:00
3838268fd0
Merge branch 'develop' into newRenderer
2013-12-14 19:28:01 -08:00
defae416f3
Merge branch 'develop' of git://github.com/cocos2d/cocos2d-x into bug3162_opacity_incorrect
2013-12-13 18:09:39 +08:00
4e2e423615
fix compile error related to ssize_t.
2013-12-13 17:53:03 +08:00
29a15c885a
Merge branch 'develop' into newRenderer
2013-12-12 11:44:09 -08:00
d7106d49be
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into bug3162_opacity_incorrect
2013-12-12 17:04:21 +08:00
5509bd48ef
remove _grid
2013-12-12 16:21:21 +08:00
16efe94946
fix compiling error after fixing conflicts
2013-12-12 14:48:27 +08:00
1e9c763b40
use ssize_t for index and capacity
2013-12-12 14:48:26 +08:00
cc567a3077
issue #2790 : Vector::remove —> Vector::erase.
2013-12-11 18:08:06 +08:00
00b115843c
issue #3162 : add updateColor function to Label and delete duplicate functions.
2013-12-11 16:38:47 +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
0222c6544e
Migration to Mat4x4
...
Armature not migrated yet
Signed-off-by: Ricardo Quesada <ricardoquesada@gmail.com>
2013-12-09 17:32:51 -08:00
f1fac73bb4
issue #2790 : Fix wrong include.
2013-12-07 16:14:00 +08:00
713d89b6d8
issue #2790 : Uses Vector<Invocation*> instead of CCArray* for CCControl. Uses std::unordered_map<int, Vector<Invocation*>*> instead of CCDictionary*.
2013-12-07 14:36:07 +08:00
d8061477c1
issue #2790 : Removes CCSort.h/.cpp from projects.
2013-12-07 14:21:01 +08:00
a12a101548
issue #2790 : Removes CCSorting.h/.cpp, uses Vector<T> for storing used and freed cells.
2013-12-07 14:17:47 +08:00
4d0e3dbd8d
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into bug3162_opacity_incorrect
2013-12-06 18:16:26 +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
1502fef7e4
use Schedule::performFunctionInCocosThread
2013-12-06 14:15:01 +08:00
499a0404d4
issue #2790 : Renames some functions in Vector<T>. Makes it more like stl vector.
2013-12-05 10:35:10 +08:00
18d604d349
issue #2790 : Bug fix in CCScale9Sprite.cpp. Sprite::Sprite::create --> Sprite::create
2013-12-04 16:02:54 +08:00
f6676bd7ef
issue #2790 : [] -> getObjectAtIndex.
2013-12-04 16:02:51 +08:00
1d5984b29a
issue #2790 : Vector::makeObjectsPerformCallback —> Vector::forEach
2013-12-04 16:01:02 +08:00
c78ce63f14
use ThreadHelper::runOnGLThread() in AssetsManager
2013-11-28 11:06:08 +08:00
a04c45f0d9
issue #3258 : Renames ControlSwitchSprite::createWithMaskSprite to ControlSwitchSprite::create.
2013-11-26 16:19:12 +08:00
b6ddc6d048
Uses std::unordered_map<> instead of std::map<>
...
and more fixes.
2013-11-21 13:43:59 -08:00
d3c44cbb0b
Merge branch 'develop' into constructors_are_protected
...
Conflicts:
cocos/2d/CCLayer.h
2013-11-20 11:23:03 -08:00
59c2647bd6
Prevents warning of invoking ScrollView::setTouchEnabled. Layer::setTouchEnabled should not be a virtual function.
2013-11-20 11:35:04 +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
b281a2f06f
Hot fix:repalce unsigned int/int type of params with long to solve tableview bug
2013-11-18 15:55:58 +08:00
208d25bdff
ControlSwitch compies
...
Uses procted constructor
2013-11-15 12:04:47 -08:00
a583ad461f
CCControlButton has protected constructor
2013-11-14 17:19:16 -08:00
cd0ba6850c
Merge branch 'develop' into constructors_are_protected
2013-11-14 11:57:18 -08:00
38eabaf315
fix warning
2013-11-14 14:09:12 +08:00
23b2bdb6eb
Merge pull request #4137 from HoGarfield/AssetsManager.uncompress
...
[ci skip]Adding test whether the file directory exists when uncompressing file entry,if does not exist then create directory
2013-11-13 18:39:42 -08:00
d590986e73
Constructors are protected
2013-11-13 15:55:36 -08:00
fb04c9e574
issue #2770 : fix some warning
2013-11-13 11:22:34 +08:00
b868c3f1dc
Merge pull request #4173 from minggo/remove-makefile
...
[ci skip]remove makefiles
2013-11-11 02:19:16 -08:00
minggo