Merge pull request #30 from eviltwo/0.7.3-dev

0.7.3
eviltwo · Jul 8, 2024 · 86597e9 · 86597e9
2 parents 10b8827 + 48d671c
commit 86597e9
Show file tree

Hide file tree

Showing 113 changed files with 259 additions and 485 deletions.
diff --git a/InputGlyphs/Assets/InputGlyphs/CHANGELOG.md b/InputGlyphs/Assets/InputGlyphs/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Changelog
 
+## [0.7.3] - 2024-07-07
+### Changed
+- Added version to URLs importing packages such as steamworks.
+
 ## [0.7.2] - 2024-07-07
 ### Fixed
 - Fix glyphs not display in built game

diff --git a/...les/DuoPlayerSample/DuoPlayerSample.unity → ...InputGlyphs/Samples/DuoPlayerSample.unity b/...les/DuoPlayerSample/DuoPlayerSample.unity → ...InputGlyphs/Samples/DuoPlayerSample.unity
diff --git a/...uoPlayerSample/DuoPlayerSample.unity.meta → ...Glyphs/Samples/DuoPlayerSample.unity.meta b/...uoPlayerSample/DuoPlayerSample.unity.meta → ...Glyphs/Samples/DuoPlayerSample.unity.meta
diff --git a/InputGlyphs/Assets/InputGlyphs/Samples/InputCheckSample.meta b/InputGlyphs/Assets/InputGlyphs/Samples/InputCheckSample.meta
diff --git a/...s/InputCheckSample/InputCheckSample.unity → ...nputGlyphs/Samples/InputCheckSample.unity b/...s/InputCheckSample/InputCheckSample.unity → ...nputGlyphs/Samples/InputCheckSample.unity
@@ -448,7 +448,6 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: d0e15330025853949aa116196e2f3f3a, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  _playerInput: {fileID: 1847320111}
   _spriteRenderer: {fileID: 1399903892}
 --- !u!4 &1399903891
 Transform:

diff --git a/...utCheckSample/InputCheckSample.unity.meta → ...lyphs/Samples/InputCheckSample.unity.meta b/...utCheckSample/InputCheckSample.unity.meta → ...lyphs/Samples/InputCheckSample.unity.meta
diff --git a/InputGlyphs/Assets/InputGlyphs/Samples/InputCheckSample/Scripts.meta b/InputGlyphs/Assets/InputGlyphs/Samples/InputCheckSample/Scripts.meta
diff --git a/...phs/Samples/SteamworksSample/Scripts.meta → ...s/Assets/InputGlyphs/Samples/Scripts.meta b/...phs/Samples/SteamworksSample/Scripts.meta → ...s/Assets/InputGlyphs/Samples/Scripts.meta
diff --git a/...utCheckSample/Scripts/InputCheckSample.cs → ...lyphs/Samples/Scripts/InputCheckSample.cs b/...utCheckSample/Scripts/InputCheckSample.cs → ...lyphs/Samples/Scripts/InputCheckSample.cs
@@ -1,4 +1,4 @@
-#if ENABLE_INPUT_SYSTEM
+#if INPUT_SYSTEM && ENABLE_INPUT_SYSTEM
 using System;
 using System.Collections.Generic;
 using InputGlyphs.Display;
