10 Commits

Author	SHA1	Message	Date
Ed Bartley	3216995d4a	Merge branch 'master' into TexturePacker-SpriteSheetProtection	2013-05-08 10:22:14 -04:00
James Chen	3c39cb336c	Don't use "recursive" property to search header file in "cocos2d-x/external" folder for TestCpp project.	2013-05-08 11:23:05 +08:00
Ed Bartley	f89d39953e	Add PVR.CCZ encryption support to ZipUtils based upon http://www.codeandweb.com/texturepacker/contentprotection ... Add sample to TestCPP.	2013-04-25 13:40:49 -04:00
James Chen	2d1172814d	issue #2075: Adding spine editor support. Adding a new test 'SpineTest' in TestCpp, adding the parse code in "extensions/spine". It works only on iOS now.	2013-04-24 13:57:34 +08:00
James Chen	8b466f12a2	fixed #1838: Adding test for the new feature(Timeline callback & playing effect) of CocosBuilder.	2013-03-19 16:33:23 +08:00
James Chen	f69ef6182c	issue #1683: Adding FileUtilsTest.	2013-01-28 15:17:20 +08:00
James Chen	9ef74bef80	fixed #1636: Deleted CC_ENABLE_CHIPMUNK_INTEGRATION and CC_ENABLE_BOX2D_INTEGRATION in ccConfig.h since they are moved to extension, it doesn't depend on engine any more. ... Added platform macro for CCEditBoxImpl* files.	2013-01-05 11:10:24 +08:00
James Chen	7bcbcfa187	fixed #1636: Refactored CCEditBox for iOS, moved the implementation of EditBoxImplIOS.h/.cpp to CCEditBoxImplIOS.h/.cpp.	2013-01-05 10:56:57 +08:00
minggo	977046cc32	issue #1603:make some samples build ok on iOS	2012-12-20 17:20:10 +08:00
James Chen	4660e72eda	issue #1603: Moved the position of some projects.	2012-12-20 12:58:21 +08:00