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_e004_01.mdl
+++ b/nwnds_overland/twm21_e004_01.mdl
@@ -218,7 +218,11 @@ node trimesh ground_02.000
  Specular 0.0 0.0 0.0 
  shininess 1
  center 0.0 0.0 0.0 
+<<<<<<< HEAD
  bitmap ttd21_sand01
+=======
+  bitmap trd21_sand08
+>>>>>>> nwnds_acidchalk
  verts 0
  faces 0
  tverts 4
@@ -1182,7 +1186,11 @@ node trimesh ground_01.004
  Specular 0.0 0.0 0.0 
  shininess 1
  center 0.0 0.0 162.5 
+<<<<<<< HEAD
  bitmap ttd21_sand01
+=======
+  bitmap trd21_sand08
+>>>>>>> nwnds_acidchalk
  verts 80
    -5.0 -1.25 0.0
    1.1 5.0 0.5