Commit Graph

8 Commits

Author SHA1 Message Date
wangshuai d5cdba484e Merge branch 'master' into feature_1802
Conflicts:
	scripting/lua/cocos2dx_support/LuaCocos2d.cpp
2013-03-07 14:32:31 +08:00
wangshuai 6914c9d902 feature #1802:add touches lua test 2013-03-07 11:55:57 +08:00
wangshuai bdbdbc27f5 issue #1425:exist lua test case is ok!
1.add some lua test case
2.add ccset.pkg
3.fixed ParticleSystem error in lua test case
2013-03-05 14:46:18 +08:00
wangshuai 8867766241 issue #1425: exist lua test case is ok.
1.fixed some bugs in some lua test case;
2.modify touch event and node event type;
3.fixed some bugs in CCParticleSystem.pkg
2013-03-01 17:09:42 +08:00
wangshuai b4e13af460 issue #1425: 
1.fixed some bugs in .lua file. like this:local b = a:copy():autorelease()
2.fixed bug of CCShakyTiles3D's create() in CCActionTilesGrid.pkg
3.delete method copyWithZone in .pkg files
2013-02-28 10:23:30 +08:00
fape 3c89bf1d83 marmalade TestLua: add postbuild script to copy resources 2013-01-03 14:47:57 +01:00
James Chen c68884a121 issue #1625: Updated EffectsTest.cpp and EffectsTest.lua. 2012-12-27 11:48:46 +08:00
James Chen 4660e72eda issue #1603: Moved the position of some projects. 2012-12-20 12:58:21 +08:00