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_s020_01.mdl
+++ b/nwnds_overland/ttd21_s020_01.mdl
@@ -450,7 +450,11 @@ node trimesh Plane02
  specular 0.0 0.0 0.0 
  shininess 1
  center 20.0 -163.0 0.0 
+<<<<<<< HEAD
  bitmap ttd21_sand01
+=======
+  bitmap trd21_sand08
+>>>>>>> nwnds_acidchalk
  verts 4
    5.2 3.37 0.0
    -4.8 -6.63 0.0