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_z009_01.mdl
+++ b/nwnds_overland/dsdct_z009_01.mdl
@@ -1973,7 +1973,11 @@ node trimesh Sand01
  Specular 0.0 0.0 0.0 
  shininess 10
  center 0.0 0.0 342.667 
+<<<<<<< HEAD
  bitmap ttd21_sand01
+=======
+  bitmap trd21_sand08
+>>>>>>> nwnds_acidchalk
  verts 305
    0.86 -4.28 3.22
    -2.5 -5.0 3.5