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/dsc01_ph1_15.mdl
+++ b/nwnds_overland/dsc01_ph1_15.mdl
@@ -141,7 +141,11 @@ node trimesh ground01
  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 65
    -5.0 -5.0 0.0
    -2.5 -5.0 0.0
@@ -4792,7 +4796,11 @@ node trimesh sand01
  Specular 0.0 0.0 0.0 
  shininess 1
  center -32.0 48.5 26.0 
+<<<<<<< HEAD
  bitmap ttd21_sand01
+=======
+  bitmap trd21_sand08
+>>>>>>> nwnds_acidchalk
  verts 12
    -0.56 -0.22 0.0
    -0.08 -0.85 0.0