115 Commits

Author	SHA1	Message	Date
minggo	9f0e25d808	Merge pull request #6628 from andyque/refactor5056 ... refactor 5056. pull gui tests from ExtensionTest to UITest	2014-05-08 17:00:38 +08:00
andyque	97ee5cb456	closed #5056. fix windows compile error	2014-05-08 16:18:46 +08:00
minggo	a8d728ffc9	Merge pull request #6610 from zawasp/vs2013project ... upgrade win32 projects for Visual Studio 2013	2014-05-08 15:40:02 +08:00
Mircea Rila	b66b4c6f1d	upgrade win32 projects for Visual Studio 2013 (solves Platform Toolset v100 not found). ... remove C4005 warnings after upgrading projects	2014-05-07 17:41:04 +03:00
andyque	e65b144ee6	issue #3861, fixs windows compile error	2014-05-06 10:17:10 +08:00
James Chen	8cbcf17163	issue #4674: Re-added deleted source files.	2014-05-04 14:37:55 +08:00
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
andyque	2c2a5ee38e	rename gui to ui	2014-03-12 10:46:49 +08:00
James Chen	b88de91a15	Renames 'samples' folder to 'tests', ouch....	2014-03-11 19:10:34 +08:00