10 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
Ed Bartley	c67412618d	Merge branch 'gles20' of github.com:FlowerpotGames/cocos2d-x; branch 'gles20' of github.com:cocos2d/cocos2d-x into gles20 ... Conflicts: extensions/GUI/CCScrollView/CCScrollView.cpp	2012-09-10 10:50:30 -04:00
James Chen	6f3ee0299a	issue #1458: Updated vs2010 project configuration.	2012-09-10 14:05:44 +08:00
ebartley	5deeb3f8fa	Update windows project files: Paths should be referenced from the $(ProjectDir) so that devs using a custom .sln that references the existing .vcxproj files in the cocos2d-x repo can use them without errors.	2012-09-07 15:00:21 -04:00
James Chen	3ff21fe275	fixed #1424: http wrapper compiled ok on win32.	2012-08-09 17:04:55 +08:00
Walzer	b8fa32dbc0	use extensions/GUI instead of extensions/UI	2012-07-30 22:57:59 +08:00
James Chen	2ab5e4ab9c	issue #1399: Added vs2010 support.	2012-07-23 11:57:34 +08:00