Merge branch 'nwnds_acidchalk'

This commit is contained in:
Jaysyn904
2021-07-30 07:56:33 -04:00
692 changed files with 75779 additions and 0 deletions

View File

@@ -2482,7 +2482,11 @@ node trimesh Plane37_35
Specular 0.0 0.0 0.0
shininess 0
center 0.5 0.5 22.5
<<<<<<< HEAD
bitmap ttd21_sand01
=======
bitmap trd21_sand08
>>>>>>> nwnds_acidchalk
verts 5
-1.32 -1.33 0.15
1.18 -1.33 0.15
@@ -2522,7 +2526,11 @@ node trimesh Plane37_30
Specular 0.0 0.0 0.0
shininess 0
center -0.5 0.0 22.5
<<<<<<< HEAD
bitmap ttd21_sand01
=======
bitmap trd21_sand08
>>>>>>> nwnds_acidchalk
verts 14
1.33 -5.0 0.15
1.33 -2.5 0.15
@@ -2591,7 +2599,11 @@ node trimesh Plane37_31
Specular 0.0 0.0 0.0
shininess 0
center 0.0 0.5 22.5
<<<<<<< HEAD
bitmap ttd21_sand01
=======
bitmap trd21_sand08
>>>>>>> nwnds_acidchalk
verts 14
5.0 1.34 0.15
2.5 1.34 0.15