10 Commits

Author	SHA1	Message	Date
Donald Alan Morrison	ee9f3d09a8	Fixed VS2010 Warning C4334: '<<' : result of 32-bit shift implicitly ... converted to 64 bits.	2012-08-24 09:22:02 -07:00
Dale Ducharme	4004a8ac61	Cocos2dx for gles2.	2012-08-17 17:45:21 -04:00
Walzer	b8fa32dbc0	use extensions/GUI instead of extensions/UI	2012-07-30 22:57:59 +08:00
Walzer	dfea09819f	fixed #1409, sync with CocosBuilder v2.0, use number "4" to stand for PROPERTY_*_DISABLED in CCControlButton ... The cub & ccbi files in current test suit use "3" to stand for DISABLED state in CCControlButton, while CocosBuilder v2.0 generate "4" for it.	2012-07-29 22:13:20 +08:00
Walzer	1411705de4	fixed #1408, CCBReader, CCMenuItemImage should be loaded when the target and selector are empty	2012-07-29 21:17:35 +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
minggo	5163b17a8a	make CCBReaderTest work ok	2012-07-23 11:33:11 +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	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