pandamicro d6045fdbea Merge branch 'v3.8' of github.com:cocos2d/cocos2d-x into v3 ... Conflicts: cocos/audio/winrt/Audio.cpp cocos/platform/winrt/CCCommon.cpp cocos/platform/winrt/CCWinRTUtils.cpp cocos/platform/winrt/CCWinRTUtils.h		2015-08-27 10:40:04 +08:00
..
2d	depth test always	2015-08-26 16:37:48 +08:00
3d	disable blend when drawing skybox	2015-08-25 14:32:25 +08:00
audio	Merge branch 'v3.8' of github.com:cocos2d/cocos2d-x into v3	2015-08-27 10:40:04 +08:00
base	removed old WP8_SHADER_COMPILER defines	2015-08-26 08:50:11 -07:00
deprecated	Optimize Vec2	2015-04-19 20:40:52 +03:00
editor-support	fixed pdb file output location	2015-08-26 09:41:23 -07:00
math	Finished AutoPolygon and Sprite	2015-06-04 15:43:31 +08:00
navmesh	fix tons of warnings	2015-07-15 12:04:48 +08:00
network	Fix AssetsManager crash by protecting Downloader with shared_ptr	2015-08-22 22:13:53 +08:00
physics	Circle shape debug draw bug	2015-06-23 15:50:42 +02:00
physics3d	supplement annotations	2015-08-26 17:24:36 +08:00
platform	Merge branch 'v3.8' of github.com:cocos2d/cocos2d-x into v3	2015-08-27 10:40:04 +08:00
renderer	Merge branch 'v3.8' of github.com:cocos2d/cocos2d-x into v3	2015-08-27 10:40:04 +08:00
scripting	[ci skip][AUTO]: updating luabinding & jsbinding automatically	2015-08-26 13:01:17 +00:00
storage	issue #12078: added storage group.	2015-05-28 15:48:08 +08:00
ui	Merge branch 'v3.8' of github.com:cocos2d/cocos2d-x into v3	2015-08-27 10:40:04 +08:00
Android.mk	Move CCTextureCube From 3d to renderer to solve compilation issue	2015-08-24 14:01:50 +08:00
CMakeLists.txt	add clipper to cmakelist	2015-06-16 17:09:27 +08:00
cocos2d.cpp	Release docs for v3.7.1	2015-07-25 15:16:39 +08:00
cocos2d.h	Move CCTextureCube From 3d to renderer to solve compilation issue	2015-08-24 14:01:50 +08:00