62 Commits

Author	SHA1	Message	Date
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
zhangbin	af5cf0a33f	Add configuration in templates to set the bundle identity of Mac & iOS project.	2014-07-08 10:22:08 +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
James Chen	8cbcf17163	issue #4674: Re-added deleted source files.	2014-05-04 14:37:55 +08:00
James Chen	3b3c1c4dbb	issue #4674: Removed large files and updated .gitignore	2014-05-04 14:36:16 +08:00
Kenneth Chan	a2fa6ef2d5	Fix lua project template crash on iOS5.1 device	2014-04-18 18:02:40 -07:00
samuele3hu	0a1d23753b	fix the lua template error that would lead to crash when do rotate	2014-03-31 23:11:26 +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