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/ttdzg_f05_01.mdl
+++ b/nwnds_overland/ttdzg_f05_01.mdl
@@ -4388,7 +4388,11 @@ node trimesh a_ziggurat
  Specular 0.0 0.0 0.0 
  shininess 1
  center -56.833 -467.0 659.008 
+<<<<<<< HEAD
  bitmap ttd21_sand01
+=======
+  bitmap trd21_sand08
+>>>>>>> nwnds_acidchalk
  verts 273
    -49.47 -27.53 3.0
    -40.56 -27.53 10.76