diff options
author | Rémi Verschelde <rverschelde@gmail.com> | 2018-09-15 02:29:52 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-09-15 02:29:52 +0200 |
commit | 82ff99c18005f67c6d7692abf7594e31fc067f3c (patch) | |
tree | 756ee21e5f458643392dc175bde7b74bcb6c5c90 /modules/gdscript/gdscript_editor.cpp | |
parent | d423906c03e02d5682ca018c387c148437278902 (diff) | |
parent | c0e4d7efca7eb24e91783a0ee15ac0ef0248833c (diff) | |
download | redot-engine-82ff99c18005f67c6d7692abf7594e31fc067f3c.tar.gz |
Merge pull request #22087 from Faless/master_of_puppets
Deprecate slave keyword in favor of puppet.
Diffstat (limited to 'modules/gdscript/gdscript_editor.cpp')
-rw-r--r-- | modules/gdscript/gdscript_editor.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/modules/gdscript/gdscript_editor.cpp b/modules/gdscript/gdscript_editor.cpp index affb73a048..32a7668760 100644 --- a/modules/gdscript/gdscript_editor.cpp +++ b/modules/gdscript/gdscript_editor.cpp @@ -2109,8 +2109,8 @@ static void _find_identifiers(const GDScriptCompletionContext &p_context, bool p "and", "in", "not", "or", "false", "PI", "TAU", "INF", "NAN", "self", "true", "as", "assert", "breakpoint", "class", "extends", "is", "func", "preload", "setget", "signal", "tool", "yield", "const", "enum", "export", "onready", "static", "var", "break", "continue", "if", "elif", - "else", "for", "pass", "return", "match", "while", "remote", "sync", "master", "slave", - "remotesync", "mastersync", "slavesync", + "else", "for", "pass", "return", "match", "while", "remote", "sync", "master", "puppet", "slave", + "remotesync", "mastersync", "puppetsync", 0 }; |