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_w003_01.mdl
+++ b/nwnds_overland/ttd21_w003_01.mdl
@@ -219,7 +219,11 @@ node trimesh object51.003
  Specular 0.0 0.0 0.0 
  shininess 10
  center 0.0 227.5 -50.0 
+<<<<<<< HEAD
  bitmap ttd21_sand01
+=======
+  bitmap trd21_sand08
+>>>>>>> nwnds_acidchalk
  verts 21
    4.5 0.0 -1.0
    2.5 0.2 -0.72