18 Commits

Author	SHA1	Message	Date
Dhilan007	786b7d9912	update vs project for remove CCCamera.	2013-12-22 17:19:59 +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
Dhilan007	ffa6ad3cb2	update vs project for removes unneeded files	2013-12-19 10:24:50 +08:00
Dhilan007	2d9b7ee4fc	update vs project for new renderer and fix compiling fail on vs.	2013-12-18 14:36:49 +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
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	305e80030c	update Visual studio project file	2013-12-13 10:59:23 +08:00
James Chen	b520941c5c	Reverts config of VS project.	2013-12-05 16:37:50 +08:00
James Chen	2b857ebb52	Fixing compilation errors on windows.	2013-12-05 16:09:38 +08:00
boyu0	98779b0a9f	issue #2771: move CC_USE_PHYSICS from project definition to ccConfig.h	2013-12-04 14:36:32 +08:00
boyu0	2b43e72e7c	issue #2771: fix vs compile errors, change project setting	2013-11-27 17:33:33 +08:00
boyu0	04c8e9f34e	Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into iss2771_physical	2013-11-02 00:12:14 +08:00
boyu0	2efef34144	issue #2771: fix vs compile errors	2013-10-31 18:18:02 +08:00
Nite Luo	a27975763f	Add MouseEvent to win32 build	2013-10-31 00:04:39 -07:00
Dhilan007	f11dba586a	issue #2905:modification vs-project for folder structure change	2013-10-21 22:09:21 +08:00
Dhilan007	2865ad798b	issues #2905:Updating project configuration for folder change.	2013-10-15 10:18:37 +08:00
minggo	49d7bbd600	issue #2905: remove sub folders except platform	2013-10-12 15:41:45 +08:00