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_u01_06.mdl
+++ b/nwnds_overland/ttd21_u01_06.mdl
@@ -894,7 +894,11 @@ node trimesh v0301
  diffuse 1.0 1.0 1.0 
  specular 0.0 0.0 0.0 
  shininess 1.0
+<<<<<<< HEAD
  bitmap ttd21_sand01
+=======
+  bitmap trd21_sand08
+>>>>>>> nwnds_acidchalk
  verts 24
    -5.0 -5.0 3.0
    -2.5 -5.0 3.0