andyque 82f597ce98 Merge branch 'v3.7.1' into v3 ... # Conflicts: # cocos/scripting/lua-bindings/auto/api/CheckBox.lua # cocos/ui/UICheckBox.cpp # cocos/ui/UICheckBox.h		2015-08-12 17:59:50 +08:00
..
2d	Label:Fixed letter can be flipped.	2015-08-11 10:06:14 +08:00
3d	Merge pull request #13272 from yangws/bug_21800	2015-08-12 10:25:30 +08:00
audio	Merge pull request #13232 from perminovVS/v3-dev-get-file-extension	2015-08-11 15:54:55 +08:00
base	fix bug: #21906 Pause/Resume 's result not correct.	2015-08-11 14:28:52 +08:00
deprecated	Optimize Vec2	2015-04-19 20:40:52 +03:00
editor-support	Merge branch 'v3.7.1' into v3	2015-08-12 17:59:50 +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 #13213 from jianglong0156/improUtfFunction	2015-08-05 17:26:52 +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	Merge pull request #13324 from zilongshanren/fix-editbox-soft-keyboard-backissue	2015-08-12 13:57:10 +08:00
renderer	merge cocos	2015-08-03 09:54:29 +08:00
scripting	Merge branch 'v3.7.1' into v3	2015-08-12 17:59:50 +08:00
storage	issue #12078: added storage group.	2015-05-28 15:48:08 +08:00
ui	Merge branch 'v3.7.1' into v3	2015-08-12 17:59:50 +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