10 Commits

Author	SHA1	Message	Date
minggo	0a1f0369e6	fixed #1481: merge Nicolas's pull request and do some bug fixes	2012-09-21 17:01:19 +08:00
minggo	a0feb5f289	issue #1470:fix some logical errors	2012-09-18 17:04:10 +08:00
minggo	0845e08fd3	issue #1470:update CCBReader to support Cocosbuilder v2.1 beta0	2012-09-17 14:27:17 +08:00
Donald Alan Morrison	5075a83271	Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into gles20 ... Conflicts: cocos2dx/kazmath/src/ray2.c	2012-08-25 00:00:27 -07:00
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
minggo	0231f65716	Merge pull request #1208 from minggo/iss1382_ccb_reader ... fixed #1382:safe retain mOwner to avoid crash caused by null pointer	2012-08-20 20:23:03 -07:00
minggo	4db53b2f91	fixed #1382:safe return mOwner to avoid crash caused by null pointer	2012-08-20 15:54:53 +08:00
Dale Ducharme	4004a8ac61	Cocos2dx for gles2.	2012-08-17 17:45:21 -04: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	f9c40f7372	issue #1399: work ok on iOS after adjusting directory structure	2012-07-19 17:22:36 +08:00