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_c002_01.mdl
+++ b/nwnds_overland/ttd21_c002_01.mdl
@@ -1187,7 +1187,11 @@ node trimesh colmesh32
  specular 0.0 0.0 0.0 
  shininess 1
  center -201.0 0.0 -135.0 
+<<<<<<< HEAD
  bitmap ttd21_sand01
+=======
+  bitmap trd21_sand08
+>>>>>>> nwnds_acidchalk
  verts 60
    -3.0 -5.0 -1.6
    -2.0 -5.0 -1.4