15 Commits

Author	SHA1	Message	Date
pandamicro	436564f922	Merge branch 'v3.7-release' of https://github.com/cocos2d/cocos2d-x into v3 ... Conflicts: docs/RELEASE_NOTES.md web	2015-07-15 14:39:40 +08:00
Bin Zhang	55890f6206	Update the JS templates to keep the directory structure is same with before.	2015-07-14 18:07:17 +08:00
andyque	451bedbaad	change sign team to none.	2015-07-07 22:02:35 +08:00
andyque	04ade7c16e	remove xcode scheme	2015-07-07 14:57:25 +08:00
andyque	302976b603	add shared scheme to iOS & Mac project.	2015-07-07 14:24:17 +08:00
Bin Zhang	a6a1cbdfbe	Solve the error config of js runtime template.	2015-06-30 16:03:39 +08:00
WenhaiLin	cbb073e905	Fixed Application may be created more than once on Android.	2015-06-23 16:58:38 +08:00
pandamicro	1bf8292e06	Merge pull request #12442 from natural-law/update-templates ... Update the VS projects of templates.	2015-06-19 10:38:02 +08:00
Bin Zhang	d288b13957	Build engine with LOCAL_ARM_MODE=arm when building JS projects for android.	2015-06-18 17:22:30 +08:00
Bin Zhang	01cb135e77	Solve the error in the VS project of templates.	2015-06-17 18:06:09 +08:00
tangziwen	b84531ea04	add librecast to js and lua templates	2015-06-17 13:39:28 +08:00
pandamicro	70606caa14	Fix template android compilation issue on physics3d	2015-06-10 19:37:52 +08:00
hugo	f2a5418d41	add js runtime ignore template	2015-05-25 22:52:36 +08:00
andyque	81d562803b	upgrade rapidjson to 1.0.2	2015-05-25 11:43:03 +08:00
hugo	9a9fa7957f	[A] add generate libs and binary template	2015-05-22 19:47:16 +08:00