diff --git a/.gitignore b/.gitignore index e2c99d0..6504f35 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,6 @@ *.pyc *.kate-swp +*.blend1 /nohup.out /webapp/linux-minetest-kit.zip /webapp/linux-minetest-kit @@ -8,4 +9,3 @@ /webapp/program.log /webapp/WIP /webapp/debug.txt -/patches/Bucket_Game-patched/mods/codermobs/codermobs/src/elk.blend1 diff --git a/patches/deprecated/merged-upstream/Bucket_Game/mods/codermobs/codermobs/LICENSE b/patches/deprecated/merged-upstream/Bucket_Game/mods/codermobs/codermobs/LICENSE index e53fdc1..c1e0cff 100644 --- a/patches/deprecated/merged-upstream/Bucket_Game/mods/codermobs/codermobs/LICENSE +++ b/patches/deprecated/merged-upstream/Bucket_Game/mods/codermobs/codermobs/LICENSE @@ -11,13 +11,18 @@ Kiraly). ---------------------------------------------------------------------- -Pixel Art Elk texture: -CC BY SA 3.0 copyright Sapier, Polikilos (skinned by) -HD (video-based) and Lo-fi (16-color video-based) Elk Textures: -based on Elk video "Elk.webm.360p.vp9" (CC BY 2.0 Generic) -Stephen Baker [BLM/Oregon](blm.gov/yg5c).jpg, Poikilos (skinned by) -Other code and media for Sapier's "animal_materials", "elk" +Unused Pixel Art (approximately 7 colors) Elk texture: + Copyright Sapier and Poikilos + (converted to UV-mapped texture by Poikilos) + Creative Commons Attribution Share-Alike 3.0 + +HD Elk texture and default (16-color realistic) texture: + Copyright Stephen Baker (BLM/Oregon) and Poikilos + (converted to UV-mapped texture by Poikilos) + Creative Commons Attribution 2.0 Generic + +Other code and media for Sapier's "animal_materials", "elk": (formerly "deer"), and "ostrich": See the associated Lua source files. diff --git a/patches/deprecated/merged-upstream/Bucket_Game/mods/codermobs/codermobs/models/codermobs_elk.b3d b/patches/deprecated/merged-upstream/Bucket_Game/mods/codermobs/codermobs/models/codermobs_elk.b3d index c642663..482584b 100644 Binary files a/patches/deprecated/merged-upstream/Bucket_Game/mods/codermobs/codermobs/models/codermobs_elk.b3d and b/patches/deprecated/merged-upstream/Bucket_Game/mods/codermobs/codermobs/models/codermobs_elk.b3d differ diff --git a/patches/deprecated/merged-upstream/Bucket_Game/mods/codermobs/codermobs/src/codermobs_elk (HD).xcf b/patches/deprecated/merged-upstream/Bucket_Game/mods/codermobs/codermobs/src/codermobs_elk (HD).xcf new file mode 100644 index 0000000..cace583 Binary files /dev/null and b/patches/deprecated/merged-upstream/Bucket_Game/mods/codermobs/codermobs/src/codermobs_elk (HD).xcf differ diff --git a/patches/deprecated/merged-upstream/Bucket_Game/mods/codermobs/codermobs/src/codermobs_elk.xcf b/patches/deprecated/merged-upstream/Bucket_Game/mods/codermobs/codermobs/src/codermobs_elk.xcf index 5e36007..0d2dc15 100644 Binary files a/patches/deprecated/merged-upstream/Bucket_Game/mods/codermobs/codermobs/src/codermobs_elk.xcf and b/patches/deprecated/merged-upstream/Bucket_Game/mods/codermobs/codermobs/src/codermobs_elk.xcf differ diff --git a/patches/deprecated/merged-upstream/Bucket_Game/mods/codermobs/codermobs/src/codermobs_elk_female_hd.png b/patches/deprecated/merged-upstream/Bucket_Game/mods/codermobs/codermobs/src/codermobs_elk_female_hd.png deleted file mode 100644 index 6bbd187..0000000 Binary files a/patches/deprecated/merged-upstream/Bucket_Game/mods/codermobs/codermobs/src/codermobs_elk_female_hd.png and /dev/null differ diff --git a/patches/deprecated/merged-upstream/Bucket_Game/mods/codermobs/codermobs/src/codermobs_elk_male_hd.png b/patches/deprecated/merged-upstream/Bucket_Game/mods/codermobs/codermobs/src/codermobs_elk_male_hd.png deleted file mode 100644 index be9b3b8..0000000 Binary files a/patches/deprecated/merged-upstream/Bucket_Game/mods/codermobs/codermobs/src/codermobs_elk_male_hd.png and /dev/null differ diff --git a/patches/deprecated/merged-upstream/Bucket_Game/mods/codermobs/codermobs/src/elk.blend b/patches/deprecated/merged-upstream/Bucket_Game/mods/codermobs/codermobs/src/elk.blend index 18bfcf9..f6a5228 100644 Binary files a/patches/deprecated/merged-upstream/Bucket_Game/mods/codermobs/codermobs/src/elk.blend and b/patches/deprecated/merged-upstream/Bucket_Game/mods/codermobs/codermobs/src/elk.blend differ diff --git a/patches/deprecated/merged-upstream/Bucket_Game/mods/codermobs/codermobs/src/codermobs_elk_female_pixel_art.png b/patches/deprecated/merged-upstream/Bucket_Game/mods/codermobs/codermobs/src/unused/codermobs_elk_female_pixel_art.png similarity index 100% rename from patches/deprecated/merged-upstream/Bucket_Game/mods/codermobs/codermobs/src/codermobs_elk_female_pixel_art.png rename to patches/deprecated/merged-upstream/Bucket_Game/mods/codermobs/codermobs/src/unused/codermobs_elk_female_pixel_art.png diff --git a/patches/deprecated/merged-upstream/Bucket_Game/mods/codermobs/codermobs/src/codermobs_elk_male_pixel_art.png b/patches/deprecated/merged-upstream/Bucket_Game/mods/codermobs/codermobs/src/unused/codermobs_elk_male_pixel_art.png similarity index 100% rename from patches/deprecated/merged-upstream/Bucket_Game/mods/codermobs/codermobs/src/codermobs_elk_male_pixel_art.png rename to patches/deprecated/merged-upstream/Bucket_Game/mods/codermobs/codermobs/src/unused/codermobs_elk_male_pixel_art.png diff --git a/patches/deprecated/merged-upstream/Bucket_Game/mods/codermobs/codermobs/textures/codermobs_elk_female.png b/patches/deprecated/merged-upstream/Bucket_Game/mods/codermobs/codermobs/textures/codermobs_elk_female.png index 84197f7..16d27d9 100644 Binary files a/patches/deprecated/merged-upstream/Bucket_Game/mods/codermobs/codermobs/textures/codermobs_elk_female.png and b/patches/deprecated/merged-upstream/Bucket_Game/mods/codermobs/codermobs/textures/codermobs_elk_female.png differ diff --git a/patches/deprecated/merged-upstream/Bucket_Game/mods/codermobs/codermobs/textures/codermobs_elk_female_hd.png b/patches/deprecated/merged-upstream/Bucket_Game/mods/codermobs/codermobs/textures/codermobs_elk_female_hd.png new file mode 100644 index 0000000..1181744 Binary files /dev/null and b/patches/deprecated/merged-upstream/Bucket_Game/mods/codermobs/codermobs/textures/codermobs_elk_female_hd.png differ diff --git a/patches/deprecated/merged-upstream/Bucket_Game/mods/codermobs/codermobs/textures/codermobs_elk_male.png b/patches/deprecated/merged-upstream/Bucket_Game/mods/codermobs/codermobs/textures/codermobs_elk_male.png index 8f8d6de..1e130db 100644 Binary files a/patches/deprecated/merged-upstream/Bucket_Game/mods/codermobs/codermobs/textures/codermobs_elk_male.png and b/patches/deprecated/merged-upstream/Bucket_Game/mods/codermobs/codermobs/textures/codermobs_elk_male.png differ diff --git a/patches/deprecated/merged-upstream/Bucket_Game/mods/codermobs/codermobs/textures/codermobs_elk_male_hd.png b/patches/deprecated/merged-upstream/Bucket_Game/mods/codermobs/codermobs/textures/codermobs_elk_male_hd.png new file mode 100644 index 0000000..a68bace Binary files /dev/null and b/patches/deprecated/merged-upstream/Bucket_Game/mods/codermobs/codermobs/textures/codermobs_elk_male_hd.png differ