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_e102_02.mdl
+++ b/nwnds_overland/twm21_e102_02.mdl
@@ -814,7 +814,11 @@ node trimesh roc01.001
  specular 0 0 0
  shininess 1
  center 0 0 566.5
+<<<<<<< HEAD
  bitmap ttd21_sand01
+=======
+  bitmap trd21_sand08
+>>>>>>> nwnds_acidchalk
  verts 80
    -0.48 3.53 5.57
    0.47 -3.53 5.57
@@ -1529,7 +1533,11 @@ node trimesh roc01.003
  diffuse 1 1 1
  specular 0 0 0
  shininess 1
+<<<<<<< HEAD
  bitmap ttd21_sand01
+=======
+  bitmap trd21_sand08
+>>>>>>> nwnds_acidchalk
  verts 103
    1 5 3
    1.1 -5 3.5