12 Commits

Author	SHA1	Message	Date
James Chen	a14df8d28d	issue #2271: Fixing some memory leaks.	2013-06-10 11:43:43 +08:00
James Chen	b0669b4f7d	[Tizen] Updating project configurations.	2013-06-09 18:56:22 +08:00
James Chen	3632693cd9	Reverting TestCpp/AppDelegate.cpp to use config file. But modify it to a suitable value.	2013-06-09 16:09:56 +08:00
James Chen	132fd591c1	[TestCpp] Commenting the line of loading configuration file in TestCpp.	2013-06-09 15:29:51 +08:00
James Chen	93ecfbbf7e	Merge branch 'master' of https://github.com/2youyouo2/cocos2d-x into nacl-fix	2013-06-08 15:42:41 +08:00
Ricardo Quesada	428711482e	Adds missing config files for CCConfiguration ... ...and add functionality on the Director to override the default values from the config file. Supported values: - cocos2d.x.fps - cocos2d.x.display_fps - cocos2d.x.gl.projection - cocos2d.x.texture.pixel_format_for_png - cocos2d.x.texture.pvrv2_has_alpha_premultiplied If the "config.plist" file is not present, or some keys are not present, the default values are going to be used IMPORTANT: The folder "samples/Cpp/TestCpp/Resources/configs" needs to be added in the Android, Linux, Win32 projects. Already added in OS X and iOS Xcode projects.	2013-06-06 12:23:44 -07:00
yinkaile	3cfba7bc9a	Merge branch 'master' of https://github.com/cocos2d/cocos2d-x ... Conflicts: extensions/Android.mk extensions/proj.win32/libExtensions.vcxproj.filters samples/Cpp/TestCpp/Android.mk samples/Cpp/TestCpp/Classes/ExtensionsTest/ExtensionsTest.cpp	2013-06-06 12:35:18 +08:00
yinkaile	245b0395b1	1.upload CCArmature	2013-06-06 12:02:54 +08:00
Lee, Jae-Hong	6289a20fcb	Adding design size for Tizen.	2013-05-16 20:23:21 +09:00
James Chen	2694cb150b	CCFileUtils::s|gSearchPath -> CCFileUtils::s\gSearchPaths.	2013-01-29 09:56:38 +08:00
James Chen	e736ed487f	issue #1683: Adding default search path if developer didn't pass it.	2013-01-28 17:44:53 +08:00
James Chen	4660e72eda	issue #1603: Moved the position of some projects.	2012-12-20 12:58:21 +08:00