13 Commits

Author	SHA1	Message	Date
johnangel	ad7dacc281	Merge remote branch 'upstream/gles20' into gles20	2012-10-08 16:35:43 +02:00
James Chen	f7229f74d8	issue #1483: Synchronizing CCControlExtension to latest version.	2012-09-25 16:57:51 +08:00
James Chen	9fabf3a45b	fixed #1470: Made CCBReader support cocosbuilder v2.1-beta0.	2012-09-19 18:41:50 +08:00
johnangel	fdec1ba4b9	Fixing include paths to be able to compile cocos2d-x using ... external Visual Studio solution, without copying all files	2012-09-15 16:34:31 +02:00
James Chen	6f3ee0299a	issue #1458: Updated vs2010 project configuration.	2012-09-10 14:05:44 +08:00
James Chen	d9cc8fa346	issue #1458: Adding CCTableView support. Updated win32 project configuration.	2012-09-09 22:34:32 +08:00
minggo	07ddd43695	issue #1437:make CCApplication::sharedApplication() return pointer	2012-08-21 15:28:43 +08:00
James Chen	0fce637ec7	issue #1429: First commit CCEditBox support, only valid on IOS. PLZ refer to ExtensionsTest/EditBoxTest.	2012-08-15 14:33:56 +08:00
James Chen	a7ce8f2e21	Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into minggo_res	2012-08-09 17:16:10 +08:00
James Chen	3ff21fe275	fixed #1424: http wrapper compiled ok on win32.	2012-08-09 17:04:55 +08:00
James Chen	826dfe4102	issue #1405: multi resolution works ok on win32. Add CCFileUtils::getResourceDirectory() method.	2012-08-09 12:49:33 +08:00
James Chen	2ab5e4ab9c	issue #1399: Added vs2010 support.	2012-07-23 11:57:34 +08:00
James Chen	77f1fba566	issue #1399: Adjust folder structure, made it built successfully on win32.	2012-07-20 14:05:52 +08:00