kepler-5 d3eb857482 horizontal alignment support in RichText (#18027) ... * horizontal alignment support in RichText * split lambda into separate function * tweak shadow test's content size so horizontal aligment doesn't give the illusion of behaving incorrectly * fix alignment when the last char of a line is whitespace * fix errors from merge * fix bug in setting of size of image elements. scaling was applied effectively twice. * removed debugging code. whoops		2017-07-05 09:25:12 +08:00
..
2d	Remove unnecessary dynamic allocation (#18014)	2017-07-04 14:31:29 +08:00
3d	small BillBoard optimizations (#17825)	2017-05-22 08:59:55 +08:00
audio	fix warnings (#17970)	2017-06-23 17:46:37 +08:00
base	arithmetic operators for Color4F (#18028)	2017-07-05 09:05:03 +08:00
deprecated	Update license to 2017 (#17362)	2017-02-14 14:36:57 +08:00
editor-support	fix warnings (#17971)	2017-06-23 17:47:20 +08:00
math	Update license to 2017 (#17362)	2017-02-14 14:36:57 +08:00
navmesh	Update license to 2017 (#17362)	2017-02-14 14:36:57 +08:00
network	Avoid crash on large file download. (#17735)	2017-04-28 13:38:23 +08:00
physics	Calling PhysicsWorld::setDebugDrawMask(false) will no longer crash when DebugDrawMask was already set to false (#17875)	2017-06-05 10:56:52 +08:00
physics3d	Update license to 2017 (#17362)	2017-02-14 14:36:57 +08:00
platform	CCImage.cpp misuse CC_USE_PNG (#18015)	2017-07-04 14:17:17 +08:00
renderer	No need to get the Configuration and Director instances more than once in CCRenderer.cpp (#17978)	2017-06-26 13:52:49 +08:00
scripting	Export cocos2d::utils::findChild to lua-bindings (#18013)	2017-07-04 14:37:44 +08:00
storage	Update license to 2017 (#17362)	2017-02-14 14:36:57 +08:00
ui	horizontal alignment support in RichText (#18027)	2017-07-05 09:25:12 +08:00
vr	Fixes cocos2d build for tvOS. (#17498)	2017-03-15 10:01:38 +08:00
Android.mk	use prebuilt version of bullet (#17950)	2017-06-21 13:39:38 +08:00
CMakeLists.txt	Update license to 2017 (#17362)	2017-02-14 14:36:57 +08:00
cc_dummy.c	Squashed commit of the following:	2016-03-02 16:51:54 -08:00
cocos2d.cpp	Merge v3.15.1 (#17897)	2017-06-05 13:37:50 +08:00
cocos2d.h	Add CCGLProgramStateCache header to cocos2d.h (#17976)	2017-06-26 13:53:17 +08:00