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_i02_01.mdl
+++ b/nwnds_overland/dsw20_i02_01.mdl
@@ -3294,7 +3294,11 @@ node trimesh Plane37_18
  Specular 0.0 0.0 0.0 
  shininess 0
  center -0.5 0.0 40.5 
+<<<<<<< HEAD
  bitmap ttd21_sand01
+=======
+  bitmap trd21_sand08
+>>>>>>> nwnds_acidchalk
  verts 15
    -1.34 5.0 0.33
    -1.34 2.5 0.33
@@ -3366,7 +3370,11 @@ node trimesh Plane37_17
  Specular 0.0 0.0 0.0 
  shininess 0
  center -0.5 0.0 40.5 
+<<<<<<< HEAD
  bitmap ttd21_sand01
+=======
+  bitmap trd21_sand08
+>>>>>>> nwnds_acidchalk
  verts 15
    1.33 -5.0 0.33
    1.33 -2.5 0.33