seedlingattempt/godot
1
0
Fork 0
Code Issues Pull Requests Actions 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

10
tools/editor/property_editor.h
View File

@ -96,6 +96,7 @@ class CustomPropertyEditor : public Popup {
SpinBox *spinbox;
HSlider *slider;
Control *easing_draw;
Object* owner;
@ -159,10 +160,14 @@ class PropertyEditor : public Control {
bool read_only;
bool show_categories;
float refresh_countdown;
bool use_doc_hints;
HashMap<String,String> pending;
String selected_property;
Map<StringName,Map<StringName,String> > descr_cache;
Map<StringName,String > class_descr_cache;
CustomPropertyEditor *custom_editor;
void _resource_edit_request();
@ -219,8 +224,9 @@ public:
void set_autoclear(bool p_enable);
void set_show_categories(bool p_show);
PropertyEditor();
void set_use_doc_hints(bool p_enable) { use_doc_hints=p_enable; }
PropertyEditor();
~PropertyEditor();
};