diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2019-09-25 16:30:01 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-09-25 16:30:01 +0200 |
| commit | 28fcc5e25aa9859361c18c22e48ffd893f7e51cb (patch) | |
| tree | a8da3f2732cbbe9e55d576b045352ca1305cde9a /doc/classes | |
| parent | 351c45a4612749da81ffa26783d44880aa1edd7a (diff) | |
| parent | aae25abf3080283bbff29b8264f24d37f935922a (diff) | |
Merge pull request #32291 from Dragoncraft89/add_load_resource_flag
Add flag to control the replacement of files by ProjectSettings.load_resource_pack
Diffstat (limited to 'doc/classes')
| -rw-r--r-- | doc/classes/ProjectSettings.xml | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/doc/classes/ProjectSettings.xml b/doc/classes/ProjectSettings.xml index 3da403c681..abf7c4d4e0 100644 --- a/doc/classes/ProjectSettings.xml +++ b/doc/classes/ProjectSettings.xml @@ -80,9 +80,11 @@ </return> <argument index="0" name="pack" type="String"> </argument> + <argument index="1" name="replace_files" type="bool" default="true"> + </argument> <description> Loads the contents of the .pck or .zip file specified by [code]pack[/code] into the resource filesystem ([code]res://[/code]). Returns [code]true[/code] on success. - [b]Note:[/b] If a file from [code]pack[/code] shares the same path as a file already in the resource filesystem, any attempts to load that file will use the file from [code]pack[/code]. + [b]Note:[/b] If a file from [code]pack[/code] shares the same path as a file already in the resource filesystem, any attempts to load that file will use the file from [code]pack[/code] unless [code]replace_files[/code] is set to [code]false[/code]. </description> </method> <method name="localize_path" qualifiers="const"> |