asgardius/virtualx-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #1450 from theuserbl/master

Browse source 
Making ToolButton and KEY_MASK_CMD accessable in GDScript and the IDE
This commit is contained in:
Juan Linietsky 2015-03-22 14:58:42 -03:00
commit 3aed92e5b1
2 changed files with 3 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
core/global_constants.cpp
View file

@ -313,6 +313,7 @@ static _GlobalConstant _global_constants[]={
BIND_GLOBAL_CONSTANT( KEY_MASK_ALT ),
BIND_GLOBAL_CONSTANT( KEY_MASK_META ),
BIND_GLOBAL_CONSTANT( KEY_MASK_CTRL ),
BIND_GLOBAL_CONSTANT( KEY_MASK_CMD ),
BIND_GLOBAL_CONSTANT( KEY_MASK_KPAD ),
BIND_GLOBAL_CONSTANT( KEY_MASK_GROUP_SWITCH ),

2
scene/register_scene_types.cpp
View file

@ -77,6 +77,7 @@
#include "scene/gui/reference_frame.h"
#include "scene/gui/graph_node.h"
#include "scene/gui/graph_edit.h"
#include "scene/gui/tool_button.h"
#include "scene/resources/video_stream.h"
#include "scene/2d/particles_2d.h"
#include "scene/2d/path_2d.h"
@ -292,6 +293,7 @@ void register_scene_types() {
ObjectTypeDB::register_type<MenuButton>();
ObjectTypeDB::register_type<CheckBox>();
ObjectTypeDB::register_type<CheckButton>();
ObjectTypeDB::register_type<ToolButton>();
ObjectTypeDB::register_type<Panel>();
ObjectTypeDB::register_type<Range>();