19 Commits

Author	SHA1	Message	Date
fusijie	d2181e137e	fix android studio compile error.	2015-07-30 11:55:33 +08:00
Vincent Yang	3addf38134	Fixed #12906 : Can't add custom member to cocos2d::Scene subclass.	2015-07-22 12:01:34 +08:00
andyque	ef5d4ddf86	Merge remote-tracking branch 'upstream/v3' into v3 ... # Conflicts: # tests/cpp-tests/proj.win8.1-universal/cpp-tests.Shared/cpp-tests.Shared.vcxitems.filters	2015-07-14 11:24:38 +08:00
andyque	fc673ee502	Merge branch 'v3.7-release' into v3	2015-07-13 22:44:54 +08:00
Vincent Yang	e65b01bdc0	Merge pr11866: FileUtilsWin32 correct use all unicode version winapi.	2015-07-13 17:06:01 +08:00
XiaoFeng	a9dfd8012c	Add new bug test to Android, Win 10, Win Universal, Linux project file	2015-07-07 11:02:00 +08:00
Neo Kim	00e360f438	Add the missing file into CMake and Windows project configurations.	2015-07-01 15:36:53 +09:00
子龙山人	29cccf631e	Merge pull request #12550 from kompjoefriek/v3-vibrate ... Vibrate support in v3	2015-06-30 10:28:59 +08:00
kompjoefriek	6eca03fdd2	Merged changes from "Vibrate support in v4" into v3 branch.	2015-06-26 01:02:44 +02:00
samuele3hu	7feaa18d82	Fix the compile error for cpp-tests based on android studio	2015-06-25 16:08:48 +08:00
WenhaiLin	cbb073e905	Fixed Application may be created more than once on Android.	2015-06-23 16:58:38 +08:00
Bin Zhang	c491b6a5c1	Merge branch 'v3' of github.com:cocos2d/cocos2d-x into v3	2015-05-25 17:01:29 +08:00
Bin Zhang	3298145eb5	Support build & run Android Studio project in console.	2015-05-25 16:53:36 +08:00
Bin Zhang	3d0c716ee9	Add script in build.gradle for sign the release apk.	2015-05-22 15:52:41 +08:00
Bin Zhang	78d4089215	Add the project.properties for the ndk-build of proj.android-studio.	2015-05-21 15:43:01 +08:00
WenhaiLin	a569d877ba	[ci skip]Remove unnecessary code.	2015-05-20 18:05:46 +08:00
WenhaiLin	26f094b1a7	Remove unnecessary files	2015-05-18 16:02:05 +08:00
WenhaiLin	54b6260dfd	Rename module	2015-05-18 15:17:05 +08:00
WenhaiLin	6dd3108e42	Rename module	2015-05-18 15:01:20 +08:00