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

@@ -69,7 +69,11 @@ node trimesh groups03631
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 6
5.0 -2.0 0.0
3.0 -2.0 0.0
@@ -166,7 +170,11 @@ node trimesh groups03634
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 12
5.0 -5.0 0.0
3.0 -2.0 0.0
@@ -2209,7 +2217,11 @@ node trimesh dirt
Specular 0.0 0.0 0.0
shininess 1
center -100.0 -100.0 0.0
<<<<<<< HEAD
bitmap ttd21_sand01
=======
bitmap trd21_sand08
>>>>>>> nwnds_acidchalk
verts 19
1.15 -2.5 0.0
0.95 -2.3 0.0