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_b002_01.mdl
+++ b/nwnds_overland/ttd21_b002_01.mdl
@@ -2914,7 +2914,11 @@ node trimesh groundbot09
  specular 0 0 0
  shininess 1
  center -317 -24 33.5
+<<<<<<< HEAD
  bitmap ttd21_sand01
+=======
+  bitmap trd21_sand08
+>>>>>>> nwnds_acidchalk
  verts 23
    -4.8 1.39 -0.46
    -4.8 -0.97 0.04
@@ -3616,7 +3620,11 @@ node trimesh groundbot06
  specular 0 0 0
  shininess 1
  center -341 0 43.5
+<<<<<<< HEAD
  bitmap ttd21_sand01
+=======
+  bitmap trd21_sand08
+>>>>>>> nwnds_acidchalk
  verts 80
    1.39 -4.8 -0.46
    -0.97 4.8 0.04