Merge branch 'nwnds_acidchalk'

2021-07-30 07:56:33 -04:00
parent c5a358631d e5772c4db7
commit ba375e1833
692 changed files with 75779 additions and 0 deletions
--- a/nwnds_overland/ttd22_e004_01.mdl
+++ b/nwnds_overland/ttd22_e004_01.mdl
@@ -1948,7 +1948,11 @@ node trimesh Sand01
  diffuse 1.00 1.00 1.00
  specular 0.00 0.00 0.00
  selfillumcolor 0.00 0.00 0.00
+<<<<<<< HEAD
  bitmap ttd21_sand01
+=======
+  bitmap trd21_sand08
+>>>>>>> nwnds_acidchalk
  shininess 10
  rotatetexture 0
  tilefade 0