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_05.mdl
+++ b/nwnds_overland/ttd21_u01_05.mdl
@@ -1877,7 +1877,11 @@ node trimesh u01btm
  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 6
    -5.0 5.0 1.05
    -5.0 6.25 1.05
@@ -1908,7 +1912,11 @@ node trimesh u02btm
  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 12
    -7.5 -5.0 1.05
    -5.0 -5.0 1.05
@@ -1957,7 +1965,11 @@ node trimesh u03btm
  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 9
    -10.71 -9.25 1.05
    -7.5 -11.05 1.05
@@ -1998,7 +2010,11 @@ node trimesh v01btm
  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 10
    0.0 8.04 1.05
    -2.5 6.25 1.05
@@ -2041,7 +2057,11 @@ node trimesh v0201
  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 25
    -5.0 -5.0 1.05
    -2.5 -5.0 1.05
@@ -2138,7 +2158,11 @@ node trimesh v03btm
  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 14
    -2.5 -5.0 1.05
    -5.0 -5.0 1.05
@@ -2194,7 +2218,11 @@ node trimesh w01btm
  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 9
    5.0 7.5 1.05
    5.0 5.0 1.05
@@ -2234,7 +2262,11 @@ node trimesh w02btm
  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 17
    7.5 -2.5 1.05
    5.0 -2.5 1.05
@@ -2302,7 +2334,11 @@ node trimesh w03btm
  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 4
    5.0 -5.0 1.05
    5.23 -6.07 1.25