pandamicro 744fa0b565 Merge pull request #13194 from VisualSJ/v3-boneTest ... [ci skip] Update JSON parser		2015-08-04 15:35:27 +08:00
..
2d	fix spelling mistake.	2015-08-04 09:36:33 +08:00
3d	add comment	2015-08-03 13:30:30 +08:00
audio	1.AudioEngine:support callback for preload feature.	2015-07-28 15:27:07 +08:00
base	Merge branch 'v3.7.1' of https://github.com/cocos2d/cocos2d-x into v3	2015-08-02 22:28:27 +08:00
deprecated	Optimize Vec2	2015-04-19 20:40:52 +03:00
editor-support	Merge branch 'v3.7.1' of https://github.com/cocos2d/cocos2d-x into v3	2015-08-03 19:47:56 +08: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	Merge pull request #12467 from MagicTavern/v3_fix_websocket	2015-08-03 16:25:56 +08:00
physics	Circle shape debug draw bug	2015-06-23 15:50:42 +02:00
physics3d	recover the physics3DShape initHeightfield api	2015-08-01 18:29:48 +08:00
platform	Fix line wrapper in CCDevice	2015-08-04 11:07:04 +08:00
renderer	merge cocos	2015-08-03 09:54:29 +08:00
scripting	Merge pull request #13194 from VisualSJ/v3-boneTest	2015-08-04 15:35:27 +08:00
storage	issue #12078: added storage group.	2015-05-28 15:48:08 +08:00
ui	modify vertical scroll direction	2015-08-03 11:38:23 +08:00
Android.mk	Build engine with LOCAL_ARM_MODE=arm when building JS projects for android.	2015-06-18 22:00:57 +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	Merge remote-tracking branch 'origin' into fix_spritepolygon2	2015-06-12 16:28:41 +08:00