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/dsw01_m02_01.mdl
+++ b/nwnds_overland/dsw01_m02_01.mdl
@@ -128,7 +128,11 @@ node trimesh groups03600
  Specular 0.0 0.0 0.0 
  shininess 1
  center 250.0 -250.0 0.0 
+<<<<<<< HEAD
  bitmap ttd21_sand01
+=======
+  bitmap trd21_sand08
+>>>>>>> nwnds_acidchalk
  verts 6
    5.0 -5.0 0.0
    5.0 -2.5 0.0
@@ -168,7 +172,11 @@ node trimesh groups03604
  Specular 0.0 0.0 0.0 
  shininess 1
  center 0.0 0.0 0.0 
+<<<<<<< HEAD
  bitmap ttd21_sand01
+=======
+  bitmap trd21_sand08
+>>>>>>> nwnds_acidchalk
  verts 14
    2.0 5.0 0.0
    2.0 3.0 0.0