James Chen 6baea45db6 Merge pull request #5679 from Dhilan007/develop_label ... issue #4337: Two fixes for new label: 1. Color and opacity can't take effect. 2. The font size passed to new Label didn't consider 'contentScaleFactor'.		2014-03-12 11:17:49 +08:00
..
2d	fixed incorrect initial value of label type.	2014-03-12 11:06:51 +08:00
audio	Compiles on Android	2014-03-04 16:59:39 -08:00
base	remove script support	2014-03-07 15:12:46 +08:00
editor-support	Merge branch 'develop' into fix_gui_to_ui	2014-03-12 10:09:09 +08:00
math/kazmath	Adds CC_DLL to kazmath for windows compatibility	2014-03-04 18:07:03 -08:00
network	fixed #3868. Add guard check to send method of HttpClient	2014-03-04 10:07:49 +08:00
physics	closed #4324: fix double free bug. move _preContactData to PhysicsContact class, add PhysicsContact::getPreContactData() method.	2014-03-11 05:09:08 +08:00
scripting/lua-bindings	rename gui to ui	2014-03-12 10:46:49 +08:00
storage	Linux local storage support. Depends on libsqlite3-dev	2014-02-13 00:53:51 +01:00
ui	fix linux compile error	2014-03-11 20:46:11 +08:00