13 Commits

Author	SHA1	Message	Date
Dhilan007	fbfbcaffc8	update project	2014-05-13 16:43:19 +08:00
Dhilan007	06f264e87d	rename VideoWidget to VideoPlayer.	2014-05-09 11:30:07 +08:00
Dhilan007	972f9447dd	issue #4876:Add test case to play video	2014-05-08 18:14:32 +08:00
andyque	e48e26cfdc	issue #5056. fix linux & android compile error	2014-05-08 15:20:24 +08:00
andyque	0dc224a123	issue #4861. fix android compile error	2014-05-05 11:37:39 +08:00
Ricardo Quesada	32f3fedb37	Moves cocos/2d/Android.mk to cocos/Android.mk ... Easier to find Android.mk	2014-05-01 14:09:26 -07:00
James Chen	037c57ef96	Merge branch 'develop' into perf-callback ... Conflicts: build/cocos2d_tests.xcodeproj/project.pbxproj	2014-04-25 12:07:48 +08:00
James Chen	ec40dda7f3	Adds performance test for callbacks: 1) std::function, ... 2) (target->*selector)(), 3) simulate new api of Scheduler	2014-04-16 10:35:58 +08:00
Darragh Coy	440a0adcde	Whoops... Shouldn't remove the test cpp.	2014-04-08 10:40:32 -07:00
Darragh Coy	a34b952e8d	Revert "Fix Android build for RefPtr addition." ... This reverts commit 586383a05e.	2014-04-08 10:35:55 -07:00
Darragh Coy	586383a05e	Fix Android build for RefPtr addition.	2014-03-26 16:30:04 -07:00
James Chen	431e800dd6	All tests could run on Android.	2014-03-11 19:10:36 +08:00
James Chen	b88de91a15	Renames 'samples' folder to 'tests', ouch....	2014-03-11 19:10:34 +08:00