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

@@ -136,7 +136,11 @@ node trimesh line665
Specular 0.0 0.0 0.0
shininess 1
center 20.5 -7.5 -25.5
<<<<<<< HEAD
bitmap ttd21_sand01
=======
bitmap trd21_sand08
>>>>>>> nwnds_acidchalk
verts 17
-0.76 -0.63 -0.51
-0.63 -0.85 -0.51
@@ -211,7 +215,11 @@ node trimesh plane402
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 45
2.5 -5.0 0.0
5.0 -5.0 0.0
@@ -452,7 +460,11 @@ node trimesh line666
Specular 0.0 0.0 0.0
shininess 1
center -37.0 -8.0 -25.5
<<<<<<< HEAD
bitmap ttd21_sand01
=======
bitmap trd21_sand08
>>>>>>> nwnds_acidchalk
verts 17
0.76 0.63 -0.51
0.63 0.85 -0.51