Merge branch 'JuliusesEpicGUIBranch'

# Conflicts: # MrBigsock/Assets/Code/EmptyCollider.cs.meta

Merge branch 'JuliusesEpicGUIBranch'
cda2101e · Julius Fredrik Einum · 6b18b687 · 634fc703 · cda2101e · cda2101e
Commit cda2101e authored 2 years ago by Julius Fredrik Einum
--- a/MrBigsock/Assets/TextMesh Pro/Sprites/EmojiOne.json
+++ b/MrBigsock/Assets/TextMesh Pro/Sprites/EmojiOne.json
--- a/MrBigsock/Assets/TextMesh Pro/Sprites/EmojiOne.json.meta
+++ b/MrBigsock/Assets/TextMesh Pro/Sprites/EmojiOne.json.meta
--- a/MrBigsock/Assets/TextMesh Pro/Sprites/EmojiOne.png
+++ b/MrBigsock/Assets/TextMesh Pro/Sprites/EmojiOne.png
--- a/MrBigsock/Assets/TextMesh Pro/Sprites/EmojiOne.png.meta
+++ b/MrBigsock/Assets/TextMesh Pro/Sprites/EmojiOne.png.meta
--- a/MrBigsock/Assets/UI/Fonts.meta
+++ b/MrBigsock/Assets/UI/Fonts.meta
--- a/MrBigsock/Assets/UI/Fonts/Caveat-VariableFont_wght SDF.asset
+++ b/MrBigsock/Assets/UI/Fonts/Caveat-VariableFont_wght SDF.asset
--- a/MrBigsock/Assets/UI/Fonts/Caveat-VariableFont_wght SDF.asset.meta
+++ b/MrBigsock/Assets/UI/Fonts/Caveat-VariableFont_wght SDF.asset.meta
--- a/MrBigsock/Assets/UI/Fonts/Caveat-VariableFont_wght.ttf
+++ b/MrBigsock/Assets/UI/Fonts/Caveat-VariableFont_wght.ttf
--- a/MrBigsock/Assets/UI/Fonts/Caveat-VariableFont_wght.ttf.meta
+++ b/MrBigsock/Assets/UI/Fonts/Caveat-VariableFont_wght.ttf.meta
--- a/MrBigsock/Assets/UI/Sprites.meta
+++ b/MrBigsock/Assets/UI/Sprites.meta
--- a/MrBigsock/Assets/UI/Sprites/hpBAR.png
+++ b/MrBigsock/Assets/UI/Sprites/hpBAR.png
--- a/MrBigsock/Assets/UI/Sprites/hpBAR.png.meta
+++ b/MrBigsock/Assets/UI/Sprites/hpBAR.png.meta
--- a/MrBigsock/ProjectSettings/EditorBuildSettings.asset
+++ b/MrBigsock/ProjectSettings/EditorBuildSettings.asset