WuHao 0808b6aff9 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into fix_spritepolygon ... Conflicts: cocos/2d/MarchingSquare.cpp		2015-06-08 13:59:26 +08:00
..
Classes	Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into fix_spritepolygon	2015-06-08 13:59:26 +08:00
Resources	samplers are treated as uniforms	2015-06-05 14:55:33 -07:00
proj.android	fix android compile error	2015-05-14 14:36:45 +08:00
proj.android-studio	Merge branch 'v3' of github.com:cocos2d/cocos2d-x into v3	2015-05-25 17:01:29 +08:00
proj.ios	Add Default-667h@2x and Default-737h@3x launch images to support iPhone6 and iPhone6+'s native resolution mode	2014-10-16 15:53:12 +08:00
proj.linux	Renames 'samples' folder to 'tests', ouch....	2014-03-11 19:10:34 +08:00
proj.mac	precompiled headers improvements for iOS & Mac	2014-09-23 23:19:25 +04:00
proj.win8.1-universal	/NODEFAULTLIB:MSVCRT to fix linker warning	2015-06-03 09:26:15 -07:00
proj.win10	don't auto update version number for each windows app certification test	2015-05-28 15:04:09 -07:00
proj.win32	Add Scene3DTest source to cpp-tests win32/win8 project.	2015-05-14 15:19:39 +08:00
.cocos-project.json	Add files & configuration for android studio support in console.	2015-05-21 16:34:03 +08:00
CMakeLists.txt	linux works	2015-05-14 14:49:48 +08:00