tiennm99/godot
1
0
Fork 0
mirror of https://github.com/tiennm99/godot.git synced 2026-08-21 08:26:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/okamstudio/godot

Browse Source 
# Solved Conflicts:
#	tools/editor/property_editor.cpp
#	tools/editor/property_editor.h
This commit is contained in:
Mariano Javier Suligoy
2015-08-30 02:48:45 -03:00
parent a19a653e2c 7bc9846f16
commit c688b55019
32 changed files with 853 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files
scene/resources/default_theme/default_theme.cpp
+1 -1
View File
@@ -297,7 +297,7 @@ void make_default_theme() {
t->set_color("font_color_hover","MenuButton", control_font_color_hover );
t->set_color("font_color_disabled","MenuButton", Color(1,1,1,0.3) );
t->set_constant("hseparation","MenuButton", 0 );
t->set_constant("hseparation","MenuButton", 3 );
// CheckBox