107 Commits

Author	SHA1	Message	Date
James Chen	3b3c1c4dbb	issue #4674: Removed large files and updated .gitignore	2014-05-04 14:36:16 +08: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	477fc9f0e0	Merge commit 'refs/pull/6012/head' of git://github.com/cocos2d/cocos2d-x into pull/6012 ... Conflicts: build/cocos2d_libs.xcodeproj/project.pbxproj	2014-04-25 10:59:11 +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	50be1ca3ad	Fix win32 build	2014-04-08 22:47:08 -07:00
koowolf	504501896f	closed #4497: use /z7 to build without .pdb, or will face with error c3130.	2014-03-21 16:39:00 +08:00
James Chen	dd87df1cbc	rename TestCpp to cpp-tests, TestLua to lua-tests in VS projects.	2014-03-12 15:30:21 +08:00