Browse Source

remove doubles on elk model, extend textures

master
poikilos 6 years ago
committed by Jacob Gustafson
parent
commit
70ca87db95
  1. 2
      .gitignore
  2. 17
      patches/deprecated/merged-upstream/Bucket_Game/mods/codermobs/codermobs/LICENSE
  3. BIN
      patches/deprecated/merged-upstream/Bucket_Game/mods/codermobs/codermobs/models/codermobs_elk.b3d
  4. BIN
      patches/deprecated/merged-upstream/Bucket_Game/mods/codermobs/codermobs/src/codermobs_elk (HD).xcf
  5. BIN
      patches/deprecated/merged-upstream/Bucket_Game/mods/codermobs/codermobs/src/codermobs_elk.xcf
  6. BIN
      patches/deprecated/merged-upstream/Bucket_Game/mods/codermobs/codermobs/src/codermobs_elk_female_hd.png
  7. BIN
      patches/deprecated/merged-upstream/Bucket_Game/mods/codermobs/codermobs/src/codermobs_elk_male_hd.png
  8. BIN
      patches/deprecated/merged-upstream/Bucket_Game/mods/codermobs/codermobs/src/elk.blend
  9. 0
      patches/deprecated/merged-upstream/Bucket_Game/mods/codermobs/codermobs/src/unused/codermobs_elk_female_pixel_art.png
  10. 0
      patches/deprecated/merged-upstream/Bucket_Game/mods/codermobs/codermobs/src/unused/codermobs_elk_male_pixel_art.png
  11. BIN
      patches/deprecated/merged-upstream/Bucket_Game/mods/codermobs/codermobs/textures/codermobs_elk_female.png
  12. BIN
      patches/deprecated/merged-upstream/Bucket_Game/mods/codermobs/codermobs/textures/codermobs_elk_female_hd.png
  13. BIN
      patches/deprecated/merged-upstream/Bucket_Game/mods/codermobs/codermobs/textures/codermobs_elk_male.png
  14. BIN
      patches/deprecated/merged-upstream/Bucket_Game/mods/codermobs/codermobs/textures/codermobs_elk_male_hd.png

2
.gitignore

@ -1,5 +1,6 @@
*.pyc *.pyc
*.kate-swp *.kate-swp
*.blend1
/nohup.out /nohup.out
/webapp/linux-minetest-kit.zip /webapp/linux-minetest-kit.zip
/webapp/linux-minetest-kit /webapp/linux-minetest-kit
@ -8,4 +9,3 @@
/webapp/program.log /webapp/program.log
/webapp/WIP /webapp/WIP
/webapp/debug.txt /webapp/debug.txt
/patches/Bucket_Game-patched/mods/codermobs/codermobs/src/elk.blend1

17
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": (formerly "deer"), and "ostrich":
See the associated Lua source files. See the associated Lua source files.

BIN
patches/deprecated/merged-upstream/Bucket_Game/mods/codermobs/codermobs/models/codermobs_elk.b3d

Binary file not shown.

BIN
patches/deprecated/merged-upstream/Bucket_Game/mods/codermobs/codermobs/src/codermobs_elk (HD).xcf

Binary file not shown.

BIN
patches/deprecated/merged-upstream/Bucket_Game/mods/codermobs/codermobs/src/codermobs_elk.xcf

Binary file not shown.

BIN
patches/deprecated/merged-upstream/Bucket_Game/mods/codermobs/codermobs/src/codermobs_elk_female_hd.png

Binary file not shown.

Before

Width:  |  Height:  |  Size: 398 KiB

BIN
patches/deprecated/merged-upstream/Bucket_Game/mods/codermobs/codermobs/src/codermobs_elk_male_hd.png

Binary file not shown.

Before

Width:  |  Height:  |  Size: 617 KiB

BIN
patches/deprecated/merged-upstream/Bucket_Game/mods/codermobs/codermobs/src/elk.blend

Binary file not shown.

0
patches/deprecated/merged-upstream/Bucket_Game/mods/codermobs/codermobs/src/codermobs_elk_female_pixel_art.png → patches/deprecated/merged-upstream/Bucket_Game/mods/codermobs/codermobs/src/unused/codermobs_elk_female_pixel_art.png

Before

Width:  |  Height:  |  Size: 237 KiB

After

Width:  |  Height:  |  Size: 237 KiB

0
patches/deprecated/merged-upstream/Bucket_Game/mods/codermobs/codermobs/src/codermobs_elk_male_pixel_art.png → patches/deprecated/merged-upstream/Bucket_Game/mods/codermobs/codermobs/src/unused/codermobs_elk_male_pixel_art.png

Before

Width:  |  Height:  |  Size: 238 KiB

After

Width:  |  Height:  |  Size: 238 KiB

BIN
patches/deprecated/merged-upstream/Bucket_Game/mods/codermobs/codermobs/textures/codermobs_elk_female.png

Binary file not shown.

Before

Width:  |  Height:  |  Size: 11 KiB

After

Width:  |  Height:  |  Size: 13 KiB

BIN
patches/deprecated/merged-upstream/Bucket_Game/mods/codermobs/codermobs/textures/codermobs_elk_female_hd.png

Binary file not shown.

After

Width:  |  Height:  |  Size: 512 KiB

BIN
patches/deprecated/merged-upstream/Bucket_Game/mods/codermobs/codermobs/textures/codermobs_elk_male.png

Binary file not shown.

Before

Width:  |  Height:  |  Size: 15 KiB

After

Width:  |  Height:  |  Size: 18 KiB

BIN
patches/deprecated/merged-upstream/Bucket_Game/mods/codermobs/codermobs/textures/codermobs_elk_male_hd.png

Binary file not shown.

After

Width:  |  Height:  |  Size: 586 KiB

Loading…
Cancel
Save