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/twm21_e007_01.mdl
+++ b/nwnds_overland/twm21_e007_01.mdl
@@ -215,7 +215,11 @@ node trimesh ground_002
  Specular 0.0 0.0 0.0 
  shininess 1
  center 0.0 0.0 462.5 
+<<<<<<< HEAD
  bitmap ttd21_sand01
+=======
+  bitmap trd21_sand08
+>>>>>>> nwnds_acidchalk
  verts 108
    -1.0 -5.0 3.0
    1.19 0.4 4.96