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_e302_01.mdl
+++ b/nwnds_overland/ttd21_e302_01.mdl
@@ -508,7 +508,11 @@ node trimesh floor14
  Specular 0.0 0.0 0.0 
  shininess 10
  center 0.0 109.29 68.5 
+<<<<<<< HEAD
  bitmap ttd21_sand01
+=======
+  bitmap trd21_sand08
+>>>>>>> nwnds_acidchalk
  verts 58
    -5.0 -1.0 0.0
    -5.0 -3.0 0.0
@@ -1386,7 +1390,11 @@ node trimesh floor14.006
  Specular 0.0 0.0 0.0 
  shininess 10
  center 365.581 0.0 1140.8 
+<<<<<<< HEAD
  bitmap ttd21_sand01
+=======
+  bitmap trd21_sand08
+>>>>>>> nwnds_acidchalk
  verts 27
    4.3 -3.89 11.83
    3.19 2.62 11.9