116 Commits

Author	SHA1	Message	Date
boyu0	e07c4ffec1	Change NULL to nullptr, edit hungarian notation.	2013-12-18 17:47:20 +08:00
Huabing.Xu	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
James Chen	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
Huabing.Xu	5509bd48ef	remove _grid	2013-12-12 16:21:21 +08:00
Ricardo Quesada	81b06f06a9	Merge branch 'develop' into newRenderer ... Conflicts: cocos/2d/CCAtlasNode.h	2013-12-05 22:24:41 -08:00
Ricardo Quesada	f68dcd9969	Merge branch 'develop' into newRenderer ... Conflicts: build/cocos2d_libs.xcodeproj/project.pbxproj samples/Cpp/TestCpp/Classes/tests.h	2013-12-05 11:47:46 -08:00
minggo	b67d567a79	replace long with int or ssize_t	2013-12-05 17:22:22 +08:00
Nite Luo	ae551ae294	Convert RenderTexture to use RenderCommands	2013-12-04 11:54:57 -08:00
James Chen	1d5984b29a	issue #2790: Vector::makeObjectsPerformCallback —> Vector::forEach	2013-12-04 16:01:02 +08:00
James Chen	90062b656d	issue #2790: Node::_children is Vector<Node*> now.	2013-12-04 16:00:17 +08:00
Ricardo Quesada	a583ad461f	CCControlButton has protected constructor	2013-11-14 17:19:16 -08:00
Huabing.Xu	b726c6fd2c	issue #3025: move VolatileTexture static function to VolatileTextureMgr	2013-11-08 16:47:33 +08:00
Ricardo Quesada	ba7ed6e578	Fixes some compiler warnings ... The warnings are related to: * 64-to-32-bit conversion * shadow variables	2013-11-04 16:31:36 -08:00
James Chen	1f3863e787	Event Dispatcher refactor commit. TestCpp could run.	2013-10-25 10:53:45 +08:00
minggo	95acb1b9e3	issue #2905: helloworld build ok on android	2013-10-14 14:01:00 +08:00
minggo	49d7bbd600	issue #2905: remove sub folders except platform	2013-10-12 15:41:45 +08:00