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/ttd21_s200_07.mdl
+++ b/nwnds_overland/ttd21_s200_07.mdl
@@ -33,7 +33,11 @@ node trimesh groundbot109.007
  Specular 0.0 0.0 0.0 
  shininess 1
  center 0.0 0.0 348.0 
+<<<<<<< HEAD
  bitmap ttd21_sand01
+=======
+  bitmap trd21_sand08
+>>>>>>> nwnds_acidchalk
  verts 116
    -4.8 -4.8 3.0
    -4.8 4.8 3.0
@@ -2036,7 +2040,11 @@ node aabb wok
  orientation 1.0 0.0 0.0 0.0
  wirecolor 0.0196078 0.517647 0.0196078 
  multimaterial 3
+<<<<<<< HEAD
    ttd21_sand01
+=======
+    trd21_sand08
+>>>>>>> nwnds_acidchalk
    ds_tt_stucco08
    black
  bitmap NULL