Sync re-merged weapon upstream #3
Open
Conversation
This file contains hidden or 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
# Conflicts: # Assets/Externals/Modified fragsurf/Movement/SurfCharacter.cs # Assets/Resources.meta # Assets/Scripts/Movement/DummyReset.cs # Assets/Scripts/Movement/DummyReset.cs.meta # Assets/Scripts/Movement/KnockMeter.cs # Assets/Scripts/Movement/KnockMeter.cs.meta # Assets/Scripts/Movement/KnockMeterUI.cs # Assets/Scripts/Movement/KnockMeterUI.cs.meta # Assets/Scripts/Movement/WeaponAirgun.cs # Assets/Scripts/Movement/WeaponAirgun.cs.meta # Assets/Scripts/Movement/WeaponBase.cs # Assets/Scripts/Movement/WeaponBase.cs.meta # Assets/Scripts/Movement/WeaponFist.cs # Assets/Scripts/Movement/WeaponFist.cs.meta # Assets/Scripts/Movement/WeaponGravityGun.cs # Assets/Scripts/Movement/WeaponGravityGun.cs.meta # Assets/Scripts/Movement/WeaponManager.cs # Assets/Scripts/Movement/WeaponManager.cs.meta # Assets/TextMesh Pro.meta # Assets/TextMesh Pro/Fonts.meta # Assets/TextMesh Pro/Fonts/LiberationSans - OFL.txt # Assets/TextMesh Pro/Fonts/LiberationSans - OFL.txt.meta # Assets/TextMesh Pro/Fonts/LiberationSans.ttf # Assets/TextMesh Pro/Fonts/LiberationSans.ttf.meta # Assets/TextMesh Pro/Resources.meta # Assets/TextMesh Pro/Resources/Fonts & Materials.meta # Assets/TextMesh Pro/Resources/Fonts & Materials/LiberationSans SDF - Drop Shadow.mat # Assets/TextMesh Pro/Resources/Fonts & Materials/LiberationSans SDF - Drop Shadow.mat.meta # Assets/TextMesh Pro/Resources/Fonts & Materials/LiberationSans SDF - Fallback.asset # Assets/TextMesh Pro/Resources/Fonts & Materials/LiberationSans SDF - Fallback.asset.meta # Assets/TextMesh Pro/Resources/Fonts & Materials/LiberationSans SDF - Outline.mat # Assets/TextMesh Pro/Resources/Fonts & Materials/LiberationSans SDF - Outline.mat.meta # Assets/TextMesh Pro/Resources/Fonts & Materials/LiberationSans SDF.asset # Assets/TextMesh Pro/Resources/Fonts & Materials/LiberationSans SDF.asset.meta # Assets/TextMesh Pro/Resources/LineBreaking Following Characters.txt # Assets/TextMesh Pro/Resources/LineBreaking Following Characters.txt.meta # Assets/TextMesh Pro/Resources/LineBreaking Leading Characters.txt # Assets/TextMesh Pro/Resources/LineBreaking Leading Characters.txt.meta # Assets/TextMesh Pro/Resources/Sprite Assets.meta # Assets/TextMesh Pro/Resources/Sprite Assets/EmojiOne.asset # Assets/TextMesh Pro/Resources/Sprite Assets/EmojiOne.asset.meta # Assets/TextMesh Pro/Resources/Style Sheets.meta # Assets/TextMesh Pro/Resources/Style Sheets/Default Style Sheet.asset # Assets/TextMesh Pro/Resources/Style Sheets/Default Style Sheet.asset.meta # Assets/TextMesh Pro/Resources/TMP Settings.asset # Assets/TextMesh Pro/Resources/TMP Settings.asset.meta # Assets/TextMesh Pro/Shaders.meta # Assets/TextMesh Pro/Shaders/SDFFunctions.hlsl # Assets/TextMesh Pro/Shaders/SDFFunctions.hlsl.meta # Assets/TextMesh Pro/Shaders/TMP_Bitmap-Custom-Atlas.shader # Assets/TextMesh Pro/Shaders/TMP_Bitmap-Custom-Atlas.shader.meta # Assets/TextMesh Pro/Shaders/TMP_Bitmap-Mobile.shader # Assets/TextMesh Pro/Shaders/TMP_Bitmap-Mobile.shader.meta # Assets/TextMesh Pro/Shaders/TMP_Bitmap.shader # Assets/TextMesh Pro/Shaders/TMP_Bitmap.shader.meta # Assets/TextMesh Pro/Shaders/TMP_SDF Overlay.shader # Assets/TextMesh Pro/Shaders/TMP_SDF Overlay.shader.meta # Assets/TextMesh Pro/Shaders/TMP_SDF SSD.shader # Assets/TextMesh Pro/Shaders/TMP_SDF SSD.shader.meta # Assets/TextMesh Pro/Shaders/TMP_SDF-HDRP LIT.shadergraph # Assets/TextMesh Pro/Shaders/TMP_SDF-HDRP LIT.shadergraph.meta # Assets/TextMesh Pro/Shaders/TMP_SDF-HDRP UNLIT.shadergraph # Assets/TextMesh Pro/Shaders/TMP_SDF-HDRP UNLIT.shadergraph.meta # Assets/TextMesh Pro/Shaders/TMP_SDF-Mobile Masking.shader # Assets/TextMesh Pro/Shaders/TMP_SDF-Mobile Masking.shader.meta # Assets/TextMesh Pro/Shaders/TMP_SDF-Mobile Overlay.shader # Assets/TextMesh Pro/Shaders/TMP_SDF-Mobile Overlay.shader.meta # Assets/TextMesh Pro/Shaders/TMP_SDF-Mobile SSD.shader # Assets/TextMesh Pro/Shaders/TMP_SDF-Mobile SSD.shader.meta # Assets/TextMesh Pro/Shaders/TMP_SDF-Mobile-2-Pass.shader # Assets/TextMesh Pro/Shaders/TMP_SDF-Mobile-2-Pass.shader.meta # Assets/TextMesh Pro/Shaders/TMP_SDF-Mobile.shader # Assets/TextMesh Pro/Shaders/TMP_SDF-Mobile.shader.meta # Assets/TextMesh Pro/Shaders/TMP_SDF-Surface-Mobile.shader # Assets/TextMesh Pro/Shaders/TMP_SDF-Surface-Mobile.shader.meta # Assets/TextMesh Pro/Shaders/TMP_SDF-Surface.shader # Assets/TextMesh Pro/Shaders/TMP_SDF-Surface.shader.meta # Assets/TextMesh Pro/Shaders/TMP_SDF-URP Lit.shadergraph # Assets/TextMesh Pro/Shaders/TMP_SDF-URP Lit.shadergraph.meta # Assets/TextMesh Pro/Shaders/TMP_SDF-URP Unlit.shadergraph # Assets/TextMesh Pro/Shaders/TMP_SDF-URP Unlit.shadergraph.meta # Assets/TextMesh Pro/Shaders/TMP_SDF.shader # Assets/TextMesh Pro/Shaders/TMP_SDF.shader.meta # Assets/TextMesh Pro/Shaders/TMP_Sprite.shader # Assets/TextMesh Pro/Shaders/TMP_Sprite.shader.meta # Assets/TextMesh Pro/Shaders/TMPro.cginc # Assets/TextMesh Pro/Shaders/TMPro.cginc.meta # Assets/TextMesh Pro/Shaders/TMPro_Mobile.cginc # Assets/TextMesh Pro/Shaders/TMPro_Mobile.cginc.meta # Assets/TextMesh Pro/Shaders/TMPro_Properties.cginc # Assets/TextMesh Pro/Shaders/TMPro_Properties.cginc.meta # Assets/TextMesh Pro/Shaders/TMPro_Surface.cginc # Assets/TextMesh Pro/Shaders/TMPro_Surface.cginc.meta # Assets/TextMesh Pro/Sprites.meta # Assets/TextMesh Pro/Sprites/EmojiOne Attribution.txt # Assets/TextMesh Pro/Sprites/EmojiOne Attribution.txt.meta # Assets/TextMesh Pro/Sprites/EmojiOne.json # Assets/TextMesh Pro/Sprites/EmojiOne.json.meta # Assets/TextMesh Pro/Sprites/EmojiOne.png # Assets/TextMesh Pro/Sprites/EmojiOne.png.meta # ProjectSettings/EditorBuildSettings.asset
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.