Skip to content

Commit 4459602

Browse files
Merge pull request #13 from dlweatherhead/final-match-testing-bugfixes
Final match testing bugfixes
2 parents a9688f3 + 39bf2a0 commit 4459602

23 files changed

Lines changed: 655 additions & 53 deletions
Lines changed: 77 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,77 @@
1+
%YAML 1.1
2+
%TAG !u! tag:unity3d.com,2011:
3+
--- !u!21 &2100000
4+
Material:
5+
serializedVersion: 6
6+
m_ObjectHideFlags: 0
7+
m_CorrespondingSourceObject: {fileID: 0}
8+
m_PrefabInstance: {fileID: 0}
9+
m_PrefabAsset: {fileID: 0}
10+
m_Name: PlayerAShoot
11+
m_Shader: {fileID: 10755, guid: 0000000000000000f000000000000000, type: 0}
12+
m_ShaderKeywords:
13+
m_LightmapFlags: 4
14+
m_EnableInstancingVariants: 0
15+
m_DoubleSidedGI: 0
16+
m_CustomRenderQueue: -1
17+
stringTagMap: {}
18+
disabledShaderPasses: []
19+
m_SavedProperties:
20+
serializedVersion: 3
21+
m_TexEnvs:
22+
- _BumpMap:
23+
m_Texture: {fileID: 0}
24+
m_Scale: {x: 1, y: 1}
25+
m_Offset: {x: 0, y: 0}
26+
- _DetailAlbedoMap:
27+
m_Texture: {fileID: 0}
28+
m_Scale: {x: 1, y: 1}
29+
m_Offset: {x: 0, y: 0}
30+
- _DetailMask:
31+
m_Texture: {fileID: 0}
32+
m_Scale: {x: 1, y: 1}
33+
m_Offset: {x: 0, y: 0}
34+
- _DetailNormalMap:
35+
m_Texture: {fileID: 0}
36+
m_Scale: {x: 1, y: 1}
37+
m_Offset: {x: 0, y: 0}
38+
- _EmissionMap:
39+
m_Texture: {fileID: 0}
40+
m_Scale: {x: 1, y: 1}
41+
m_Offset: {x: 0, y: 0}
42+
- _MainTex:
43+
m_Texture: {fileID: 0}
44+
m_Scale: {x: 1, y: 1}
45+
m_Offset: {x: 0, y: 0}
46+
- _MetallicGlossMap:
47+
m_Texture: {fileID: 0}
48+
m_Scale: {x: 1, y: 1}
49+
m_Offset: {x: 0, y: 0}
50+
- _OcclusionMap:
51+
m_Texture: {fileID: 0}
52+
m_Scale: {x: 1, y: 1}
53+
m_Offset: {x: 0, y: 0}
54+
- _ParallaxMap:
55+
m_Texture: {fileID: 0}
56+
m_Scale: {x: 1, y: 1}
57+
m_Offset: {x: 0, y: 0}
58+
m_Floats:
59+
- _BumpScale: 1
60+
- _Cutoff: 0.5
61+
- _DetailNormalMapScale: 1
62+
- _DstBlend: 0
63+
- _GlossMapScale: 1
64+
- _Glossiness: 0.5
65+
- _GlossyReflections: 1
66+
- _Metallic: 0
67+
- _Mode: 0
68+
- _OcclusionStrength: 1
69+
- _Parallax: 0.02
70+
- _SmoothnessTextureChannel: 0
71+
- _SpecularHighlights: 1
72+
- _SrcBlend: 1
73+
- _UVSec: 0
74+
- _ZWrite: 1
75+
m_Colors:
76+
- _Color: {r: 0.12941177, g: 0.5882353, b: 0.9529412, a: 1}
77+
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1}

Entelect Challenge 2019 Visualiser/Assets/Materials/PlayerAShoot.mat.meta

