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_s100_01.mdl
+++ b/nwnds_overland/ttd21_s100_01.mdl
@@ -2840,7 +2840,11 @@ node trimesh 07
  Specular 0.0 0.0 0.0 
  shininess 1
  center 0.0 0.0 632.5 
+<<<<<<< HEAD
  bitmap ttd21_sand01
+=======
+  bitmap trd21_sand08
+>>>>>>> nwnds_acidchalk
  verts 205
    3.2 3.7 9.62
    -2.0 3.7 7.0