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_e302_04.mdl
+++ b/nwnds_overland/ttd21_e302_04.mdl
@@ -379,7 +379,11 @@ node trimesh floor14.009
  Specular 0.0 0.0 0.0 
  shininess 10
  center 260.0 0.0 1077.5 
+<<<<<<< HEAD
  bitmap ttd21_sand01
+=======
+  bitmap trd21_sand08
+>>>>>>> nwnds_acidchalk
  verts 25
    3.66 -4.39 11.78
    3.84 3.4 11.77