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_14.mdl
+++ b/nwnds_overland/ttd21_e000_14.mdl
@@ -225,7 +225,11 @@ node trimesh geom086
  beaming 0
  render 1
  transparencyhint 0
+<<<<<<< HEAD
  bitmap ttd21_sand01
+=======
+  bitmap trd21_sand08
+>>>>>>> nwnds_acidchalk
  rotatetexture 1
  orientation 0 0 0 0
  alpha 1
@@ -492,7 +496,11 @@ node trimesh geom093
  beaming 0
  render 1
  transparencyhint 0
+<<<<<<< HEAD
  bitmap ttd21_sand01
+=======
+  bitmap trd21_sand08
+>>>>>>> nwnds_acidchalk
  rotatetexture 1
  orientation 0 0 0 0
  alpha 1