16 Commits

Author	SHA1	Message	Date
LinWenhai	2ca5c01902	issue #4689: Refactoring game controller API[ios]	2014-07-04 21:24:32 +08:00
LinWenhai	27bc3dc640	Merge branch 'v3-gc-refactor' of https://github.com/Dhilan007/cocos2d-x into v3-gc-refactor	2014-07-04 17:56:22 +08:00
Dhilan007	c73a88c4a5	Add resources	2014-07-04 17:55:20 +08:00
LinWenhai	992245e744	Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3-gc-refactor	2014-07-04 15:29:40 +08:00
Dhilan007	552a9251c4	issue #4689: Refactor controller API.	2014-07-04 15:22:53 +08:00
minggo	0be6d27271	Merge pull request #7295 from minggo/support-regular-expression ... Support regular expression	2014-07-03 15:20:06 +08:00
minggo	d8c9f6a0a6	add regular support in Node::enumerateChildren()	2014-07-02 17:07:36 +08:00
Dhilan007	e1bb1158bc	update test case.	2014-07-02 15:25:18 +08:00
Dhilan007	c5dc7b9cd0	fixed can't get valid value from trigger button.	2014-07-02 14:19:10 +08:00
Dhilan007	318962c40a	update test case.	2014-07-01 16:46:11 +08:00
Dhilan007	0fbcbec9de	Add missing file for game controller support. ... Fix using incorrect library project.	2014-07-01 16:44:10 +08:00
Dhilan007	83f4e536c5	Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3-gc0630 ... Conflicts: tests/game-controller-test/proj.android/project.properties	2014-06-30 19:27:01 +08:00
Dhilan007	9bf36a1045	update test case.	2014-06-30 18:43:09 +08:00
minggo	3b13855374	fix compiling error on iOS	2014-06-30 17:20:13 +08:00
minggo	c1e56e62c1	fix compiling error	2014-06-30 15:51:35 +08:00
Dhilan007	a63216d97b	issue #4895:Add test case	2014-06-30 03:25:49 +08:00