Lines changed: 8 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
Lines changed: 77 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,77 @@
1+
%YAML 1.1
2+
%TAG !u! tag:unity3d.com,2011:
3+
--- !u!21 &2100000
4+
Material:
5+
serializedVersion: 6
6+
m_ObjectHideFlags: 0
7+
m_CorrespondingSourceObject: {fileID: 0}
8+
m_PrefabInstance: {fileID: 0}
9+
m_PrefabAsset: {fileID: 0}
10+
m_Name: PlayerBShoot
11+
m_Shader: {fileID: 10755, guid: 0000000000000000f000000000000000, type: 0}
12+
m_ShaderKeywords:
13+
m_LightmapFlags: 4
14+
m_EnableInstancingVariants: 0
15+
m_DoubleSidedGI: 0
16+
m_CustomRenderQueue: -1
17+
stringTagMap: {}
18+
disabledShaderPasses: []
19+
m_SavedProperties:
20+
serializedVersion: 3
21+
m_TexEnvs:
22+
- _BumpMap:
23+
m_Texture: {fileID: 0}
24+
m_Scale: {x: 1, y: 1}
25+
m_Offset: {x: 0, y: 0}
26+
- _DetailAlbedoMap:
27+
m_Texture: {fileID: 0}
28+
m_Scale: {x: 1, y: 1}
29+
m_Offset: {x: 0, y: 0}
30+
- _DetailMask:
31+
m_Texture: {fileID: 0}
32+
m_Scale: {x: 1, y: 1}
33+
m_Offset: {x: 0, y: 0}
34+
- _DetailNormalMap:
35+
m_Texture: {fileID: 0}
36+
m_Scale: {x: 1, y: 1}
37+
m_Offset: {x: 0, y: 0}
38+
- _EmissionMap:
39+
m_Texture: {fileID: 0}
40+
m_Scale: {x: 1, y: 1}
41+
m_Offset: {x: 0, y: 0}
42+
- _MainTex:
43+
m_Texture: {fileID: 0}
44+
m_Scale: {x: 1, y: 1}
45+
m_Offset: {x: 0, y: 0}
46+
- _MetallicGlossMap:
47+
m_Texture: {fileID: 0}
48+
m_Scale: {x: 1, y: 1}
49+
m_Offset: {x: 0, y: 0}
50+
- _OcclusionMap:
51+
m_Texture: {fileID: 0}
52+
m_Scale: {x: 1, y: 1}
53+
m_Offset: {x: 0, y: 0}
54+
- _ParallaxMap:
55+
m_Texture: {fileID: 0}
56+
m_Scale: {x: 1, y: 1}
57+
m_Offset: {x: 0, y: 0}
58+
m_Floats:
59+
- _BumpScale: 1
60+
- _Cutoff: 0.5
61+
- _DetailNormalMapScale: 1
62+
- _DstBlend: 0
63+
- _GlossMapScale: 1
64+
- _Glossiness: 0.5
65+
- _GlossyReflections: 1
66+
- _Metallic: 0
67+
- _Mode: 0
68+
- _OcclusionStrength: 1
69+
- _Parallax: 0.02
70+
- _SmoothnessTextureChannel: 0
71+
- _SpecularHighlights: 1
72+
- _SrcBlend: 1
73+
- _UVSec: 0
74+
- _ZWrite: 1
75+
m_Colors:
76+
- _Color: {r: 0.95686275, g: 0.2627451, b: 0.21176471, a: 1}
77+
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1}

Entelect Challenge 2019 Visualiser/Assets/Materials/PlayerBShoot.mat.meta

