From ef56d7ea32cb71cb9dedaab3696ab7d18bcafb54 Mon Sep 17 00:00:00 2001 From: Hurlu Date: Tue, 23 Apr 2019 00:06:17 +0900 Subject: [PATCH] Carnage menu network almost done --- Assets/Menus/Lobby/LobbyCountdown.cs | 4 +- Assets/Menus/MainMenu/IPRegex.cs | 4 +- Assets/Menus/MainMenu/MainMenuManager.cs | 3 + Assets/Menus/MainMenu/MainMenuManager.cs.meta | 11 + Assets/Menus/Network/MenuNetPlayer.cs | 3 + Assets/Menus/Network/MenuNetPlayer.cs.meta | 11 + Assets/Menus/Network/MenuNetwork.cs | 4 +- Assets/Menus/Network/NetMenuPlayer.prefab | 4 +- Assets/Menus/Network/ViewPlayerList.cs | 3 + Assets/Menus/Network/ViewPlayerList.cs.meta | 11 + Assets/Menus/WaitingRoom/WaitingPlayer.cs | 4 +- .../Menus/WaitingRoom/WaitingRoomManager.cs | 4 +- Assets/Menus/WaitingRoom/WaitingUserInit.cs | 4 +- .../WaitingRoom/WaitingUserPrefab.prefab | 4 +- .../TextMesh Pro User Guide 2016.pdf | 3 + .../TextMesh Pro User Guide 2016.pdf.meta | 7 + .../LiberationSans SDF - Drop Shadow.mat | 4 +- .../LiberationSans SDF - Fallback.asset | 3 + .../LiberationSans SDF - Fallback.asset.meta | 8 + .../LiberationSans SDF - Outline.mat | 4 +- .../LiberationSans SDF.asset | 4 +- .../Resources/Shaders/TMP_SDF Overlay.shader | 4 +- .../Shaders/TMP_SDF-Mobile Masking.shader | 4 +- .../Shaders/TMP_SDF-Mobile Overlay.shader | 4 +- .../Resources/Shaders/TMP_SDF-Mobile.shader | 4 +- .../Shaders/TMP_SDF-Surface-Mobile.shader | 4 +- .../Resources/Shaders/TMP_SDF-Surface.shader | 4 +- .../Resources/Shaders/TMP_SDF.shader | 4 +- .../Resources/Shaders/TMPro_Properties.cginc | 4 +- .../Resources/Shaders/TMPro_Surface.cginc | 4 +- .../Resources/Sprite Assets/EmojiOne.asset | 4 +- .../TextMesh Pro/Resources/TMP Settings.asset | 4 +- .../Sprites/EmojiOne Attribution.txt | 3 + .../Sprites/EmojiOne Attribution.txt.meta | 7 + .../TextMesh Pro/Sprites/EmojiOne.json | 3 + .../TextMesh Pro/Sprites/EmojiOne.json.meta | 8 + .../Plugins/TextMesh Pro/Sprites/EmojiOne.png | 3 + .../TextMesh Pro/Sprites/EmojiOne.png.meta | 431 ++++++++++++++++++ Assets/Resources/Fonts/AmazDooMLeft SDF.asset | 4 +- .../Resources/Fonts/AmazDooMRight SDF.asset | 4 +- .../Fonts/big_noodle_titling SDF.asset | 4 +- Assets/Resources/Sprite Assets.meta | 9 + Assets/Resources/Sprite Assets/EmojiOne.asset | 3 + .../Sprite Assets/EmojiOne.asset.meta | 8 + Assets/Scenes/MainMenu.unity | 4 +- Assets/Scenes/WaitingRoomScene.unity | 4 +- ProjectSettings/GraphicsSettings.asset | 4 +- ProjectSettings/QualitySettings.asset | 4 +- 48 files changed, 596 insertions(+), 58 deletions(-) create mode 100644 Assets/Menus/MainMenu/MainMenuManager.cs create mode 100644 Assets/Menus/MainMenu/MainMenuManager.cs.meta create mode 100644 Assets/Menus/Network/MenuNetPlayer.cs create mode 100644 Assets/Menus/Network/MenuNetPlayer.cs.meta create mode 100644 Assets/Menus/Network/ViewPlayerList.cs create mode 100644 Assets/Menus/Network/ViewPlayerList.cs.meta create mode 100644 Assets/Plugins/TextMesh Pro/Documentation/TextMesh Pro User Guide 2016.pdf create mode 100644 Assets/Plugins/TextMesh Pro/Documentation/TextMesh Pro User Guide 2016.pdf.meta create mode 100644 Assets/Plugins/TextMesh Pro/Resources/Fonts & Materials/LiberationSans SDF - Fallback.asset create mode 100644 Assets/Plugins/TextMesh Pro/Resources/Fonts & Materials/LiberationSans SDF - Fallback.asset.meta create mode 100644 Assets/Plugins/TextMesh Pro/Sprites/EmojiOne Attribution.txt create mode 100644 Assets/Plugins/TextMesh Pro/Sprites/EmojiOne Attribution.txt.meta create mode 100644 Assets/Plugins/TextMesh Pro/Sprites/EmojiOne.json create mode 100644 Assets/Plugins/TextMesh Pro/Sprites/EmojiOne.json.meta create mode 100644 Assets/Plugins/TextMesh Pro/Sprites/EmojiOne.png create mode 100644 Assets/Plugins/TextMesh Pro/Sprites/EmojiOne.png.meta create mode 100644 Assets/Resources/Sprite Assets.meta create mode 100644 Assets/Resources/Sprite Assets/EmojiOne.asset create mode 100644 Assets/Resources/Sprite Assets/EmojiOne.asset.meta diff --git a/Assets/Menus/Lobby/LobbyCountdown.cs b/Assets/Menus/Lobby/LobbyCountdown.cs index 686e1d6..cc4d9e4 100644 --- a/Assets/Menus/Lobby/LobbyCountdown.cs +++ b/Assets/Menus/Lobby/LobbyCountdown.cs @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f059b1473e0cbe7c0199978a916ceafdc966e885bd385389129e52c5470f70d3 -size 983 +oid sha256:092103b6ce3a6e0c705bc4a622b01017529d7b8382c1bb4b1ad4c41d6f1fdd3e +size 1069 diff --git a/Assets/Menus/MainMenu/IPRegex.cs b/Assets/Menus/MainMenu/IPRegex.cs index 00d5e32..3e7511d 100644 --- a/Assets/Menus/MainMenu/IPRegex.cs +++ b/Assets/Menus/MainMenu/IPRegex.cs @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:daeb43848bd2241856c6f6ae974a95fab36df832344a14e63f0d484eb305bd79 -size 1626 +oid sha256:e2c1ec911259a40f6f42b749349eded3950e0e11b75038496dda65317cd4079b +size 1627 diff --git a/Assets/Menus/MainMenu/MainMenuManager.cs b/Assets/Menus/MainMenu/MainMenuManager.cs new file mode 100644 index 0000000..f8d333e --- /dev/null +++ b/Assets/Menus/MainMenu/MainMenuManager.cs @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c132218b348603992f7969246dcb62a4a2b793f55b9bd6ed486f60aeff2b162c +size 836 diff --git a/Assets/Menus/MainMenu/MainMenuManager.cs.meta b/Assets/Menus/MainMenu/MainMenuManager.cs.meta new file mode 100644 index 0000000..e20cde2 --- /dev/null +++ b/Assets/Menus/MainMenu/MainMenuManager.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: ae528c02fbabf5242bdef69c9ba94a7b +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Menus/Network/MenuNetPlayer.cs b/Assets/Menus/Network/MenuNetPlayer.cs new file mode 100644 index 0000000..04273d5 --- /dev/null +++ b/Assets/Menus/Network/MenuNetPlayer.cs @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:097c51afaf31411441d138f9c5e071aea8b9a81e5bba262d6b749730f9e201f6 +size 2439 diff --git a/Assets/Menus/Network/MenuNetPlayer.cs.meta b/Assets/Menus/Network/MenuNetPlayer.cs.meta new file mode 100644 index 0000000..6f56b25 --- /dev/null +++ b/Assets/Menus/Network/MenuNetPlayer.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: d1a7b6e1f9dd0024da6d70a0d5a7b784 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Menus/Network/MenuNetwork.cs b/Assets/Menus/Network/MenuNetwork.cs index 1064c90..d1104b2 100644 --- a/Assets/Menus/Network/MenuNetwork.cs +++ b/Assets/Menus/Network/MenuNetwork.cs @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d349ff29083146bea0bd5b7504256d82512db8ae3e0e5cb784be73c1bcd93add -size 1361 +oid sha256:1b99757d5c7837836798b5d0a954f8d9d015b7af99e395ca13453816f2e827d8 +size 3107 diff --git a/Assets/Menus/Network/NetMenuPlayer.prefab b/Assets/Menus/Network/NetMenuPlayer.prefab index a4712e0..ebc17c4 100644 --- a/Assets/Menus/Network/NetMenuPlayer.prefab +++ b/Assets/Menus/Network/NetMenuPlayer.prefab @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:de13a521d724da1f6c44d87dea53d6776bdf83a01982bd66d7479b4eb380ce71 -size 1572 +oid sha256:a9d0b32b85e5d4eb767b34bccd796ace2a84c7c1850843c9560a6a6b6e916ff9 +size 1994 diff --git a/Assets/Menus/Network/ViewPlayerList.cs b/Assets/Menus/Network/ViewPlayerList.cs new file mode 100644 index 0000000..285b595 --- /dev/null +++ b/Assets/Menus/Network/ViewPlayerList.cs @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:af8c96eecf0805bbd9ff925211a4de3fa57999fcc9fd7d90c08d409b69e30197 +size 817 diff --git a/Assets/Menus/Network/ViewPlayerList.cs.meta b/Assets/Menus/Network/ViewPlayerList.cs.meta new file mode 100644 index 0000000..3c6e322 --- /dev/null +++ b/Assets/Menus/Network/ViewPlayerList.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 5a85b2ac217bf1c479a675eadf55df71 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Menus/WaitingRoom/WaitingPlayer.cs b/Assets/Menus/WaitingRoom/WaitingPlayer.cs index 1947678..8b4b70d 100644 --- a/Assets/Menus/WaitingRoom/WaitingPlayer.cs +++ b/Assets/Menus/WaitingRoom/WaitingPlayer.cs @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:1c1c09b127f6947da9fe20e36b4f5cb06f43c0f043d3b0f80356ebcff5dd0a8c -size 1491 +oid sha256:570ad94bc0dc6ef18d73b83e0927def732c9f70b6ef828dcac30c6c4f1274d99 +size 2322 diff --git a/Assets/Menus/WaitingRoom/WaitingRoomManager.cs b/Assets/Menus/WaitingRoom/WaitingRoomManager.cs index 068fcfa..c89ab70 100644 --- a/Assets/Menus/WaitingRoom/WaitingRoomManager.cs +++ b/Assets/Menus/WaitingRoom/WaitingRoomManager.cs @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:041b38c5a1b7611a796e8658745b1c184869e283057b16af97c7863cf40a35bc -size 656 +oid sha256:6f0a0e3ac2860b5cb9483fa2efeb147387a53a442cd41a41eeb398fcac4301b3 +size 2887 diff --git a/Assets/Menus/WaitingRoom/WaitingUserInit.cs b/Assets/Menus/WaitingRoom/WaitingUserInit.cs index 82c4f90..82a8b42 100644 --- a/Assets/Menus/WaitingRoom/WaitingUserInit.cs +++ b/Assets/Menus/WaitingRoom/WaitingUserInit.cs @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:5409e644ce49c519c82f1709d5e3148fc7473c8b3931431511fee48555e4ce76 -size 2203 +oid sha256:4799345e8b48495c533b12a9c859c69153546e658590897fc43db80c524d1ba0 +size 1024 diff --git a/Assets/Menus/WaitingRoom/WaitingUserPrefab.prefab b/Assets/Menus/WaitingRoom/WaitingUserPrefab.prefab index 74370ff..c004f43 100644 --- a/Assets/Menus/WaitingRoom/WaitingUserPrefab.prefab +++ b/Assets/Menus/WaitingRoom/WaitingUserPrefab.prefab @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:317fb67c0df75bd210f3a34dbfa245bf8e93f8536883582aceb7dd2edd7a4e71 -size 16342 +oid sha256:7420fc0c4be2431d92c3faf5374c4a01fab46dbffc7b5d42a1ea18eb1bc0a1ee +size 16345 diff --git a/Assets/Plugins/TextMesh Pro/Documentation/TextMesh Pro User Guide 2016.pdf b/Assets/Plugins/TextMesh Pro/Documentation/TextMesh Pro User Guide 2016.pdf new file mode 100644 index 0000000..1db4e05 --- /dev/null +++ b/Assets/Plugins/TextMesh Pro/Documentation/TextMesh Pro User Guide 2016.pdf @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:93d6d3ca8a7d8423b01faacd00fa3921fe055fb2187873653a925e4cc1af85c0 +size 694398 diff --git a/Assets/Plugins/TextMesh Pro/Documentation/TextMesh Pro User Guide 2016.pdf.meta b/Assets/Plugins/TextMesh Pro/Documentation/TextMesh Pro User Guide 2016.pdf.meta new file mode 100644 index 0000000..e4afeef --- /dev/null +++ b/Assets/Plugins/TextMesh Pro/Documentation/TextMesh Pro User Guide 2016.pdf.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 1b8d251f9af63b746bf2f7ffe00ebb9b +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Plugins/TextMesh Pro/Resources/Fonts & Materials/LiberationSans SDF - Drop Shadow.mat b/Assets/Plugins/TextMesh Pro/Resources/Fonts & Materials/LiberationSans SDF - Drop Shadow.mat index 7d31cca..7c123c3 100644 --- a/Assets/Plugins/TextMesh Pro/Resources/Fonts & Materials/LiberationSans SDF - Drop Shadow.mat +++ b/Assets/Plugins/TextMesh Pro/Resources/Fonts & Materials/LiberationSans SDF - Drop Shadow.mat @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:9f09c17d1a8b5c9f70d9677e2657b373f3127034dc526ab428f6bbd78c873883 -size 1654 +oid sha256:b6b65c34e4907dd3006c2217fc8a4cef81b6da24df0a3de8e2288199eb6c5a9d +size 2975 diff --git a/Assets/Plugins/TextMesh Pro/Resources/Fonts & Materials/LiberationSans SDF - Fallback.asset b/Assets/Plugins/TextMesh Pro/Resources/Fonts & Materials/LiberationSans SDF - Fallback.asset new file mode 100644 index 0000000..dabc2e2 --- /dev/null +++ b/Assets/Plugins/TextMesh Pro/Resources/Fonts & Materials/LiberationSans SDF - Fallback.asset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:809894df611dd2c0beca143538141fd221a516446176728ab520965dc1a0e747 +size 9099 diff --git a/Assets/Plugins/TextMesh Pro/Resources/Fonts & Materials/LiberationSans SDF - Fallback.asset.meta b/Assets/Plugins/TextMesh Pro/Resources/Fonts & Materials/LiberationSans SDF - Fallback.asset.meta new file mode 100644 index 0000000..42dd6ac --- /dev/null +++ b/Assets/Plugins/TextMesh Pro/Resources/Fonts & Materials/LiberationSans SDF - Fallback.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 2e498d1c8094910479dc3e1b768306a4 +timeCreated: 1484171803 +licenseType: Pro +NativeFormatImporter: + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Plugins/TextMesh Pro/Resources/Fonts & Materials/LiberationSans SDF - Outline.mat b/Assets/Plugins/TextMesh Pro/Resources/Fonts & Materials/LiberationSans SDF - Outline.mat index afbdd22..3b7981b 100644 --- a/Assets/Plugins/TextMesh Pro/Resources/Fonts & Materials/LiberationSans SDF - Outline.mat +++ b/Assets/Plugins/TextMesh Pro/Resources/Fonts & Materials/LiberationSans SDF - Outline.mat @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a69f7b34e577d01a1eb77e832373f1b672675cb5993c4fcc5d2a8aabbe8ba7c5 -size 2815 +oid sha256:25874340976d40e9f9e8abf731b7f32e5a478541dead9288140bd60c7a3287d9 +size 2889 diff --git a/Assets/Plugins/TextMesh Pro/Resources/Fonts & Materials/LiberationSans SDF.asset b/Assets/Plugins/TextMesh Pro/Resources/Fonts & Materials/LiberationSans SDF.asset index cbea438..fbe5ac7 100644 --- a/Assets/Plugins/TextMesh Pro/Resources/Fonts & Materials/LiberationSans SDF.asset +++ b/Assets/Plugins/TextMesh Pro/Resources/Fonts & Materials/LiberationSans SDF.asset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:277a4a5984725c4233f3f633fafa25b65468e01502eb4412444f169070aad458 -size 2174066 +oid sha256:252189f3779a8eadd81dcc7a8f976208b772e6391d504de2e1a2e6c42a138165 +size 2256837 diff --git a/Assets/Plugins/TextMesh Pro/Resources/Shaders/TMP_SDF Overlay.shader b/Assets/Plugins/TextMesh Pro/Resources/Shaders/TMP_SDF Overlay.shader index 9e5f94f..5d228a2 100644 --- a/Assets/Plugins/TextMesh Pro/Resources/Shaders/TMP_SDF Overlay.shader +++ b/Assets/Plugins/TextMesh Pro/Resources/Shaders/TMP_SDF Overlay.shader @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:90efe8e358089d4541d4fd174a15a067877a42520f54c8a96b55bc38b84e0038 -size 10039 +oid sha256:3c408f952c5eb2546e85acb7a4ae3db9c11e7b5721e65b680f4cdef594de29d8 +size 10097 diff --git a/Assets/Plugins/TextMesh Pro/Resources/Shaders/TMP_SDF-Mobile Masking.shader b/Assets/Plugins/TextMesh Pro/Resources/Shaders/TMP_SDF-Mobile Masking.shader index f82443b..200aff8 100644 --- a/Assets/Plugins/TextMesh Pro/Resources/Shaders/TMP_SDF-Mobile Masking.shader +++ b/Assets/Plugins/TextMesh Pro/Resources/Shaders/TMP_SDF-Mobile Masking.shader @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d39d0ea8050a7abe6c34f50d5e605507ce1404830818cd5baf8e65bc7b496698 -size 7715 +oid sha256:500a59291efd37ed7ace78b639dd2d1f1336b1ea4ebc02b9b49e04165f6a0735 +size 7773 diff --git a/Assets/Plugins/TextMesh Pro/Resources/Shaders/TMP_SDF-Mobile Overlay.shader b/Assets/Plugins/TextMesh Pro/Resources/Shaders/TMP_SDF-Mobile Overlay.shader index 99671f4..c53b3e7 100644 --- a/Assets/Plugins/TextMesh Pro/Resources/Shaders/TMP_SDF-Mobile Overlay.shader +++ b/Assets/Plugins/TextMesh Pro/Resources/Shaders/TMP_SDF-Mobile Overlay.shader @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:39ffa8a059c7ae36208be0ea87b9abbf11d98b62f084a62e7620bd1dba270291 -size 7090 +oid sha256:0d2d06d9b5c7d942d10ea2b6c2aaf6036e482c9c3e721fc2c07e39559c307d18 +size 7148 diff --git a/Assets/Plugins/TextMesh Pro/Resources/Shaders/TMP_SDF-Mobile.shader b/Assets/Plugins/TextMesh Pro/Resources/Shaders/TMP_SDF-Mobile.shader index 8a131db..05df633 100644 --- a/Assets/Plugins/TextMesh Pro/Resources/Shaders/TMP_SDF-Mobile.shader +++ b/Assets/Plugins/TextMesh Pro/Resources/Shaders/TMP_SDF-Mobile.shader @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:7c9a9cbcceb645cea8faaeaae60b55fbeae79f107a5c581ed05dfe7d82d9fc00 -size 7098 +oid sha256:5c73e6d4c10341a175f752984a28a7d52e8b64810bfa332e8c11f180cdab109b +size 7631 diff --git a/Assets/Plugins/TextMesh Pro/Resources/Shaders/TMP_SDF-Surface-Mobile.shader b/Assets/Plugins/TextMesh Pro/Resources/Shaders/TMP_SDF-Surface-Mobile.shader index 941676f..3d4e24a 100644 --- a/Assets/Plugins/TextMesh Pro/Resources/Shaders/TMP_SDF-Surface-Mobile.shader +++ b/Assets/Plugins/TextMesh Pro/Resources/Shaders/TMP_SDF-Surface-Mobile.shader @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:bac7837c11581e95937e79361aac6c714b37f8913f10ce223736f66ea45a6013 -size 3433 +oid sha256:f2076a042168cd9801c9ae8a8cd79aa627e4074ef0e97460cea44eb02947667d +size 3478 diff --git a/Assets/Plugins/TextMesh Pro/Resources/Shaders/TMP_SDF-Surface.shader b/Assets/Plugins/TextMesh Pro/Resources/Shaders/TMP_SDF-Surface.shader index 41fa018..ec193a2 100644 --- a/Assets/Plugins/TextMesh Pro/Resources/Shaders/TMP_SDF-Surface.shader +++ b/Assets/Plugins/TextMesh Pro/Resources/Shaders/TMP_SDF-Surface.shader @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:60e882a4058f721f114cacf173a1d273f0afbbc4c848883d2bf87108bc5098bb -size 4252 +oid sha256:fe7b0b58514689da2145e521276f0e08ffa7ebd238459c70f2fe6e47174ba292 +size 4297 diff --git a/Assets/Plugins/TextMesh Pro/Resources/Shaders/TMP_SDF.shader b/Assets/Plugins/TextMesh Pro/Resources/Shaders/TMP_SDF.shader index ba91b8d..cb80ad3 100644 --- a/Assets/Plugins/TextMesh Pro/Resources/Shaders/TMP_SDF.shader +++ b/Assets/Plugins/TextMesh Pro/Resources/Shaders/TMP_SDF.shader @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:8ce675eb8aef9769efbbb7960bd855ab5349f6d8226218b4d8d079b9fbda5671 -size 10047 +oid sha256:2166d0ca50ed2183d0be3e9a55fe011ae7788bc815ebcc688146b67d333be8f0 +size 10560 diff --git a/Assets/Plugins/TextMesh Pro/Resources/Shaders/TMPro_Properties.cginc b/Assets/Plugins/TextMesh Pro/Resources/Shaders/TMPro_Properties.cginc index 8e89997..67fce0a 100644 --- a/Assets/Plugins/TextMesh Pro/Resources/Shaders/TMPro_Properties.cginc +++ b/Assets/Plugins/TextMesh Pro/Resources/Shaders/TMPro_Properties.cginc @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:bd973ba269bfb51dfaf65f0a6d5f6590bd2a075a8b509237c8092f247da4279b -size 2816 +oid sha256:26c70831a9bdd6a56a37ec1e2358929453d66a064d10a61da49a1d4b05280e06 +size 2843 diff --git a/Assets/Plugins/TextMesh Pro/Resources/Shaders/TMPro_Surface.cginc b/Assets/Plugins/TextMesh Pro/Resources/Shaders/TMPro_Surface.cginc index 1cf4401..99795f1 100644 --- a/Assets/Plugins/TextMesh Pro/Resources/Shaders/TMPro_Surface.cginc +++ b/Assets/Plugins/TextMesh Pro/Resources/Shaders/TMPro_Surface.cginc @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e1b5c3e4730e71b2ae9b8d4e8c4d50b1d5c70871304def850f28ebca769df6da -size 3956 +oid sha256:20619418d42b56402b9bd9cd6d5d7a6e236d010b31b493d03f78dae933ec353f +size 3969 diff --git a/Assets/Plugins/TextMesh Pro/Resources/Sprite Assets/EmojiOne.asset b/Assets/Plugins/TextMesh Pro/Resources/Sprite Assets/EmojiOne.asset index 677485d..5b24313 100644 --- a/Assets/Plugins/TextMesh Pro/Resources/Sprite Assets/EmojiOne.asset +++ b/Assets/Plugins/TextMesh Pro/Resources/Sprite Assets/EmojiOne.asset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:4ab634f7643089e123595cbb8a8a863a6f3c69c89111d511936c7f753d2b9533 -size 5894 +oid sha256:9842cc4e3383b079e7112e039e001fe23e7013a8d05fcd21ada8031a80212873 +size 12992 diff --git a/Assets/Plugins/TextMesh Pro/Resources/TMP Settings.asset b/Assets/Plugins/TextMesh Pro/Resources/TMP Settings.asset index cb68006..575e30c 100644 --- a/Assets/Plugins/TextMesh Pro/Resources/TMP Settings.asset +++ b/Assets/Plugins/TextMesh Pro/Resources/TMP Settings.asset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d022e2b2f2bef2947170aee188569021313ea511cf39f9a79f752059b972d320 -size 1505 +oid sha256:36bdb820f5762dc4fcdb15c8cf669992473dd9e0e63d44eb1e64ec637423ad10 +size 1564 diff --git a/Assets/Plugins/TextMesh Pro/Sprites/EmojiOne Attribution.txt b/Assets/Plugins/TextMesh Pro/Sprites/EmojiOne Attribution.txt new file mode 100644 index 0000000..84f3fc6 --- /dev/null +++ b/Assets/Plugins/TextMesh Pro/Sprites/EmojiOne Attribution.txt @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:095907d2631301d08dbff9388fc0c278904fd86e18ba76bb0d401a790ade8f83 +size 187 diff --git a/Assets/Plugins/TextMesh Pro/Sprites/EmojiOne Attribution.txt.meta b/Assets/Plugins/TextMesh Pro/Sprites/EmojiOne Attribution.txt.meta new file mode 100644 index 0000000..0d30e65 --- /dev/null +++ b/Assets/Plugins/TextMesh Pro/Sprites/EmojiOne Attribution.txt.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 381dcb09d5029d14897e55f98031fca5 +TextScriptImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Plugins/TextMesh Pro/Sprites/EmojiOne.json b/Assets/Plugins/TextMesh Pro/Sprites/EmojiOne.json new file mode 100644 index 0000000..02f1453 --- /dev/null +++ b/Assets/Plugins/TextMesh Pro/Sprites/EmojiOne.json @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:fa35c4a1b7cfc12e872bcba7d0d20702077a5478472b87d619b2c72bf5bb48d0 +size 4122 diff --git a/Assets/Plugins/TextMesh Pro/Sprites/EmojiOne.json.meta b/Assets/Plugins/TextMesh Pro/Sprites/EmojiOne.json.meta new file mode 100644 index 0000000..762cf15 --- /dev/null +++ b/Assets/Plugins/TextMesh Pro/Sprites/EmojiOne.json.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 8f05276190cf498a8153f6cbe761d4e6 +timeCreated: 1480316860 +licenseType: Pro +TextScriptImporter: + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Plugins/TextMesh Pro/Sprites/EmojiOne.png b/Assets/Plugins/TextMesh Pro/Sprites/EmojiOne.png new file mode 100644 index 0000000..f4162d7 --- /dev/null +++ b/Assets/Plugins/TextMesh Pro/Sprites/EmojiOne.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:8d1830e21c290b1a2ce398fc98bad6b0ebb5feaa259b8969ea03066ab2f7aced +size 73304 diff --git a/Assets/Plugins/TextMesh Pro/Sprites/EmojiOne.png.meta b/Assets/Plugins/TextMesh Pro/Sprites/EmojiOne.png.meta new file mode 100644 index 0000000..c9fa1a7 --- /dev/null +++ b/Assets/Plugins/TextMesh Pro/Sprites/EmojiOne.png.meta @@ -0,0 +1,431 @@ +fileFormatVersion: 2 +guid: dffef66376be4fa480fb02b19edbe903 +TextureImporter: + fileIDToRecycleName: + 21300000: EmojiOne_0 + 21300002: EmojiOne_1 + 21300004: EmojiOne_2 + 21300006: EmojiOne_3 + 21300008: EmojiOne_4 + 21300010: EmojiOne_6 + 21300012: EmojiOne_7 + 21300014: EmojiOne_8 + 21300016: EmojiOne_9 + 21300018: EmojiOne_10 + 21300020: EmojiOne_11 + 21300022: EmojiOne_12 + 21300024: EmojiOne_13 + 21300026: EmojiOne_5 + 21300028: EmojiOne_14 + externalObjects: {} + serializedVersion: 5 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: -1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: -1 + aniso: -1 + mipBias: -1 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 2 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spritePixelsToUnits: 100 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 0 + textureShape: 1 + singleChannelComponent: 0 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + platformSettings: + - serializedVersion: 2 + buildTarget: DefaultTexturePlatform + maxTextureSize: 512 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: Standalone + maxTextureSize: 512 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: iPhone + maxTextureSize: 512 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: Android + maxTextureSize: 512 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + spriteSheet: + serializedVersion: 2 + sprites: + - serializedVersion: 2 + name: EmojiOne_0 + rect: + serializedVersion: 2 + x: 0 + y: 384 + width: 128 + height: 128 + alignment: 0 + pivot: {x: 0.5, y: 0.5} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 4bcc36da2108f2c4ba3de5c921d25c3c + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: EmojiOne_1 + rect: + serializedVersion: 2 + x: 128 + y: 384 + width: 128 + height: 128 + alignment: 0 + pivot: {x: 0.5, y: 0.5} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: e9eea8093eaeaee4d901c4553f572c22 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: EmojiOne_2 + rect: + serializedVersion: 2 + x: 256 + y: 384 + width: 128 + height: 128 + alignment: 0 + pivot: {x: 0.5, y: 0.5} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 49451da35411dcc42a3692e39b0fde70 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: EmojiOne_3 + rect: + serializedVersion: 2 + x: 384 + y: 384 + width: 128 + height: 128 + alignment: 0 + pivot: {x: 0.5, y: 0.5} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: f65709664b924904790c850a50ca82bc + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: EmojiOne_4 + rect: + serializedVersion: 2 + x: 0 + y: 256 + width: 128 + height: 128 + alignment: 0 + pivot: {x: 0.5, y: 0.5} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 5b92c568a5ec9ad4b9ed90e271f1c9a8 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: EmojiOne_6 + rect: + serializedVersion: 2 + x: 256 + y: 256 + width: 128 + height: 128 + alignment: 0 + pivot: {x: 0.5, y: 0.5} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: b10f2b48b7281594bb8a24a6511a35af + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: EmojiOne_7 + rect: + serializedVersion: 2 + x: 384 + y: 256 + width: 128 + height: 128 + alignment: 0 + pivot: {x: 0.5, y: 0.5} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 10a600f9329dc2246a897e89f4d283cd + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: EmojiOne_8 + rect: + serializedVersion: 2 + x: 0 + y: 128 + width: 128 + height: 128 + alignment: 0 + pivot: {x: 0.5, y: 0.5} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 66cffa363b90ab14787d8a5b90cf4502 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: EmojiOne_9 + rect: + serializedVersion: 2 + x: 128 + y: 128 + width: 128 + height: 128 + alignment: 0 + pivot: {x: 0.5, y: 0.5} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 55cf3d409c9b89349b1e1bdc1cc224ad + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: EmojiOne_10 + rect: + serializedVersion: 2 + x: 256 + y: 128 + width: 128 + height: 128 + alignment: 0 + pivot: {x: 0.5, y: 0.5} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 2a9e58eaf96feef42bcefa1cf257193f + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: EmojiOne_11 + rect: + serializedVersion: 2 + x: 384 + y: 128 + width: 128 + height: 128 + alignment: 0 + pivot: {x: 0.5, y: 0.5} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 2489120affc155840ae6a7be2e93ce19 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: EmojiOne_12 + rect: + serializedVersion: 2 + x: 0 + y: 0 + width: 128 + height: 128 + alignment: 0 + pivot: {x: 0.5, y: 0.5} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 412349a150598d14da4d7140df5c0286 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: EmojiOne_13 + rect: + serializedVersion: 2 + x: 128 + y: 0 + width: 128 + height: 128 + alignment: 0 + pivot: {x: 0.5, y: 0.5} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: a937464b42bb3634782dea34c6becb6c + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: EmojiOne_5 + rect: + serializedVersion: 2 + x: 256 + y: 0 + width: 128 + height: 128 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: b0f933b217682124dbfc5e6b89abe3d0 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: EmojiOne_14 + rect: + serializedVersion: 2 + x: 128 + y: 256 + width: 128 + height: 128 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: f7235c763afe4434e8bb666750a41096 + vertices: [] + indices: + edges: [] + weights: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 3e32d8f5477abfc43b19066e8ad5032e + vertices: [] + indices: + edges: [] + weights: [] + spritePackingTag: + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Fonts/AmazDooMLeft SDF.asset b/Assets/Resources/Fonts/AmazDooMLeft SDF.asset index 569c076..55fd81a 100644 --- a/Assets/Resources/Fonts/AmazDooMLeft SDF.asset +++ b/Assets/Resources/Fonts/AmazDooMLeft SDF.asset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:7bd81d201a1ed6458fb7512d3b43798dfe2fb3c54fec4f5f62eff6f5ab87dd1c -size 543284 +oid sha256:74c4cc635cf742613ad5aab5fd6100585254258f1cafa12affcd302eae390504 +size 577016 diff --git a/Assets/Resources/Fonts/AmazDooMRight SDF.asset b/Assets/Resources/Fonts/AmazDooMRight SDF.asset index 1f9cfab..bfa9bc4 100644 --- a/Assets/Resources/Fonts/AmazDooMRight SDF.asset +++ b/Assets/Resources/Fonts/AmazDooMRight SDF.asset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:9806a4a4619260c912adddd5a09b717e25f9f033bf64ccab24937dc366ac9cdf -size 542935 +oid sha256:324fd0ffdffd5cadbb460a5de298a94207626ea831981488f0a59cc8f2975d6e +size 577581 diff --git a/Assets/Resources/Fonts/big_noodle_titling SDF.asset b/Assets/Resources/Fonts/big_noodle_titling SDF.asset index b401c94..e99b204 100644 --- a/Assets/Resources/Fonts/big_noodle_titling SDF.asset +++ b/Assets/Resources/Fonts/big_noodle_titling SDF.asset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:211730e38f3ea83a4a60426a9f70215d3099c682563080f254b3339878fd745c -size 544139 +oid sha256:9252cd85d08cbdb14f4c32a4a4d07641481a05301891716ae379e87a3d5c2c36 +size 581028 diff --git a/Assets/Resources/Sprite Assets.meta b/Assets/Resources/Sprite Assets.meta new file mode 100644 index 0000000..8ad4904 --- /dev/null +++ b/Assets/Resources/Sprite Assets.meta @@ -0,0 +1,9 @@ +fileFormatVersion: 2 +guid: 8b4bc66d022f090409eb8aa96faaceef +folderAsset: yes +timeCreated: 1441876896 +licenseType: Pro +DefaultImporter: + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Sprite Assets/EmojiOne.asset b/Assets/Resources/Sprite Assets/EmojiOne.asset new file mode 100644 index 0000000..5b24313 --- /dev/null +++ b/Assets/Resources/Sprite Assets/EmojiOne.asset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:9842cc4e3383b079e7112e039e001fe23e7013a8d05fcd21ada8031a80212873 +size 12992 diff --git a/Assets/Resources/Sprite Assets/EmojiOne.asset.meta b/Assets/Resources/Sprite Assets/EmojiOne.asset.meta new file mode 100644 index 0000000..56bb24b --- /dev/null +++ b/Assets/Resources/Sprite Assets/EmojiOne.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 2a0beca8bb8b30c4ebeb3e58399bb4f6 +timeCreated: 1480316912 +licenseType: Pro +NativeFormatImporter: + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scenes/MainMenu.unity b/Assets/Scenes/MainMenu.unity index b83afb8..b6e91e6 100644 --- a/Assets/Scenes/MainMenu.unity +++ b/Assets/Scenes/MainMenu.unity @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ead9c10da0ad36cb6686ec6f5830f80823e90a18e8f533f70fc31ff5b3f5571f -size 106655 +oid sha256:9781de39668cead69648ce720de320c0c873d2d1ada11fdbc868fc2e643a700f +size 106466 diff --git a/Assets/Scenes/WaitingRoomScene.unity b/Assets/Scenes/WaitingRoomScene.unity index 691f71c..4e4aa6f 100644 --- a/Assets/Scenes/WaitingRoomScene.unity +++ b/Assets/Scenes/WaitingRoomScene.unity @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b1872392a00dad50e04e340309787c531e2f9495bb230d8684400e1f2e5091a5 -size 98092 +oid sha256:060798827f8f9718d39997918672c16c12bc4dfeda8dcc33b13b1f183808e51d +size 106081 diff --git a/ProjectSettings/GraphicsSettings.asset b/ProjectSettings/GraphicsSettings.asset index 7d097a9..b70056e 100644 --- a/ProjectSettings/GraphicsSettings.asset +++ b/ProjectSettings/GraphicsSettings.asset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:660d82474f911b954dbfa2c8f4e5ac333a87f1f6d04f9ffbdf5073e2e17d2d50 -size 1880 +oid sha256:06f2c9c42c3e01f1143d4c15cfe4f316cfab490aba17fde694e466c130d4e3a4 +size 2359 diff --git a/ProjectSettings/QualitySettings.asset b/ProjectSettings/QualitySettings.asset index 6b8b8db..2225106 100644 --- a/ProjectSettings/QualitySettings.asset +++ b/ProjectSettings/QualitySettings.asset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:7aac1568bb0fafc2134c72ee61be70aac62d1e7cb71e8862cfcc5845399d51f4 -size 6405 +oid sha256:edac932c0d7ea228ce81434c6eea76d5f27c023c81cf67a043cce8f8b146d746 +size 6248