4 Commits

Author	SHA1	Message	Date
YuLei	da79992275	Merge branch 'gles20' of git://github.com/cocos2d/cocos2d-x into gles20	2012-09-02 00:38:57 +08:00
YuLei	2c518e43b2	[Lua] fix CCLayer:registerScriptTouchHandler() ... [Lua] make CCNotificationCenter script support	2012-08-28 12:08:15 +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	f9c40f7372	issue #1399: work ok on iOS after adjusting directory structure	2012-07-19 17:22:36 +08:00