Lines changed: 8 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
Lines changed: 112 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,112 @@
1+
%YAML 1.1
2+
%TAG !u! tag:unity3d.com,2011:
3+
--- !u!1 &5222917820928701404
4+
GameObject:
5+
m_ObjectHideFlags: 0
6+
m_CorrespondingSourceObject: {fileID: 0}
7+
m_PrefabInstance: {fileID: 0}
8+
m_PrefabAsset: {fileID: 0}
9+
serializedVersion: 6
10+
m_Component:
11+
- component: {fileID: 7704146425526687747}
12+
- component: {fileID: 1995660700831834028}
13+
m_Layer: 0
14+
m_Name: health-pack
15+
m_TagString: Untagged
16+
m_Icon: {fileID: 0}
17+
m_NavMeshLayer: 0
18+
m_StaticEditorFlags: 0
19+
m_IsActive: 1
20+
--- !u!4 &7704146425526687747
21+
Transform:
22+
m_ObjectHideFlags: 0
23+
m_CorrespondingSourceObject: {fileID: 0}
24+
m_PrefabInstance: {fileID: 0}
25+
m_PrefabAsset: {fileID: 0}
26+
m_GameObject: {fileID: 5222917820928701404}
27+
m_LocalRotation: {x: 0, y: 0.38268343, z: 0, w: 0.92387956}
28+
m_LocalPosition: {x: 0, y: 0.35, z: 0}
29+
m_LocalScale: {x: 2, y: 2, z: 2}
30+
m_Children: []
31+
m_Father: {fileID: 8627850182046463778}
32+
m_RootOrder: 0
33+
m_LocalEulerAnglesHint: {x: 0, y: 45, z: 0}
34+
--- !u!212 &1995660700831834028
35+
SpriteRenderer:
36+
m_ObjectHideFlags: 0
37+
m_CorrespondingSourceObject: {fileID: 0}
38+
m_PrefabInstance: {fileID: 0}
39+
m_PrefabAsset: {fileID: 0}
40+
m_GameObject: {fileID: 5222917820928701404}
41+
m_Enabled: 1
42+
m_CastShadows: 0
43+
m_ReceiveShadows: 0
44+
m_DynamicOccludee: 1
45+
m_MotionVectors: 1
46+
m_LightProbeUsage: 1
47+
m_ReflectionProbeUsage: 1
48+
m_RenderingLayerMask: 1
49+
m_RendererPriority: 0
50+
m_Materials:
51+
- {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0}
52+
m_StaticBatchInfo:
53+
firstSubMesh: 0
54+
subMeshCount: 0
55+
m_StaticBatchRoot: {fileID: 0}
56+
m_ProbeAnchor: {fileID: 0}
57+
m_LightProbeVolumeOverride: {fileID: 0}
58+
m_ScaleInLightmap: 1
59+
m_PreserveUVs: 0
60+
m_IgnoreNormalsForChartDetection: 0
61+
m_ImportantGI: 0
62+
m_StitchLightmapSeams: 1
63+
m_SelectedEditorRenderState: 0
64+
m_MinimumChartSize: 4
65+
m_AutoUVMaxDistance: 0.5
66+
m_AutoUVMaxAngle: 89
67+
m_LightmapParameters: {fileID: 0}
68+
m_SortingLayerID: 0
69+
m_SortingLayer: 0
70+
m_SortingOrder: 0
71+
m_Sprite: {fileID: 21300000, guid: 2147e3948f98c0a438a26c2ff49971b4, type: 3}
72+
m_Color: {r: 1, g: 1, b: 1, a: 1}
73+
m_FlipX: 0
74+
m_FlipY: 0
75+
m_DrawMode: 0
76+
m_Size: {x: 0.32, y: 0.32}
77+
m_AdaptiveModeThreshold: 0.5
78+
m_SpriteTileMode: 0
79+
m_WasSpriteAssigned: 1
80+
m_MaskInteraction: 0
81+
m_SpriteSortPoint: 0
82+
--- !u!1 &6576922515411969339
83+
GameObject:
84+
m_ObjectHideFlags: 0
85+
m_CorrespondingSourceObject: {fileID: 0}
86+
m_PrefabInstance: {fileID: 0}
87+
m_PrefabAsset: {fileID: 0}
88+
serializedVersion: 6
89+
m_Component:
90+
- component: {fileID: 8627850182046463778}
91+
m_Layer: 0
92+
m_Name: Health Pack
93+
m_TagString: Untagged
94+
m_Icon: {fileID: 0}
95+
m_NavMeshLayer: 0
96+
m_StaticEditorFlags: 0
97+
m_IsActive: 1
98+
--- !u!4 &8627850182046463778
99+
Transform:
100+
m_ObjectHideFlags: 0
101+
m_CorrespondingSourceObject: {fileID: 0}
102+
m_PrefabInstance: {fileID: 0}
103+
m_PrefabAsset: {fileID: 0}
104+
m_GameObject: {fileID: 6576922515411969339}
105+
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
106+
m_LocalPosition: {x: 0, y: 0, z: 0}
107+
m_LocalScale: {x: 1, y: 1, z: 1}
108+
m_Children:
109+
- {fileID: 7704146425526687747}
110+
m_Father: {fileID: 0}
111+
m_RootOrder: 0
112+
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}

Entelect Challenge 2019 Visualiser/Assets/Prefabs/Health Pack.prefab.meta

Lines changed: 7 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)