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_c001_01.mdl
+++ b/nwnds_overland/ttd21_c001_01.mdl
@@ -500,7 +500,11 @@ node trimesh colmesh33
  specular 0.0 0.0 0.0 
  shininess 1
  center -503.5 -194.5 -129.5 
+<<<<<<< HEAD
  bitmap ttd21_sand01
+=======
+  bitmap trd21_sand08
+>>>>>>> nwnds_acidchalk
  verts 51
    -5.72 -5.0 -1.6
    -4.72 -5.0 -1.4