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/dsw20_i04_01.mdl
+++ b/nwnds_overland/dsw20_i04_01.mdl
@@ -4012,7 +4012,11 @@ node trimesh Plane37_33
  Specular 0.0 0.0 0.0 
  shininess 0
  center 366.0 -368.0 22.5 
+<<<<<<< HEAD
  bitmap ttd21_sand01
+=======
+  bitmap trd21_sand08
+>>>>>>> nwnds_acidchalk
  verts 20
    -1.34 1.32 0.15
    -1.34 -1.18 0.15