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_e002_01.mdl
+++ b/nwnds_overland/ttd21_e002_01.mdl
@@ -676,7 +676,11 @@ node trimesh ground_01
  specular 0 0 0
  shininess 1
  center 0 0 653.5
+<<<<<<< HEAD
  bitmap ttd21_sand01
+=======
+  bitmap trd21_sand08
+>>>>>>> nwnds_acidchalk
  verts 104
    -4.2 -2 6
    -3 5 8