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_b120_01.mdl
+++ b/nwnds_overland/ttd21_b120_01.mdl
@@ -418,7 +418,11 @@ node trimesh wok003
  Specular 0.0 0.0 0.0 
  shininess 1
  center 1000.0 -1000.0 332.5 
+<<<<<<< HEAD
  bitmap ttd21_sand01
+=======
+  bitmap trd21_sand08
+>>>>>>> nwnds_acidchalk
  verts 46
    5.0 -15.0 3.0
    7.5 -15.0 3.0