@@ -11,9 +11,6 @@ namespace InputGlyphs.Samples
     [AddComponentMenu("")] // Disable the script from the Add Component menu
     public class InputCheckSample : MonoBehaviour
     {
-        [SerializeField]
-        private PlayerInput _playerInput = null;
-
         [SerializeField]
         private SpriteRenderer _spriteRenderer = null;
 

diff --git a/...ckSample/Scripts/InputCheckSample.cs.meta → .../Samples/Scripts/InputCheckSample.cs.meta b/...ckSample/Scripts/InputCheckSample.cs.meta → .../Samples/Scripts/InputCheckSample.cs.meta
diff --git a/...ipts/InputGlyphs.Sample.InputCheck.asmdef → ...Samples/Scripts/InputGlyphs.Sample.asmdef b/...ipts/InputGlyphs.Sample.InputCheck.asmdef → ...Samples/Scripts/InputGlyphs.Sample.asmdef
@@ -1,8 +1,9 @@
 {
-    "name": "InputGlyphs.Sample.InputCheck",
+    "name": "InputGlyphs.Sample",
     "rootNamespace": "",
     "references": [
         "GUID:75469ad4d38634e559750d17036d5f7c",
+        "GUID:68bd7fdb68ef2684e982e8a9825b18a5",
         "GUID:fc48f7dd8f1155d429d2f9eeb74a4fd4",
         "GUID:41e8b111addd18e47a62477e330b80c7"
     ],
@@ -13,6 +14,17 @@
     "precompiledReferences": [],
     "autoReferenced": false,
     "defineConstraints": [],
-    "versionDefines": [],
+    "versionDefines": [
+        {
+            "name": "com.unity.inputsystem",
+            "expression": "",
+            "define": "INPUT_SYSTEM"
+        },
+        {
+            "name": "com.rlabrecque.steamworks.net",
+            "expression": "",
+            "define": "SUPPORT_STEAMWORKS"
+        }
+    ],
     "noEngineReferences": false
 }
diff --git a/...InputGlyphs.Sample.InputCheck.asmdef.meta → ...es/Scripts/InputGlyphs.Sample.asmdef.meta b/...InputGlyphs.Sample.InputCheck.asmdef.meta → ...es/Scripts/InputGlyphs.Sample.asmdef.meta
diff --git a/...amworksSample/Scripts/SteamworksSample.cs → ...lyphs/Samples/Scripts/SteamworksSample.cs b/...amworksSample/Scripts/SteamworksSample.cs → ...lyphs/Samples/Scripts/SteamworksSample.cs
diff --git a/...ksSample/Scripts/SteamworksSample.cs.meta → .../Samples/Scripts/SteamworksSample.cs.meta b/...ksSample/Scripts/SteamworksSample.cs.meta → .../Samples/Scripts/SteamworksSample.cs.meta
diff --git a/InputGlyphs/Assets/InputGlyphs/Samples/SoloPlayerSample.meta b/InputGlyphs/Assets/InputGlyphs/Samples/SoloPlayerSample.meta
diff --git a/...s/SoloPlayerSample/SoloPlayerSample.unity → ...nputGlyphs/Samples/SoloPlayerSample.unity b/...s/SoloPlayerSample/SoloPlayerSample.unity → ...nputGlyphs/Samples/SoloPlayerSample.unity
diff --git a/...oPlayerSample/SoloPlayerSample.unity.meta → ...lyphs/Samples/SoloPlayerSample.unity.meta b/...oPlayerSample/SoloPlayerSample.unity.meta → ...lyphs/Samples/SoloPlayerSample.unity.meta
diff --git a/InputGlyphs/Assets/InputGlyphs/Samples/SteamworksSample.meta b/InputGlyphs/Assets/InputGlyphs/Samples/SteamworksSample.meta
diff --git a/...s/SteamworksSample/SteamworksSample.unity → ...nputGlyphs/Samples/SteamworksSample.unity b/...s/SteamworksSample/SteamworksSample.unity → ...nputGlyphs/Samples/SteamworksSample.unity
diff --git a/...amworksSample/SteamworksSample.unity.meta → ...lyphs/Samples/SteamworksSample.unity.meta b/...amworksSample/SteamworksSample.unity.meta → ...lyphs/Samples/SteamworksSample.unity.meta
diff --git a/InputGlyphs/Assets/InputGlyphs/Scripts/Core.meta b/InputGlyphs/Assets/InputGlyphs/Scripts/Core.meta
diff --git a/InputGlyphs/Assets/InputGlyphs/Scripts/Display/InputGlyphs.Display.asmdef b/InputGlyphs/Assets/InputGlyphs/Scripts/Display/InputGlyphs.Display.asmdef
diff --git a/InputGlyphs/Assets/InputGlyphs/Scripts/Display/Sprite/InputGlyps.Display.Sprite.asmdef b/InputGlyphs/Assets/InputGlyphs/Scripts/Display/Sprite/InputGlyps.Display.Sprite.asmdef
diff --git a/InputGlyphs/Assets/InputGlyphs/Scripts/Display/Sprite/InputGlyps.Display.Sprite.asmdef.meta b/InputGlyphs/Assets/InputGlyphs/Scripts/Display/Sprite/InputGlyps.Display.Sprite.asmdef.meta
diff --git a/InputGlyphs/Assets/InputGlyphs/Scripts/Display/TextMeshPro/Editor.meta b/InputGlyphs/Assets/InputGlyphs/Scripts/Display/TextMeshPro/Editor.meta
diff --git a/...utGlyphs/Scripts/Display/TextMeshPro/Editor/InputGlyphs.Display.TextMeshPro.Editor.asmdef b/...utGlyphs/Scripts/Display/TextMeshPro/Editor/InputGlyphs.Display.TextMeshPro.Editor.asmdef
diff --git a/...phs/Scripts/Display/TextMeshPro/Editor/InputGlyphs.Display.TextMeshPro.Editor.asmdef.meta b/...phs/Scripts/Display/TextMeshPro/Editor/InputGlyphs.Display.TextMeshPro.Editor.asmdef.meta
diff --git a/...ssets/InputGlyphs/Scripts/Display/TextMeshPro/InputGlyphs.Display.TextMeshPro.asmdef.meta b/...ssets/InputGlyphs/Scripts/Display/TextMeshPro/InputGlyphs.Display.TextMeshPro.asmdef.meta
diff --git a/InputGlyphs/Assets/InputGlyphs/Scripts/Display/UI/InputGlyphs.Display.UI.asmdef b/InputGlyphs/Assets/InputGlyphs/Scripts/Display/UI/InputGlyphs.Display.UI.asmdef
diff --git a/InputGlyphs/Assets/InputGlyphs/Scripts/Display/UI/InputGlyphs.Display.UI.asmdef.meta b/InputGlyphs/Assets/InputGlyphs/Scripts/Display/UI/InputGlyphs.Display.UI.asmdef.meta
diff --git a/.../Scripts/Loaders/SteamGamepad/Editor.meta → ...hs/Assets/InputGlyphs/Scripts/Editor.meta b/.../Scripts/Loaders/SteamGamepad/Editor.meta → ...hs/Assets/InputGlyphs/Scripts/Editor.meta
diff --git a/...extMeshPro/Editor/InputGlyphTextEditor.cs → ...hs/Scripts/Editor/InputGlyphTextEditor.cs b/...extMeshPro/Editor/InputGlyphTextEditor.cs → ...hs/Scripts/Editor/InputGlyphTextEditor.cs
@@ -1,4 +1,4 @@
-#if ENABLE_INPUT_SYSTEM && SUPPORT_TMPRO
+#if INPUT_SYSTEM && ENABLE_INPUT_SYSTEM && SUPPORT_TMPRO
 using System.Text;
 using UnityEditor;
 using UnityEngine;

diff --git a/...shPro/Editor/InputGlyphTextEditor.cs.meta → ...ripts/Editor/InputGlyphTextEditor.cs.meta b/...shPro/Editor/InputGlyphTextEditor.cs.meta → ...ripts/Editor/InputGlyphTextEditor.cs.meta
diff --git a/...r/InputGlyphs.Loaders.Steam.Editor.asmdef → .../Scripts/Editor/InputGlyphs.Editor.asmdef b/...r/InputGlyphs.Loaders.Steam.Editor.asmdef → .../Scripts/Editor/InputGlyphs.Editor.asmdef
@@ -1,7 +1,10 @@
 {
-    "name": "InputGlyphs.Loaders.Steam.Editor",
+    "name": "InputGlyphs.Editor",
     "rootNamespace": "",
     "references": [
+        "GUID:75469ad4d38634e559750d17036d5f7c",
+        "GUID:6055be8ebefd69e48b49212b09b47b2f",
+        "GUID:41e8b111addd18e47a62477e330b80c7",
         "GUID:32a76035dbfa1e5489ee883a5e9e4570"
     ],
     "includePlatforms": [
@@ -14,6 +17,11 @@
     "autoReferenced": false,
     "defineConstraints": [],
     "versionDefines": [
+        {
+            "name": "com.unity.inputsystem",
+            "expression": "",
+            "define": "INPUT_SYSTEM"
+        },
         {
             "name": "com.rlabrecque.steamworks.net",
             "expression": "",
@@ -28,6 +36,11 @@
             "name": "com.eviltwo.unity-steam-input-glyph-loader",
             "expression": "",
             "define": "SUPPORT_LOADER"
+        },
+        {
+            "name": "com.unity.textmeshpro",
+            "expression": "",
+            "define": "SUPPORT_TMPRO"
         }
     ],
     "noEngineReferences": false

diff --git a/...utGlyphs.Loaders.Steam.Editor.asmdef.meta → ...pts/Editor/InputGlyphs.Editor.asmdef.meta b/...utGlyphs.Loaders.Steam.Editor.asmdef.meta → ...pts/Editor/InputGlyphs.Editor.asmdef.meta