Push

A lot has been done I think
aps16104 · Mar 5, 2020 · 14ae095 · 14ae095
1 parent 97ee035
commit 14ae095
Show file tree

Hide file tree

Showing 80 changed files with 3,364 additions and 555 deletions.
diff --git a/RPG/Assets/Enemy.prefab b/RPG/Assets/Enemy.prefab
diff --git a/RPG/Assets/TextMesh Pro.meta → RPG/Assets/Materials/TextMesh Pro.meta b/RPG/Assets/TextMesh Pro.meta → RPG/Assets/Materials/TextMesh Pro.meta
diff --git a/RPG/Assets/TextMesh Pro/Documentation.meta → ...Materials/TextMesh Pro/Documentation.meta b/RPG/Assets/TextMesh Pro/Documentation.meta → ...Materials/TextMesh Pro/Documentation.meta
diff --git a/...entation/TextMesh Pro User Guide 2016.pdf → ...entation/TextMesh Pro User Guide 2016.pdf b/...entation/TextMesh Pro User Guide 2016.pdf → ...entation/TextMesh Pro User Guide 2016.pdf
diff --git a/...ion/TextMesh Pro User Guide 2016.pdf.meta → ...ion/TextMesh Pro User Guide 2016.pdf.meta b/...ion/TextMesh Pro User Guide 2016.pdf.meta → ...ion/TextMesh Pro User Guide 2016.pdf.meta
diff --git a/RPG/Assets/TextMesh Pro/Fonts.meta → RPG/Assets/Materials/TextMesh Pro/Fonts.meta b/RPG/Assets/TextMesh Pro/Fonts.meta → RPG/Assets/Materials/TextMesh Pro/Fonts.meta
diff --git a/...xtMesh Pro/Fonts/LiberationSans - OFL.txt → ...xtMesh Pro/Fonts/LiberationSans - OFL.txt b/...xtMesh Pro/Fonts/LiberationSans - OFL.txt → ...xtMesh Pro/Fonts/LiberationSans - OFL.txt
diff --git a/...h Pro/Fonts/LiberationSans - OFL.txt.meta → ...h Pro/Fonts/LiberationSans - OFL.txt.meta b/...h Pro/Fonts/LiberationSans - OFL.txt.meta → ...h Pro/Fonts/LiberationSans - OFL.txt.meta
diff --git a/...ets/TextMesh Pro/Fonts/LiberationSans.ttf → ...als/TextMesh Pro/Fonts/LiberationSans.ttf b/...ets/TextMesh Pro/Fonts/LiberationSans.ttf → ...als/TextMesh Pro/Fonts/LiberationSans.ttf
diff --git a/...extMesh Pro/Fonts/LiberationSans.ttf.meta → ...extMesh Pro/Fonts/LiberationSans.ttf.meta b/...extMesh Pro/Fonts/LiberationSans.ttf.meta → ...extMesh Pro/Fonts/LiberationSans.ttf.meta
diff --git a/RPG/Assets/TextMesh Pro/Resources.meta → ...ets/Materials/TextMesh Pro/Resources.meta b/RPG/Assets/TextMesh Pro/Resources.meta → ...ets/Materials/TextMesh Pro/Resources.meta
diff --git a/...Mesh Pro/Resources/Fonts & Materials.meta → ...Mesh Pro/Resources/Fonts & Materials.meta b/...Mesh Pro/Resources/Fonts & Materials.meta → ...Mesh Pro/Resources/Fonts & Materials.meta
diff --git a/...ials/LiberationSans SDF - Drop Shadow.mat → ...ials/LiberationSans SDF - Drop Shadow.mat b/...ials/LiberationSans SDF - Drop Shadow.mat → ...ials/LiberationSans SDF - Drop Shadow.mat
diff --git a/...LiberationSans SDF - Drop Shadow.mat.meta → ...LiberationSans SDF - Drop Shadow.mat.meta b/...LiberationSans SDF - Drop Shadow.mat.meta → ...LiberationSans SDF - Drop Shadow.mat.meta
diff --git a/...rials/LiberationSans SDF - Fallback.asset → ...rials/LiberationSans SDF - Fallback.asset b/...rials/LiberationSans SDF - Fallback.asset → ...rials/LiberationSans SDF - Fallback.asset
diff --git a/.../LiberationSans SDF - Fallback.asset.meta → .../LiberationSans SDF - Fallback.asset.meta b/.../LiberationSans SDF - Fallback.asset.meta → .../LiberationSans SDF - Fallback.asset.meta
diff --git a/...aterials/LiberationSans SDF - Outline.mat → ...aterials/LiberationSans SDF - Outline.mat b/...aterials/LiberationSans SDF - Outline.mat → ...aterials/LiberationSans SDF - Outline.mat
diff --git a/...als/LiberationSans SDF - Outline.mat.meta → ...als/LiberationSans SDF - Outline.mat.meta b/...als/LiberationSans SDF - Outline.mat.meta → ...als/LiberationSans SDF - Outline.mat.meta
diff --git a/...onts & Materials/LiberationSans SDF.asset → ...onts & Materials/LiberationSans SDF.asset b/...onts & Materials/LiberationSans SDF.asset → ...onts & Materials/LiberationSans SDF.asset
diff --git a/...& Materials/LiberationSans SDF.asset.meta → ...& Materials/LiberationSans SDF.asset.meta b/...& Materials/LiberationSans SDF.asset.meta → ...& Materials/LiberationSans SDF.asset.meta
diff --git a/...ces/LineBreaking Following Characters.txt → ...ces/LineBreaking Following Characters.txt b/...ces/LineBreaking Following Characters.txt → ...ces/LineBreaking Following Characters.txt
diff --git a/...ineBreaking Following Characters.txt.meta → ...ineBreaking Following Characters.txt.meta b/...ineBreaking Following Characters.txt.meta → ...ineBreaking Following Characters.txt.meta
diff --git a/...urces/LineBreaking Leading Characters.txt → ...urces/LineBreaking Leading Characters.txt b/...urces/LineBreaking Leading Characters.txt → ...urces/LineBreaking Leading Characters.txt
diff --git a/.../LineBreaking Leading Characters.txt.meta → .../LineBreaking Leading Characters.txt.meta b/.../LineBreaking Leading Characters.txt.meta → .../LineBreaking Leading Characters.txt.meta
diff --git a/...ssets/TextMesh Pro/Resources/Shaders.meta → ...rials/TextMesh Pro/Resources/Shaders.meta b/...ssets/TextMesh Pro/Resources/Shaders.meta → ...rials/TextMesh Pro/Resources/Shaders.meta
diff --git a/...es/Shaders/TMP_Bitmap-Custom-Atlas.shader → ...es/Shaders/TMP_Bitmap-Custom-Atlas.shader b/...es/Shaders/TMP_Bitmap-Custom-Atlas.shader → ...es/Shaders/TMP_Bitmap-Custom-Atlas.shader
diff --git a/...aders/TMP_Bitmap-Custom-Atlas.shader.meta → ...aders/TMP_Bitmap-Custom-Atlas.shader.meta b/...aders/TMP_Bitmap-Custom-Atlas.shader.meta → ...aders/TMP_Bitmap-Custom-Atlas.shader.meta
diff --git a/...esources/Shaders/TMP_Bitmap-Mobile.shader → ...esources/Shaders/TMP_Bitmap-Mobile.shader b/...esources/Shaders/TMP_Bitmap-Mobile.shader → ...esources/Shaders/TMP_Bitmap-Mobile.shader
diff --git a/...ces/Shaders/TMP_Bitmap-Mobile.shader.meta → ...ces/Shaders/TMP_Bitmap-Mobile.shader.meta b/...ces/Shaders/TMP_Bitmap-Mobile.shader.meta → ...ces/Shaders/TMP_Bitmap-Mobile.shader.meta
diff --git a/...h Pro/Resources/Shaders/TMP_Bitmap.shader → ...h Pro/Resources/Shaders/TMP_Bitmap.shader b/...h Pro/Resources/Shaders/TMP_Bitmap.shader → ...h Pro/Resources/Shaders/TMP_Bitmap.shader
diff --git a/.../Resources/Shaders/TMP_Bitmap.shader.meta → .../Resources/Shaders/TMP_Bitmap.shader.meta b/.../Resources/Shaders/TMP_Bitmap.shader.meta → .../Resources/Shaders/TMP_Bitmap.shader.meta
diff --git a/.../Resources/Shaders/TMP_SDF Overlay.shader → .../Resources/Shaders/TMP_SDF Overlay.shader b/.../Resources/Shaders/TMP_SDF Overlay.shader → .../Resources/Shaders/TMP_SDF Overlay.shader
diff --git a/...urces/Shaders/TMP_SDF Overlay.shader.meta → ...urces/Shaders/TMP_SDF Overlay.shader.meta b/...urces/Shaders/TMP_SDF Overlay.shader.meta → ...urces/Shaders/TMP_SDF Overlay.shader.meta
diff --git a/...ces/Shaders/TMP_SDF-Mobile Masking.shader → ...ces/Shaders/TMP_SDF-Mobile Masking.shader b/...ces/Shaders/TMP_SDF-Mobile Masking.shader → ...ces/Shaders/TMP_SDF-Mobile Masking.shader
diff --git a/...haders/TMP_SDF-Mobile Masking.shader.meta → ...haders/TMP_SDF-Mobile Masking.shader.meta b/...haders/TMP_SDF-Mobile Masking.shader.meta → ...haders/TMP_SDF-Mobile Masking.shader.meta
diff --git a/...ces/Shaders/TMP_SDF-Mobile Overlay.shader → ...ces/Shaders/TMP_SDF-Mobile Overlay.shader b/...ces/Shaders/TMP_SDF-Mobile Overlay.shader → ...ces/Shaders/TMP_SDF-Mobile Overlay.shader
diff --git a/...haders/TMP_SDF-Mobile Overlay.shader.meta → ...haders/TMP_SDF-Mobile Overlay.shader.meta b/...haders/TMP_SDF-Mobile Overlay.shader.meta → ...haders/TMP_SDF-Mobile Overlay.shader.meta
diff --git a/...o/Resources/Shaders/TMP_SDF-Mobile.shader → ...o/Resources/Shaders/TMP_SDF-Mobile.shader b/...o/Resources/Shaders/TMP_SDF-Mobile.shader → ...o/Resources/Shaders/TMP_SDF-Mobile.shader
diff --git a/...ources/Shaders/TMP_SDF-Mobile.shader.meta → ...ources/Shaders/TMP_SDF-Mobile.shader.meta b/...ources/Shaders/TMP_SDF-Mobile.shader.meta → ...ources/Shaders/TMP_SDF-Mobile.shader.meta
diff --git a/...ces/Shaders/TMP_SDF-Surface-Mobile.shader → ...ces/Shaders/TMP_SDF-Surface-Mobile.shader b/...ces/Shaders/TMP_SDF-Surface-Mobile.shader → ...ces/Shaders/TMP_SDF-Surface-Mobile.shader
diff --git a/...haders/TMP_SDF-Surface-Mobile.shader.meta → ...haders/TMP_SDF-Surface-Mobile.shader.meta b/...haders/TMP_SDF-Surface-Mobile.shader.meta → ...haders/TMP_SDF-Surface-Mobile.shader.meta
diff --git a/.../Resources/Shaders/TMP_SDF-Surface.shader → .../Resources/Shaders/TMP_SDF-Surface.shader b/.../Resources/Shaders/TMP_SDF-Surface.shader → .../Resources/Shaders/TMP_SDF-Surface.shader
diff --git a/...urces/Shaders/TMP_SDF-Surface.shader.meta → ...urces/Shaders/TMP_SDF-Surface.shader.meta b/...urces/Shaders/TMP_SDF-Surface.shader.meta → ...urces/Shaders/TMP_SDF-Surface.shader.meta
diff --git a/...Mesh Pro/Resources/Shaders/TMP_SDF.shader → ...Mesh Pro/Resources/Shaders/TMP_SDF.shader b/...Mesh Pro/Resources/Shaders/TMP_SDF.shader → ...Mesh Pro/Resources/Shaders/TMP_SDF.shader
diff --git a/...Pro/Resources/Shaders/TMP_SDF.shader.meta → ...Pro/Resources/Shaders/TMP_SDF.shader.meta b/...Pro/Resources/Shaders/TMP_SDF.shader.meta → ...Pro/Resources/Shaders/TMP_SDF.shader.meta
diff --git a/...h Pro/Resources/Shaders/TMP_Sprite.shader → ...h Pro/Resources/Shaders/TMP_Sprite.shader b/...h Pro/Resources/Shaders/TMP_Sprite.shader → ...h Pro/Resources/Shaders/TMP_Sprite.shader
diff --git a/.../Resources/Shaders/TMP_Sprite.shader.meta → .../Resources/Shaders/TMP_Sprite.shader.meta b/.../Resources/Shaders/TMP_Sprite.shader.meta → .../Resources/Shaders/TMP_Sprite.shader.meta
diff --git a/...extMesh Pro/Resources/Shaders/TMPro.cginc → ...extMesh Pro/Resources/Shaders/TMPro.cginc b/...extMesh Pro/Resources/Shaders/TMPro.cginc → ...extMesh Pro/Resources/Shaders/TMPro.cginc
diff --git a/...sh Pro/Resources/Shaders/TMPro.cginc.meta → ...sh Pro/Resources/Shaders/TMPro.cginc.meta b/...sh Pro/Resources/Shaders/TMPro.cginc.meta → ...sh Pro/Resources/Shaders/TMPro.cginc.meta
diff --git a/.../Resources/Shaders/TMPro_Properties.cginc → .../Resources/Shaders/TMPro_Properties.cginc b/.../Resources/Shaders/TMPro_Properties.cginc → .../Resources/Shaders/TMPro_Properties.cginc
diff --git a/...urces/Shaders/TMPro_Properties.cginc.meta → ...urces/Shaders/TMPro_Properties.cginc.meta b/...urces/Shaders/TMPro_Properties.cginc.meta → ...urces/Shaders/TMPro_Properties.cginc.meta
diff --git a/...Pro/Resources/Shaders/TMPro_Surface.cginc → ...Pro/Resources/Shaders/TMPro_Surface.cginc b/...Pro/Resources/Shaders/TMPro_Surface.cginc → ...Pro/Resources/Shaders/TMPro_Surface.cginc
diff --git a/...esources/Shaders/TMPro_Surface.cginc.meta → ...esources/Shaders/TMPro_Surface.cginc.meta b/...esources/Shaders/TMPro_Surface.cginc.meta → ...esources/Shaders/TMPro_Surface.cginc.meta
diff --git a/...TextMesh Pro/Resources/Sprite Assets.meta → ...TextMesh Pro/Resources/Sprite Assets.meta b/...TextMesh Pro/Resources/Sprite Assets.meta → ...TextMesh Pro/Resources/Sprite Assets.meta
diff --git a/...ro/Resources/Sprite Assets/EmojiOne.asset → ...ro/Resources/Sprite Assets/EmojiOne.asset b/...ro/Resources/Sprite Assets/EmojiOne.asset → ...ro/Resources/Sprite Assets/EmojiOne.asset
diff --git a/...sources/Sprite Assets/EmojiOne.asset.meta → ...sources/Sprite Assets/EmojiOne.asset.meta b/...sources/Sprite Assets/EmojiOne.asset.meta → ...sources/Sprite Assets/EmojiOne.asset.meta
diff --git a/.../TextMesh Pro/Resources/Style Sheets.meta → .../TextMesh Pro/Resources/Style Sheets.meta b/.../TextMesh Pro/Resources/Style Sheets.meta → .../TextMesh Pro/Resources/Style Sheets.meta
diff --git a/...es/Style Sheets/Default Style Sheet.asset → ...es/Style Sheets/Default Style Sheet.asset b/...es/Style Sheets/Default Style Sheet.asset → ...es/Style Sheets/Default Style Sheet.asset
diff --git a/...yle Sheets/Default Style Sheet.asset.meta → ...yle Sheets/Default Style Sheet.asset.meta b/...yle Sheets/Default Style Sheet.asset.meta → ...yle Sheets/Default Style Sheet.asset.meta
diff --git a/...TextMesh Pro/Resources/TMP Settings.asset → ...TextMesh Pro/Resources/TMP Settings.asset b/...TextMesh Pro/Resources/TMP Settings.asset → ...TextMesh Pro/Resources/TMP Settings.asset
diff --git a/...esh Pro/Resources/TMP Settings.asset.meta → ...esh Pro/Resources/TMP Settings.asset.meta b/...esh Pro/Resources/TMP Settings.asset.meta → ...esh Pro/Resources/TMP Settings.asset.meta
diff --git a/RPG/Assets/TextMesh Pro/Sprites.meta → ...ssets/Materials/TextMesh Pro/Sprites.meta b/RPG/Assets/TextMesh Pro/Sprites.meta → ...ssets/Materials/TextMesh Pro/Sprites.meta
diff --git a/...Mesh Pro/Sprites/EmojiOne Attribution.txt → ...Mesh Pro/Sprites/EmojiOne Attribution.txt b/...Mesh Pro/Sprites/EmojiOne Attribution.txt → ...Mesh Pro/Sprites/EmojiOne Attribution.txt
diff --git a/...Pro/Sprites/EmojiOne Attribution.txt.meta → ...Pro/Sprites/EmojiOne Attribution.txt.meta b/...Pro/Sprites/EmojiOne Attribution.txt.meta → ...Pro/Sprites/EmojiOne Attribution.txt.meta
diff --git a/...Assets/TextMesh Pro/Sprites/EmojiOne.json → ...erials/TextMesh Pro/Sprites/EmojiOne.json b/...Assets/TextMesh Pro/Sprites/EmojiOne.json → ...erials/TextMesh Pro/Sprites/EmojiOne.json
diff --git a/...s/TextMesh Pro/Sprites/EmojiOne.json.meta → ...s/TextMesh Pro/Sprites/EmojiOne.json.meta b/...s/TextMesh Pro/Sprites/EmojiOne.json.meta → ...s/TextMesh Pro/Sprites/EmojiOne.json.meta
diff --git a/RPG/Assets/TextMesh Pro/Sprites/EmojiOne.png → ...terials/TextMesh Pro/Sprites/EmojiOne.png b/RPG/Assets/TextMesh Pro/Sprites/EmojiOne.png → ...terials/TextMesh Pro/Sprites/EmojiOne.png
diff --git a/...ts/TextMesh Pro/Sprites/EmojiOne.png.meta → ...ls/TextMesh Pro/Sprites/EmojiOne.png.meta b/...ts/TextMesh Pro/Sprites/EmojiOne.png.meta → ...ls/TextMesh Pro/Sprites/EmojiOne.png.meta