axmol/cocos
mogemimi bebd11f853 Correct spelling of "intersect" (#17194) 2017-01-16 11:20:07 +08:00
..
2d improves fix for issue #17119 (v3) (#17188) 2017-01-16 09:30:08 +08:00
3d Correct spelling of "intersect" (#17194) 2017-01-16 11:20:07 +08:00
audio Merge branch 'v3.14' into merge-v314 2017-01-04 09:49:22 +08:00
base Fix typos in docs (#17132) 2017-01-11 09:31:45 +08:00
deprecated Remove unnecessary inline keywords (#16562) 2016-09-12 09:44:21 +08:00
editor-support Fix minor typos in function parameters (#17157) 2017-01-11 05:34:57 -08:00
math vec4 operator < seems error (#17072) 2016-12-29 15:26:25 +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 Fix typos in docs (#17132) 2017-01-11 09:31:45 +08:00
physics3d No CC_UNUSED_PARAM (#16812) 2016-11-16 09:48:37 +08:00
platform Adding async version of common CCFileUtil functions. This will allow engine users to interact with the file system, without blocking the main thread and disrupting rendering. (#17140) 2017-01-13 10:05:46 +08:00
renderer use std::stable_sort to keep order (#17156) 2017-01-11 15:47:36 +08:00
scripting [ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically (#17183) 2017-01-13 14:04:11 +08:00
storage Update copyright to 2016. (#16311) 2016-08-05 09:42:15 +08:00
ui Propagate onTouchCancelled (#17174) 2017-01-13 18:09:01 +08:00
vr Fix typos in docs (#17132) 2017-01-11 09:31:45 +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