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_01.mdl
+++ b/nwnds_overland/ttd21_e304_01.mdl
@@ -285,7 +285,11 @@ node trimesh plane20
  Specular 0.0 0.0 0.0 
  shininess 1
  center 0.0 0.0 44.097 
+<<<<<<< HEAD
  bitmap ttd21_sand01
+=======
+  bitmap trd21_sand08
+>>>>>>> nwnds_acidchalk
  verts 31
    -5.0 -1.0 0.0
    -5.0 -5.0 0.0
@@ -1235,7 +1239,11 @@ node trimesh floor133.001
  Specular 0.0 0.0 0.0 
  shininess 10
  center -460.0 -460.269 1190.0 
+<<<<<<< HEAD
  bitmap ttd21_sand01
+=======
+  bitmap trd21_sand08
+>>>>>>> nwnds_acidchalk
  verts 9
    -4.2 4.8 11.8
    -4.8 4.2 11.8