Merge branch 'needstobetested'

This commit is contained in:
8B0000
2023-07-14 21:13:21 -04:00
303 changed files with 43582 additions and 46155 deletions

BIN
Content/Audio/empActive.wav Normal file

Binary file not shown.

BIN
Content/Audio/gunshotSM.wav Normal file

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

View File

@@ -1,12 +1,12 @@
# Blender MTL File: 'None' # Blender MTL File: 'None'
# Material Count: 1 # Material Count: 1
newmtl RDS newmtl Material
Ns 225.000000 Ns 323.999994
Ka 1.000000 1.000000 1.000000 Ka 1.000000 1.000000 1.000000
Kd 0.800000 0.800000 0.800000 Kd 0.800000 0.800000 0.800000
Ks 0.500000 0.500000 0.500000 Ks 0.500000 0.500000 0.500000
Ke 0.000000 0.000000 0.000000 Ke 0.000000 0.000000 0.000000
Ni 1.000000 Ni 1.450000
d 1.000000 d 1.000000
illum 2 illum 2

File diff suppressed because it is too large Load Diff

View File

@@ -1,4 +1,4 @@
# Blender MTL File: 'ump45.blend' # Blender MTL File: 'emp.blend'
# Material Count: 2 # Material Count: 2
newmtl Material newmtl Material

File diff suppressed because it is too large Load Diff

View File

@@ -1,8 +1,8 @@
# Blender MTL File: 'ithica37.blend' # Blender MTL File: 'shippingcontainer.blend'
# Material Count: 2 # Material Count: 2
newmtl Material newmtl Material
Ns 225.000000 Ns 323.999994
Ka 1.000000 1.000000 1.000000 Ka 1.000000 1.000000 1.000000
Kd 0.800000 0.800000 0.800000 Kd 0.800000 0.800000 0.800000
Ks 0.500000 0.500000 0.500000 Ks 0.500000 0.500000 0.500000

File diff suppressed because it is too large Load Diff

Binary file not shown.

Binary file not shown.

After

Width:  |  Height:  |  Size: 23 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 23 KiB

Binary file not shown.

Binary file not shown.

After

Width:  |  Height:  |  Size: 282 B

Binary file not shown.

Binary file not shown.

After

Width:  |  Height:  |  Size: 10 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 10 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 10 KiB

File diff suppressed because it is too large Load Diff

View File

@@ -1,12 +0,0 @@
# Blender MTL File: 'None'
# Material Count: 1
newmtl RDS
Ns 225.000000
Ka 1.000000 1.000000 1.000000
Kd 0.800000 0.800000 0.800000
Ks 0.500000 0.500000 0.500000
Ke 0.000000 0.000000 0.000000
Ni 1.000000
d 1.000000
illum 2

View File

@@ -1,73 +0,0 @@
# Blender v2.93.3 OBJ File: ''
# www.blender.org
mtllib rds2.mtl
o Cube.001
v -3.502983 1.506717 0.000000
v -3.535629 0.362103 1.173369
v -3.535628 0.362103 -1.173368
v -3.535628 0.730983 -1.405534
v -3.535629 0.730983 1.405535
v -3.525660 1.032385 -1.497375
v -3.515692 1.333787 -1.549575
v -3.525661 1.032385 1.497376
v -3.505724 1.738655 -1.549575
v -3.505725 1.738655 1.549576
v -3.515693 1.333787 1.549576
v -3.490772 2.017564 -1.497375
v -3.475820 2.296474 -1.372651
v -3.490773 2.017564 1.497376
v -3.435948 2.611371 -1.063524
v -3.435949 2.611371 1.063525
v -3.475821 2.296474 1.372652
vt 0.502558 0.500000
vt 0.350223 0.613414
vt 0.350223 0.386586
vt 0.399257 0.364146
vt 0.399257 0.635854
vt 0.439378 0.355269
vt 0.479499 0.350223
vt 0.439378 0.644731
vt 0.533373 0.350223
vt 0.533373 0.649777
vt 0.479499 0.649777
vt 0.570532 0.355269
vt 0.607692 0.367324
vt 0.570532 0.644731
vt 0.649777 0.397203
vt 0.649777 0.602797
vt 0.607692 0.632676
vn 0.9990 -0.0436 0.0000
vn 0.9998 -0.0173 0.0110
vn 0.9998 -0.0173 -0.0110
vn 0.9997 -0.0220 -0.0111
vn 0.9997 -0.0220 0.0111
vn 0.9994 -0.0341 -0.0043
vn 0.9996 -0.0293 -0.0049
vn 0.9994 -0.0341 0.0043
vn 0.9992 -0.0387 -0.0076
vn 0.9992 -0.0387 0.0076
vn 0.9996 -0.0293 0.0049
vn 0.9987 -0.0507 -0.0091
vn 0.9973 -0.0701 -0.0206
vn 0.9987 -0.0507 0.0091
vn 0.9964 -0.0818 -0.0222
vn 0.9964 -0.0818 0.0222
vn 0.9973 -0.0701 0.0206
usemtl RDS
s 1
f 1/1/1 2/2/2 3/3/3
f 1/1/1 3/3/3 4/4/4
f 1/1/1 5/5/5 2/2/2
f 1/1/1 6/6/6 7/7/7
f 1/1/1 8/8/8 5/5/5
f 1/1/1 7/7/7 9/9/9
f 1/1/1 10/10/10 11/11/11
f 1/1/1 12/12/12 13/13/13
f 1/1/1 14/14/14 10/10/10
f 1/1/1 15/15/15 16/16/16
f 1/1/1 16/16/16 17/17/17
f 1/1/1 13/13/13 15/15/15
f 1/1/1 4/4/4 6/6/6
f 1/1/1 11/11/11 8/8/8
f 1/1/1 9/9/9 12/12/12
f 1/1/1 17/17/17 14/14/14

Binary file not shown.

Before

Width:  |  Height:  |  Size: 32 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 9.2 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 504 B

Binary file not shown.

Binary file not shown.

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

Some files were not shown because too many files have changed in this diff Show More