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_05.mdl
+++ b/nwnds_overland/ttd21_s200_05.mdl
@@ -796,7 +796,11 @@ node trimesh wok01
  Specular 0.0 0.0 0.0 
  shininess 1
  center 0.0 0.0 32.5 
+<<<<<<< HEAD
  bitmap ttd21_sand01
+=======
+  bitmap trd21_sand08
+>>>>>>> nwnds_acidchalk
  verts 46
    -5.0 -5.0 0.0
    -2.5 -5.0 0.0
@@ -973,7 +977,11 @@ node aabb wok01
  orientation 1.0 0.0 0.0 0.0
  wirecolor 0.0 0.0 0.0 
  multimaterial 2
+<<<<<<< HEAD
    ttd21_sand01
+=======
+    trd21_sand08
+>>>>>>> nwnds_acidchalk
    ds_tt_stucco06
  bitmap NULL
  verts 142