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_e000_07.mdl
+++ b/nwnds_overland/ttd21_e000_07.mdl
@@ -562,7 +562,11 @@ node trimesh grass
  specular 0.0 0.0 0.0 
  shininess 10
  center 0.0 0.0 -2.5 
+<<<<<<< HEAD
  bitmap ttd21_sand01
+=======
+  bitmap trd21_sand08
+>>>>>>> nwnds_acidchalk
  verts 81
    4.0 -4.0 0.0
    3.99 -2.67 0.0