diff --git a/Models/Props/PickUps/PickUpHolder.mesh b/Models/Props/PickUps/PickUpHolder.mesh index 43bb636..3b5b8e6 100644 Binary files a/Models/Props/PickUps/PickUpHolder.mesh and b/Models/Props/PickUps/PickUpHolder.mesh differ diff --git a/Models/Props/PickUps/PickUpHolder.mtrl b/Models/Props/PickUps/PickUpHolder.mtrl index bd2fa9f..dc13501 100644 Binary files a/Models/Props/PickUps/PickUpHolder.mtrl and b/Models/Props/PickUps/PickUpHolder.mtrl differ diff --git a/Models/Props/Pillars/SciFiPillar2Blue.mesh b/Models/Props/Pillars/SciFiPillar2Blue.mesh new file mode 100644 index 0000000..307c851 Binary files /dev/null and b/Models/Props/Pillars/SciFiPillar2Blue.mesh differ diff --git a/Models/Props/Pillars/SciFiPillar2Blue.mtrl b/Models/Props/Pillars/SciFiPillar2Blue.mtrl new file mode 100644 index 0000000..133f6a8 Binary files /dev/null and b/Models/Props/Pillars/SciFiPillar2Blue.mtrl differ diff --git a/Models/Props/Pillars/SciFiPillar2Red.mesh b/Models/Props/Pillars/SciFiPillar2Red.mesh new file mode 100644 index 0000000..307c851 Binary files /dev/null and b/Models/Props/Pillars/SciFiPillar2Red.mesh differ diff --git a/Models/Props/Pillars/SciFiPillar2Red.mtrl b/Models/Props/Pillars/SciFiPillar2Red.mtrl new file mode 100644 index 0000000..264e0e9 Binary files /dev/null and b/Models/Props/Pillars/SciFiPillar2Red.mtrl differ diff --git a/Models/Props/Pillars/SciFiPillar3Blue.mesh b/Models/Props/Pillars/SciFiPillar3Blue.mesh new file mode 100644 index 0000000..f0fb119 Binary files /dev/null and b/Models/Props/Pillars/SciFiPillar3Blue.mesh differ diff --git a/Models/Props/Pillars/SciFiPillar3Blue.mtrl b/Models/Props/Pillars/SciFiPillar3Blue.mtrl new file mode 100644 index 0000000..fbc223f Binary files /dev/null and b/Models/Props/Pillars/SciFiPillar3Blue.mtrl differ diff --git a/Models/Props/Pillars/SciFiPillar3Red.mesh b/Models/Props/Pillars/SciFiPillar3Red.mesh new file mode 100644 index 0000000..f0fb119 Binary files /dev/null and b/Models/Props/Pillars/SciFiPillar3Red.mesh differ diff --git a/Models/Props/Pillars/SciFiPillar3Red.mtrl b/Models/Props/Pillars/SciFiPillar3Red.mtrl new file mode 100644 index 0000000..28a4f5c Binary files /dev/null and b/Models/Props/Pillars/SciFiPillar3Red.mtrl differ diff --git a/Models/Props/Stones/MediumStone2.mesh b/Models/Props/Stones/MediumStone2.mesh index f40447a..9ba4915 100644 Binary files a/Models/Props/Stones/MediumStone2.mesh and b/Models/Props/Stones/MediumStone2.mesh differ diff --git a/Models/Props/Stones/MediumStone2.mtrl b/Models/Props/Stones/MediumStone2.mtrl index 307c6d8..22fddca 100644 Binary files a/Models/Props/Stones/MediumStone2.mtrl and b/Models/Props/Stones/MediumStone2.mtrl differ diff --git a/Models/Props/Stones/SmallStone1.mesh b/Models/Props/Stones/SmallStone1.mesh index cb7e719..9e4ef81 100644 Binary files a/Models/Props/Stones/SmallStone1.mesh and b/Models/Props/Stones/SmallStone1.mesh differ diff --git a/Models/Props/Stones/SmallStone1.mtrl b/Models/Props/Stones/SmallStone1.mtrl index dea387c..fd37aed 100644 Binary files a/Models/Props/Stones/SmallStone1.mtrl and b/Models/Props/Stones/SmallStone1.mtrl differ diff --git a/Models/Test/Tri.obj b/Models/Test/Tri.obj new file mode 100644 index 0000000..b3102a1 --- /dev/null +++ b/Models/Test/Tri.obj @@ -0,0 +1,10 @@ +o Triangle +v -0.5 -0.5 0.0 +v 0.5 -0.5 0.0 +v -0.5 0.5 0.0 +vt 0 0 +vt 1 0 +vt 0 1 +vn 0 0 1 +s off +f 1/1/1 2/2/1 3/3/1 diff --git a/Textures/DamageIndicator.png b/Textures/DamageIndicator.png new file mode 100644 index 0000000..44bd51f Binary files /dev/null and b/Textures/DamageIndicator.png differ diff --git a/Textures/Props/Bridges/WoodenBridgeDiff.png b/Textures/Props/Bridges/WoodenBridgeDiff.png index d115630..52b9e32 100644 Binary files a/Textures/Props/Bridges/WoodenBridgeDiff.png and b/Textures/Props/Bridges/WoodenBridgeDiff.png differ diff --git a/Textures/Props/PickUps/AmmoPickUpDiff.png b/Textures/Props/PickUps/AmmoPickUpDiff.png index 9d21ef5..f0c2de2 100644 Binary files a/Textures/Props/PickUps/AmmoPickUpDiff.png and b/Textures/Props/PickUps/AmmoPickUpDiff.png differ diff --git a/Textures/Props/PickUps/AmmoPickUpIncd.png b/Textures/Props/PickUps/AmmoPickUpIncd.png index f206e8f..bac1c81 100644 Binary files a/Textures/Props/PickUps/AmmoPickUpIncd.png and b/Textures/Props/PickUps/AmmoPickUpIncd.png differ diff --git a/Textures/Props/PickUps/AmmoPickUpNorm.png b/Textures/Props/PickUps/AmmoPickUpNorm.png index 78b3b0e..8f36dee 100644 Binary files a/Textures/Props/PickUps/AmmoPickUpNorm.png and b/Textures/Props/PickUps/AmmoPickUpNorm.png differ diff --git a/Textures/Props/PickUps/AmmoPickUpSpec.png b/Textures/Props/PickUps/AmmoPickUpSpec.png index 2af2e3f..8d1b1fd 100644 Binary files a/Textures/Props/PickUps/AmmoPickUpSpec.png and b/Textures/Props/PickUps/AmmoPickUpSpec.png differ diff --git a/Textures/Props/PickUps/HealthPickUpDiff.png b/Textures/Props/PickUps/HealthPickUpDiff.png index b2a11e1..618f039 100644 Binary files a/Textures/Props/PickUps/HealthPickUpDiff.png and b/Textures/Props/PickUps/HealthPickUpDiff.png differ diff --git a/Textures/Props/PickUps/HealthPickUpIncd.png b/Textures/Props/PickUps/HealthPickUpIncd.png index 50f8c57..0cfcf2c 100644 Binary files a/Textures/Props/PickUps/HealthPickUpIncd.png and b/Textures/Props/PickUps/HealthPickUpIncd.png differ diff --git a/Textures/Props/PickUps/HealthPickUpNorm.png b/Textures/Props/PickUps/HealthPickUpNorm.png index 9983065..faddac1 100644 Binary files a/Textures/Props/PickUps/HealthPickUpNorm.png and b/Textures/Props/PickUps/HealthPickUpNorm.png differ diff --git a/Textures/Props/PickUps/HealthPickUpSpec.png b/Textures/Props/PickUps/HealthPickUpSpec.png index beb9eb2..f6d9273 100644 Binary files a/Textures/Props/PickUps/HealthPickUpSpec.png and b/Textures/Props/PickUps/HealthPickUpSpec.png differ diff --git a/Textures/Props/PickUps/PickUpHolderDiff.png b/Textures/Props/PickUps/PickUpHolderDiff.png new file mode 100644 index 0000000..fd15abc Binary files /dev/null and b/Textures/Props/PickUps/PickUpHolderDiff.png differ diff --git a/Textures/Props/PickUps/PickUpHolderGlow.png b/Textures/Props/PickUps/PickUpHolderGlow.png new file mode 100644 index 0000000..ab1a6b5 Binary files /dev/null and b/Textures/Props/PickUps/PickUpHolderGlow.png differ diff --git a/Textures/Props/PickUps/PickUpHolderSpec.png b/Textures/Props/PickUps/PickUpHolderSpec.png new file mode 100644 index 0000000..4532ef8 Binary files /dev/null and b/Textures/Props/PickUps/PickUpHolderSpec.png differ diff --git a/Textures/Props/Pillar/SciFiPillar2BlueGlowMap.png b/Textures/Props/Pillar/SciFiPillar2BlueGlowMap.png new file mode 100644 index 0000000..4cfaaa7 Binary files /dev/null and b/Textures/Props/Pillar/SciFiPillar2BlueGlowMap.png differ diff --git a/Textures/Props/Pillar/SciFiPillar2BlueTexture.png b/Textures/Props/Pillar/SciFiPillar2BlueTexture.png new file mode 100644 index 0000000..0f6b26e Binary files /dev/null and b/Textures/Props/Pillar/SciFiPillar2BlueTexture.png differ diff --git a/Textures/Props/Pillar/SciFiPillar2RedGlowMap.png b/Textures/Props/Pillar/SciFiPillar2RedGlowMap.png new file mode 100644 index 0000000..16defdf Binary files /dev/null and b/Textures/Props/Pillar/SciFiPillar2RedGlowMap.png differ diff --git a/Textures/Props/Pillar/SciFiPillar2RedTexture.png b/Textures/Props/Pillar/SciFiPillar2RedTexture.png new file mode 100644 index 0000000..4992d9c Binary files /dev/null and b/Textures/Props/Pillar/SciFiPillar2RedTexture.png differ diff --git a/Textures/Props/Pillar/SciFiPillar3BlueGlowMap.png b/Textures/Props/Pillar/SciFiPillar3BlueGlowMap.png new file mode 100644 index 0000000..294f56d Binary files /dev/null and b/Textures/Props/Pillar/SciFiPillar3BlueGlowMap.png differ diff --git a/Textures/Props/Pillar/SciFiPillar3BlueTexture.png b/Textures/Props/Pillar/SciFiPillar3BlueTexture.png new file mode 100644 index 0000000..3f76524 Binary files /dev/null and b/Textures/Props/Pillar/SciFiPillar3BlueTexture.png differ diff --git a/Textures/Props/Pillar/SciFiPillar3RedGlowMap.png b/Textures/Props/Pillar/SciFiPillar3RedGlowMap.png new file mode 100644 index 0000000..2036b5e Binary files /dev/null and b/Textures/Props/Pillar/SciFiPillar3RedGlowMap.png differ diff --git a/Textures/Props/Pillar/SciFiPillar3RedTexture.png b/Textures/Props/Pillar/SciFiPillar3RedTexture.png new file mode 100644 index 0000000..1ea2659 Binary files /dev/null and b/Textures/Props/Pillar/SciFiPillar3RedTexture.png differ diff --git a/Textures/Props/Stones/MediumStone2Diff.png b/Textures/Props/Stones/MediumStone2Diff.png new file mode 100644 index 0000000..1f86243 Binary files /dev/null and b/Textures/Props/Stones/MediumStone2Diff.png differ diff --git a/Textures/Props/Stones/ShinyCrystalStoneBlueDiff.png b/Textures/Props/Stones/ShinyCrystalStoneBlueDiff.png index 81dfbc5..d46f635 100644 Binary files a/Textures/Props/Stones/ShinyCrystalStoneBlueDiff.png and b/Textures/Props/Stones/ShinyCrystalStoneBlueDiff.png differ diff --git a/Textures/Props/Stones/ShinyCrystalStoneBlueIncd.png b/Textures/Props/Stones/ShinyCrystalStoneBlueIncd.png index 00f87b6..f7fd8d9 100644 Binary files a/Textures/Props/Stones/ShinyCrystalStoneBlueIncd.png and b/Textures/Props/Stones/ShinyCrystalStoneBlueIncd.png differ diff --git a/Textures/Props/Stones/ShinyCrystalStoneRedDiff.png b/Textures/Props/Stones/ShinyCrystalStoneRedDiff.png index 6fbf65c..f1a163a 100644 Binary files a/Textures/Props/Stones/ShinyCrystalStoneRedDiff.png and b/Textures/Props/Stones/ShinyCrystalStoneRedDiff.png differ diff --git a/Textures/Props/Stones/ShinyCrystalStoneRedIncd.png b/Textures/Props/Stones/ShinyCrystalStoneRedIncd.png index 83e5b30..7d6ed20 100644 Binary files a/Textures/Props/Stones/ShinyCrystalStoneRedIncd.png and b/Textures/Props/Stones/ShinyCrystalStoneRedIncd.png differ diff --git a/Textures/Props/Stones/ShinyCrystalStoneSpec.png b/Textures/Props/Stones/ShinyCrystalStoneSpec.png index 5cd8821..29003cc 100644 Binary files a/Textures/Props/Stones/ShinyCrystalStoneSpec.png and b/Textures/Props/Stones/ShinyCrystalStoneSpec.png differ diff --git a/Textures/Props/Stones/SmallStone1Diff.png b/Textures/Props/Stones/SmallStone1Diff.png new file mode 100644 index 0000000..fa0d0e0 Binary files /dev/null and b/Textures/Props/Stones/SmallStone1Diff.png differ