67 Commits

Author	SHA1	Message	Date
Huabing.Xu	0dab85a3bf	update CMakeLists.txt	2013-12-23 18:37:18 +08:00
Ricardo Quesada	fd8c7e9a5d	Removes CCCamera ... Not needed anymore.	2013-12-20 19:24:56 -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
Ricardo Quesada	b36d77b1c2	Android and Linux fixes	2013-12-18 12:07:51 -08:00
Ricardo Quesada	5c9b8db0cb	Updates project files file Linux and Android	2013-12-17 18:47:46 -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	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
James Chen	2a38d4fe94	issue #2171: Fixing compilation errors for Linux port.	2013-12-17 14:50:40 +08:00
Huabing.Xu	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
Dhilan007	39280d55f3	new label:add support for distanceField ... PerformanceTest:add performance test for label.	2013-12-13 12:42:15 +08:00
Huabing.Xu	a8a2ceb887	add linux make list	2013-12-13 12:25:17 +08:00
martell	06ff1bc594	Fixed HelloCpp Linking on Linux	2013-12-02 07:10:37 +00:00
martell	79401a7596	quickly added win32 cmake	2013-11-30 06:09:12 +00:00
James Chen	f3c40a3e7a	issue #3113: 32Bit fix and 13.10 32bit complication is ok.	2013-11-06 14:54:35 +08:00
James Chen	9be8ca3714	[cmake] output lib to root/lib	2013-11-04 21:03:08 +08:00
James Chen	daa91ad413	[CMake] Update library dependency.	2013-11-04 21:03:07 +08:00
James Chen	8676523433	Adding CMakeLists.txt	2013-11-04 21:03:07 +08:00