-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
* got it working, have to tweak some force settings for next time * fixed some bugs with hats colliding into airtrigger, and adjusted the falling speed of player, related to knockback purposes * reworked the knockback-extension * knockback effeckten er ferdig i seg selv * finished knockback extension and model * changed after review * resolved requested issues: Knockback effect with more bullets, retrieval of bulletspershot information * resolved merge conflict * Reworked the calculation of knockback vectors, Removed unnecessary files * removed testing block from grand-canyon * added firerate from gunstats into the calculation for knockback --------- Co-authored-by: Christopher Braathen <chrbraa@stud.ntnu.no>
- Loading branch information
1 parent
af4f3b0
commit 5c850e2
Showing
20 changed files
with
610 additions
and
18 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,145 @@ | ||
%YAML 1.1 | ||
%TAG !u! tag:unity3d.com,2011: | ||
--- !u!21 &2100000 | ||
Material: | ||
serializedVersion: 8 | ||
m_ObjectHideFlags: 0 | ||
m_CorrespondingSourceObject: {fileID: 0} | ||
m_PrefabInstance: {fileID: 0} | ||
m_PrefabAsset: {fileID: 0} | ||
m_Name: redToon | ||
m_Shader: {fileID: -6465566751694194690, guid: f8ec4cafbe9538b4aa600770a5a8bf02, type: 3} | ||
m_Parent: {fileID: 0} | ||
m_ModifiedSerializedProperties: 0 | ||
m_ValidKeywords: | ||
- MAIN_LIGHT_CALCULATE_SHADOWS | ||
- _MAIN_LIGHT_SHADOWS_CASCADE | ||
- _SHADOWS_SOFT | ||
m_InvalidKeywords: [] | ||
m_LightmapFlags: 4 | ||
m_EnableInstancingVariants: 0 | ||
m_DoubleSidedGI: 0 | ||
m_CustomRenderQueue: -1 | ||
stringTagMap: {} | ||
disabledShaderPasses: [] | ||
m_LockedProperties: | ||
m_SavedProperties: | ||
serializedVersion: 3 | ||
m_TexEnvs: | ||
- _BaseMap: | ||
m_Texture: {fileID: 0} | ||
m_Scale: {x: 1, y: 1} | ||
m_Offset: {x: 0, y: 0} | ||
- _BumpMap: | ||
m_Texture: {fileID: 0} | ||
m_Scale: {x: 1, y: 1} | ||
m_Offset: {x: 0, y: 0} | ||
- _DetailAlbedoMap: | ||
m_Texture: {fileID: 0} | ||
m_Scale: {x: 1, y: 1} | ||
m_Offset: {x: 0, y: 0} | ||
- _DetailMask: | ||
m_Texture: {fileID: 0} | ||
m_Scale: {x: 1, y: 1} | ||
m_Offset: {x: 0, y: 0} | ||
- _DetailNormalMap: | ||
m_Texture: {fileID: 0} | ||
m_Scale: {x: 1, y: 1} | ||
m_Offset: {x: 0, y: 0} | ||
- _EmissionMap: | ||
m_Texture: {fileID: 0} | ||
m_Scale: {x: 1, y: 1} | ||
m_Offset: {x: 0, y: 0} | ||
- _MainTex: | ||
m_Texture: {fileID: 0} | ||
m_Scale: {x: 1, y: 1} | ||
m_Offset: {x: 0, y: 0} | ||
- _MetallicGlossMap: | ||
m_Texture: {fileID: 0} | ||
m_Scale: {x: 1, y: 1} | ||
m_Offset: {x: 0, y: 0} | ||
- _OcclusionMap: | ||
m_Texture: {fileID: 0} | ||
m_Scale: {x: 1, y: 1} | ||
m_Offset: {x: 0, y: 0} | ||
- _ParallaxMap: | ||
m_Texture: {fileID: 0} | ||
m_Scale: {x: 1, y: 1} | ||
m_Offset: {x: 0, y: 0} | ||
- _SpecGlossMap: | ||
m_Texture: {fileID: 0} | ||
m_Scale: {x: 1, y: 1} | ||
m_Offset: {x: 0, y: 0} | ||
- _Texture: | ||
m_Texture: {fileID: 0} | ||
m_Scale: {x: 1, y: 1} | ||
m_Offset: {x: 0, y: 0} | ||
- unity_Lightmaps: | ||
m_Texture: {fileID: 0} | ||
m_Scale: {x: 1, y: 1} | ||
m_Offset: {x: 0, y: 0} | ||
- unity_LightmapsInd: | ||
m_Texture: {fileID: 0} | ||
m_Scale: {x: 1, y: 1} | ||
m_Offset: {x: 0, y: 0} | ||
- unity_ShadowMasks: | ||
m_Texture: {fileID: 0} | ||
m_Scale: {x: 1, y: 1} | ||
m_Offset: {x: 0, y: 0} | ||
m_Ints: [] | ||
m_Floats: | ||
- MAIN_LIGHT_CALCULATE_SHADOWS: 1 | ||
- _AlphaClip: 0 | ||
- _AlphaToMask: 0 | ||
- _Blend: 0 | ||
- _BlendModePreserveSpecular: 1 | ||
- _BumpScale: 1 | ||
- _ClearCoatMask: 0 | ||
- _ClearCoatSmoothness: 0 | ||
- _Cull: 2 | ||
- _Cutoff: 0.5 | ||
- _DetailAlbedoMapScale: 1 | ||
- _DetailNormalMapScale: 1 | ||
- _DstBlend: 0 | ||
- _DstBlendAlpha: 0 | ||
- _EnvironmentReflections: 1 | ||
- _GlossMapScale: 1 | ||
- _Glossiness: 0.5 | ||
- _GlossyReflections: 1 | ||
- _MAIN_LIGHT_SHADOWS_CASCADE: 1 | ||
- _Metallic: 0 | ||
- _Mode: 0 | ||
- _OcclusionStrength: 1 | ||
- _Parallax: 0.02 | ||
- _QueueControl: 0 | ||
- _QueueOffset: 0 | ||
- _ReceiveShadows: 1 | ||
- _SHADOWS_SOFT: 1 | ||
- _Smoothness: 0.5 | ||
- _SmoothnessTextureChannel: 0 | ||
- _SpecularHighlights: 1 | ||
- _SrcBlend: 1 | ||
- _SrcBlendAlpha: 1 | ||
- _Surface: 0 | ||
- _UVSec: 0 | ||
- _WorkflowMode: 1 | ||
- _ZWrite: 1 | ||
m_Colors: | ||
- _BaseColor: {r: 0.7807441, g: 0.14586645, b: 0.14188614, a: 1} | ||
- _Color: {r: 0.7807441, g: 0.14586642, b: 0.14188612, a: 1} | ||
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1} | ||
- _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} | ||
m_BuildTextureStacks: [] | ||
--- !u!114 &4828037076947197396 | ||
MonoBehaviour: | ||
m_ObjectHideFlags: 11 | ||
m_CorrespondingSourceObject: {fileID: 0} | ||
m_PrefabInstance: {fileID: 0} | ||
m_PrefabAsset: {fileID: 0} | ||
m_GameObject: {fileID: 0} | ||
m_Enabled: 1 | ||
m_EditorHideFlags: 0 | ||
m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} | ||
m_Name: | ||
m_EditorClassIdentifier: | ||
version: 7 |
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
Binary file not shown.
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.