Sara/behaviour-tree-test
1
0
Fork 0
Code Issues Pull requests Projects Releases 2 Packages Wiki Activity Actions

Merge remote-tracking branch 'origin/gles3' into gles3-on-master

Browse source 
Various merge conflicts have been fixed manually and some mistakes
might have been made - time will tell :)
This commit is contained in:
Rémi Verschelde 2017-01-02 21:38:20 +01:00
commit 3f3f5a5359
287 changed files with 59481 additions and 17904 deletions
Download patch file Download diff file Expand all files Collapse all files

2
tools/editor/code_editor.cpp
View file

@ -895,7 +895,7 @@ void FindReplaceDialog::_bind_methods() {
FindReplaceDialog::FindReplaceDialog() {
set_self_opacity(0.8);
set_self_modulate(Color(1,1,1,0.8));
VBoxContainer *vb = memnew( VBoxContainer );
add_child(vb);