57 Commits

Author	SHA1	Message	Date
mustime	d01842a37b	Merge branch 'gles20' of git://github.com/cocos2d/cocos2d-x into testlua ... Conflicts: scripting/lua/cocos2dx_support/LuaCocos2d.cpp	2012-08-22 09:39:21 +08:00
mustime	57659d1584	issue #1425: modifing pkg files for Lua	2012-08-21 18:42:35 +08:00
minggo	07ddd43695	issue #1437:make CCApplication::sharedApplication() return pointer	2012-08-21 15:28:43 +08:00
mustime	d5b99cc79e	issue #1425: corresponding changes for .pkg files	2012-08-11 16:05:38 +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	59db9f0c6f	issue #1399:lua building works ok after adjusting directory structure	2012-07-23 17:14: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