Commit Graph

9 Commits

Author SHA1 Message Date
samuele3hu cd0c82f8b7 Split deprecated class, functions and enums to related module and adjust iOS/Mac test case and templates 2014-08-04 17:11:57 +08:00
samuele3hu c5c394846c Adjust iOS and Mac tempts for Lua 2014-08-04 10:25:17 +08:00
samuele3hu 521f805219 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_VideoPlayer
Conflicts:
	tests/lua-tests/src/mainMenu.lua
	tools/bindings-generator
	tools/tolua/cocos2dx_physics.ini
2014-07-08 14:57:19 +08:00
chuanweizhang2013 10595394e3 copy res when update resource 2014-07-03 01:00:24 -07:00
samuele3hu cfb992e7cf Upate templates project setting 2014-06-27 14:52:32 +08:00
cw 8db2882431 fixed head search path 2014-05-17 14:41:03 +08:00
andyque 2c2a5ee38e rename gui to ui 2014-03-12 10:46:49 +08:00
cw 133a68f614 add runtime template 2014-03-11 16:52:06 +08:00
James Chen cf5dacb24e Re-add lua template. 2014-03-10 19:33:57 +08:00