diff options
| author | DS <vorunbekannt75@web.de> | 2021-02-23 19:39:15 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-02-23 19:39:15 +0100 |
| commit | 4abe4b87b5902bff229505b83b9bddb9a8f759cd (patch) | |
| tree | 7c90751b6c17fdc380a9c1f28db9cdbccd8978bb /games | |
| parent | 29681085b9762e8cf0e953014ca0e8d2890713ef (diff) | |
| download | minetest-4abe4b87b5902bff229505b83b9bddb9a8f759cd.tar.gz minetest-4abe4b87b5902bff229505b83b9bddb9a8f759cd.tar.bz2 minetest-4abe4b87b5902bff229505b83b9bddb9a8f759cd.zip | |
Allow overwriting media files of dependencies (#10752)
Diffstat (limited to 'games')
| -rw-r--r-- | games/devtest/mods/basenodes/textures/default_dirt.png | bin | 790 -> 7303 bytes | |||
| -rw-r--r-- | games/devtest/mods/basenodes/textures/dirt_with_grass/info.txt | 3 | ||||
| -rw-r--r-- | games/devtest/mods/basenodes/textures/info.txt | 7 | ||||
| -rw-r--r-- | games/devtest/mods/unittests/mod.conf | 1 | ||||
| -rw-r--r-- | games/devtest/mods/unittests/textures/default_dirt.png | bin | 0 -> 790 bytes |
5 files changed, 8 insertions, 3 deletions
diff --git a/games/devtest/mods/basenodes/textures/default_dirt.png b/games/devtest/mods/basenodes/textures/default_dirt.png Binary files differindex 58670305d..aa75bffb6 100644 --- a/games/devtest/mods/basenodes/textures/default_dirt.png +++ b/games/devtest/mods/basenodes/textures/default_dirt.png diff --git a/games/devtest/mods/basenodes/textures/dirt_with_grass/info.txt b/games/devtest/mods/basenodes/textures/dirt_with_grass/info.txt deleted file mode 100644 index 8db21ed9c..000000000 --- a/games/devtest/mods/basenodes/textures/dirt_with_grass/info.txt +++ /dev/null @@ -1,3 +0,0 @@ -This is for testing loading textures from subfolders. -If it works correctly, the default_grass_side.png file in this folder is used but -default_grass.png is not overwritten by the file in this folder. diff --git a/games/devtest/mods/basenodes/textures/info.txt b/games/devtest/mods/basenodes/textures/info.txt new file mode 100644 index 000000000..2d4ef7efa --- /dev/null +++ b/games/devtest/mods/basenodes/textures/info.txt @@ -0,0 +1,7 @@ + +The dirt_with_grass folder is for testing loading textures from subfolders. +If it works correctly, the default_grass_side.png file in the folder is used but +default_grass.png is not overwritten by the file in the folder. + +default_dirt.png should be overwritten by the default_dirt.png in the unittests +mod which depends on basenodes. diff --git a/games/devtest/mods/unittests/mod.conf b/games/devtest/mods/unittests/mod.conf index 0d5e3c959..fa94e01a6 100644 --- a/games/devtest/mods/unittests/mod.conf +++ b/games/devtest/mods/unittests/mod.conf @@ -1,2 +1,3 @@ name = unittests description = Adds automated unit tests for the engine +depends = basenodes diff --git a/games/devtest/mods/unittests/textures/default_dirt.png b/games/devtest/mods/unittests/textures/default_dirt.png Binary files differnew file mode 100644 index 000000000..58670305d --- /dev/null +++ b/games/devtest/mods/unittests/textures/default_dirt.png |
