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/dsdct_z004_01.mdl
+++ b/nwnds_overland/dsdct_z004_01.mdl
@@ -3041,7 +3041,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
    -5.0 -5.0 3.0
    -2.5 -5.0 3.0
@@ -3113,7 +3117,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
    5.0 5.0 3.0
    2.5 5.0 3.0