1313 Commits

Author	SHA1	Message	Date
mustime	1a55b7c5ba	Merge branch 'gles20' of git://github.com/cocos2d/cocos2d-x into bug1381	2012-07-27 18:29:57 +08:00
Walzer	685b70e6fb	fixed #1402, résolve conflicting "create" functions ... 1. Following https://docs.google.com/document/d/1eqvYjVah0R9nkjzJ_ga1-_cyjHnizVQ5dyESYNpYM0s/edit?pli=1 2. use CCSequence/CCSpawn::initWithTwoActions, createWithTwoActions instead of initOneTwo, create(one, two). 3. haven't re-generate lua-binding to resolve the conflicts yet.	2012-07-23 22:49:11 +08:00
James Chen	9a6729551c	Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into iss1399	2012-07-23 11:59:47 +08:00
James Chen	2ab5e4ab9c	issue #1399: Added vs2010 support.	2012-07-23 11:57:34 +08:00
minggo	ac70f8def5	Merge branch 'gles20-adjust-structure' into merge	2012-07-23 11:36:46 +08:00
minggo	5163b17a8a	make CCBReaderTest work ok	2012-07-23 11:33:11 +08:00
James Chen	acd4a5dc9d	issue #1399: Updated build-win32.bat and libExtensions.vcproj.	2012-07-23 10:55:24 +08:00
James Chen	b2b0a0c3d5	Updated ios project settings and updated some files in CCBReader folder.	2012-07-20 18:02:18 +08:00
James Chen	557f654cf3	Built successfully on android.	2012-07-20 17:06:00 +08:00
James Chen	77f1fba566	issue #1399: Adjust folder structure, made it built successfully on win32.	2012-07-20 14:05:52 +08:00
minggo	f9c40f7372	issue #1399: work ok on iOS after adjusting directory structure	2012-07-19 17:22:36 +08:00
Walzer	8bab593246	move extensions/NDControls to cocos2d-x-extensions repository	2011-06-22 14:54:45 +08:00
minggo	9c49e27bf1	add extensions & tools directory	2011-06-14 14:31:25 +08:00