15 Commits

Author	SHA1	Message	Date
minggo	cd5bcb87af	issue #2284: merge master and fixed some conflicts	2013-06-13 17:54:05 +08:00
James Chen	47b2a65faf	[Template] Updating iOS template project of multi-platform-cpp.	2013-06-10 14:18:24 +08:00
James Chen	d5bbcce165	[iOS] Enabling multiple touch event for TestJavascript, multi-platform-js, multiplatform-lua.Disabling multiple touch event for multi-platform-cpp.	2013-06-06 18:09:44 +08:00
James Chen	6f52d72b82	[iOS] Enabling multiple touch event for TestJavascript, multi-platform-js, multiplatform-lua.Disabling multiple touch event for multi-platform-cpp.	2013-06-06 18:07:11 +08:00
James Chen	d32eaedd59	Removing CODE_SIGN_IDETITY section in prom.pbxproj. ... Conflicts: samples/Cpp/TestCpp/proj.ios/TestCpp.xcodeproj/project.pbxproj samples/Cpp/TestCpp/proj.mac/TestCpp.xcodeproj/project.pbxproj	2013-06-06 15:05:54 +08:00
James Chen	f22d320797	Removing CODE_SIGN_IDETITY section in prom.pbxproj.	2013-06-06 14:24:58 +08:00
minggo	d71e07db4e	fixed conflict	2013-06-05 13:48:31 +08:00
minggo	b0937a5a2d	issue #2257:change copyright of template	2013-06-05 11:25:39 +08:00
James Chen	bb635c280c	Updating multi-platform-xxx template for iOS and Android after enabling c++ 11.	2013-06-04 20:52:29 +08:00
James Chen	b88a222fc5	Updating multi-platform-xxx template for iOS and Mac.	2013-06-04 20:37:24 +08:00
James Chen	3b673547cc	Updating multi-platform-xxx template for iOS and Mac.	2013-06-04 19:49:03 +08:00
Jaroslaw Lewandowski	3f7c506638	Ability to save/retrieve CCData into/from CCUserDefault	2013-05-29 01:06:41 +01:00
James Chen	2c69ce8d80	fixed #2075: Updating multi-platform template project settings.	2013-04-24 15:56:37 +08:00
James Chen	4da388a2b6	issue #1733: Updated template projects. Using the same package name on iOS as which on Android. ... On iOS, org.cocos2d-x.HelloCpp -> org.cocos2dx.hellocpp.	2013-02-20 14:30:05 +08:00
James Chen	a54edec0e3	issue #1733: Adding "multi-platform-cpp" and "multi-platform-lua" projects to template folder.	2013-02-19 15:38:30 +08:00