axmol/cocos
pandamicro 41abefd082 Merge branch 'v3.14' of github.com:cocos2d/cocos2d-x into v3.14
# Conflicts:
#	CHANGELOG
#	cocos/scripting/js-bindings/manual/cocos2d_specifics.cpp
#	cocos/scripting/js-bindings/manual/spine/jsb_cocos2dx_spine_manual.cpp
2016-12-26 18:53:42 +08:00
..
2d creator c++ support bug fixes (#17051) 2016-12-21 16:17:32 +08:00
3d some warnings fixed: unused variables, signed-unsigned comparison (#16878) 2016-11-21 15:03:41 +08:00
audio [mac, ios] 'ExtAudioFileRead' may return 0 frame while it doesn’t reach the end of very short audio file. (#17011) 2016-12-15 09:58:47 +08:00
base Synchronize creator engine bug fixes and upgrade web engine (#17003) 2016-12-14 09:27:47 +08:00
deprecated Remove unnecessary inline keywords (#16562) 2016-09-12 09:44:21 +08:00
editor-support Scale9Sprite refactor (#16891) 2016-11-24 09:59:00 +08:00
math Remove unnecessary const return qualifiers (#16671) 2016-10-11 09:33:05 +08:00
navmesh No CC_UNUSED_PARAM (#16812) 2016-11-16 09:48:37 +08:00
network fix crash if create and delete downloader quickly (#17010) 2016-12-14 14:44:36 +08:00
physics No CC_UNUSED_PARAM (#16812) 2016-11-16 09:48:37 +08:00
physics3d No CC_UNUSED_PARAM (#16812) 2016-11-16 09:48:37 +08:00
platform Sync issue fixes from creator (#17041) 2016-12-21 13:39:34 +08:00
renderer [label] Fixes shadow is drawn incorrect while also enabling outline. (#17024) 2016-12-16 14:56:36 +08:00
scripting Small fix to CallbackWrapper 2016-12-26 00:08:59 +08:00
storage Update copyright to 2016. (#16311) 2016-08-05 09:42:15 +08:00
ui fix tizen compile issue (#17002) 2016-12-14 11:55:38 +08:00
vr No CC_UNUSED_PARAM (#16812) 2016-11-16 09:48:37 +08:00
Android.mk Android import cpufeatures in cocos. (#16233) 2016-07-31 22:45:30 +08:00
CMakeLists.txt Fix LNK4098 and LNK2001 warnings (#16372) 2016-08-22 15:50:17 +08:00
cc_dummy.c Squashed commit of the following: 2016-03-02 16:51:54 -08:00
cocos2d.cpp update engine version (#16929) 2016-11-30 11:53:53 +08:00
cocos2d.h update engine version (#16929) 2016-11-30 11:53:53 +08:00