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_e304_03.mdl
+++ b/nwnds_overland/ttd21_e304_03.mdl
@@ -33,7 +33,11 @@ node trimesh plane20.002
  Specular 0.0 0.0 0.0 
  shininess 1
  center 0.0 0.0 40.0 
+<<<<<<< HEAD
  bitmap ttd21_sand01
+=======
+  bitmap trd21_sand08
+>>>>>>> nwnds_acidchalk
  verts 37
    -5.0 -1.0 0.0
    -5.0 -5.0 0.0
@@ -188,7 +192,11 @@ node trimesh floor14.009
  Specular 0.0 0.0 0.0 
  shininess 10
  center 460.0 460.0 1390.0 
+<<<<<<< HEAD
  bitmap ttd21_sand01
+=======
+  bitmap trd21_sand08
+>>>>>>> nwnds_acidchalk
  verts 8
    -4.2 4.5 13.8
    -4.2 5.0 13.8