diff --git a/Assets/Code/GameState/Entities/EntitiesDefinitions.cs b/Assets/Code/GameState/Entities/EntitiesDefinitions.cs index 5772255..ec35b76 100644 --- a/Assets/Code/GameState/Entities/EntitiesDefinitions.cs +++ b/Assets/Code/GameState/Entities/EntitiesDefinitions.cs @@ -60,6 +60,7 @@ namespace Nox.Game { } } + [Serializable] public sealed record Attribute { private readonly int values; public AttributeType attribute; @@ -71,12 +72,7 @@ namespace Nox.Game { [Serializable] public sealed class EntityAttributes { - public Attribute[] attributes = { - new(AttributeType.Might, 1), - new(AttributeType.Reflex, 1), - new(AttributeType.Knowledge, 1), - new(AttributeType.Perception, 1) - }; + public Attribute[] attributes; public static EntityAttributes operator +(EntityAttributes a, EntityAttributes b) { return new EntityAttributes { @@ -90,12 +86,7 @@ namespace Nox.Game { [Serializable] public sealed class EntityStats { - public Stat[] stats = { - new(StatType.Health, 0), - new(StatType.Stamina, 0), - new(StatType.Level, 1), - new(StatType.Experience, 0) - }; + public Stat[] stats; public int GetValue(StatType statType) { return stats.First(stat => stat.type == statType).value; diff --git a/Assets/Code/GameState/Entities/ModifiersFactory.cs b/Assets/Code/GameState/Entities/ModifiersFactory.cs index 375f882..65997ff 100644 --- a/Assets/Code/GameState/Entities/ModifiersFactory.cs +++ b/Assets/Code/GameState/Entities/ModifiersFactory.cs @@ -1,7 +1,7 @@ +using Jovian.InspectorTools; using System; using System.Collections.Generic; using System.Linq; -using Jovian.Utilities; namespace Nox.Game { public interface IModfiersFactory { @@ -11,7 +11,7 @@ namespace Nox.Game { bool TryAddModifier(CharacterDefinition character, string modiferId); } - public enum ModifierRole { + public enum ModifierOperation { None, Flat, Addition, @@ -21,10 +21,12 @@ namespace Nox.Game { [Serializable] public sealed class ModifierDefinition { - public System.Guid id = Guid.NewGuid(); + public string name; + [ReadOnly] + public Guid id = Guid.NewGuid(); public StatType statType; public AttributeType attributeType; - public ModifierRole role; + public ModifierOperation operation; public float value; } @@ -35,10 +37,14 @@ namespace Nox.Game { public class ModifiersFactory : IModfiersFactory { private readonly ModifiersRegistry modifiersRegistry; - private readonly Dictionary modifierPool = new (); + private readonly Dictionary modifierPool = new (); public ModifiersFactory(ModifiersRegistry modifiersRegistry) { this.modifiersRegistry = modifiersRegistry; + var allAvailableModifiers = modifiersRegistry.modifiersData; + foreach(var modifier in allAvailableModifiers.modifiers) { + modifierPool.Add(modifier.id, modifier); + } } public IReadOnlyCollection GetAll() { diff --git a/Assets/Code/GameState/Entities/PerkFactory.cs b/Assets/Code/GameState/Entities/PerkFactory.cs index 69a3d1f..233eaac 100644 --- a/Assets/Code/GameState/Entities/PerkFactory.cs +++ b/Assets/Code/GameState/Entities/PerkFactory.cs @@ -1,3 +1,4 @@ +using Jovian.InspectorTools; using System; using System.Collections.Generic; using System.Linq; @@ -13,8 +14,9 @@ namespace Nox.Game { [Serializable] public sealed class PerkDefinition { - public Guid id; public string name; + [ReadOnly] + public Guid id; public ModifiersData modifiers = new (); } diff --git a/Assets/Database/Entities/CharacterBaseSettings.asset b/Assets/Database/Entities/CharacterBaseSettings.asset index ff1a270..b201766 100644 --- a/Assets/Database/Entities/CharacterBaseSettings.asset +++ b/Assets/Database/Entities/CharacterBaseSettings.asset @@ -21,92 +21,59 @@ MonoBehaviour: points: 10 - class: 4 points: 10 + defaultEntityAttributes: + attributes: + - attribute: 1 + value: 1 + - attribute: 2 + value: 1 + - attribute: 3 + value: 1 + - attribute: 4 + value: 1 defaultEntityStats: stats: - - type: 0 - value: 0 + - type: 3 + value: 1 - type: 1 value: 0 - type: 2 - value: 1 - - type: 3 + value: 0 + - type: 4 value: 0 defaultPerksData: perks: [] defaultModifiersData: modifiers: - - id: 0 - type: 3 + - name: Global Health Modifier per MGT + statType: 1 + attributeType: 0 + operation: 3 value: 3 - - id: 2 - type: 3 + - name: Global Stamina modifier per MGT + statType: 2 + attributeType: 0 + operation: 3 value: 1 - - id: 3 - type: 3 + - name: Global Stamina Modifier per KNO + statType: 2 + attributeType: 0 + operation: 3 value: 2 - racialBonuses: - - race: 1 - bonusStats: - stats: - - type: 0 - value: 10 - - type: 0 - value: 10 - - type: 0 - value: 1 - - type: 0 - value: 0 - startingPerks: - perks: [] - permanentModifiers: - modifiers: [] - - race: 2 - bonusStats: - stats: - - type: 0 - value: 10 - - type: 0 - value: 10 - - type: 0 - value: 1 - - type: 0 - value: 0 - startingPerks: - perks: [] - permanentModifiers: - modifiers: [] - - race: 2 - bonusStats: - stats: - - type: 0 - value: 10 - - type: 0 - value: 10 - - type: 0 - value: 1 - - type: 0 - value: 0 - startingPerks: - perks: [] - permanentModifiers: - modifiers: [] + racialBonuses: [] classBonuses: - class: 1 + bonusAttributes: + attributes: [] bonusStats: - stats: - - type: 0 - value: 10 - - type: 0 - value: 10 - - type: 0 - value: 1 - - type: 0 - value: 0 + stats: [] startingPerks: perks: [] permanentModifiers: modifiers: - - id: 1 - type: 3 + - name: Warrior Health per MGT + statType: 1 + attributeType: 0 + operation: 3 value: 4 maxPartySize: 4 diff --git a/Packages/com.jovian.inspector/Editor/Attributes/AnimatorParameterAttribute.cs b/Packages/com.jovian.inspector/Editor/Attributes/AnimatorParameterAttribute.cs index 2f60be0..28331a5 100644 --- a/Packages/com.jovian.inspector/Editor/Attributes/AnimatorParameterAttribute.cs +++ b/Packages/com.jovian.inspector/Editor/Attributes/AnimatorParameterAttribute.cs @@ -7,7 +7,7 @@ using UnityEngine; using UnityEditor; #endif -namespace InspectorToolkit { +namespace Jovian.InspectorTools { public class AnimatorParameterAttribute : PropertyAttribute { public readonly string animatorPropertyName; public bool allParameterTypes; @@ -26,7 +26,7 @@ namespace InspectorToolkit { } } #if UNITY_EDITOR -namespace InspectorToolkit.Internal { +namespace Jovian.InspectorTools.Internal { [CustomPropertyDrawer(typeof(AnimatorParameterAttribute))] public class AnimatorParameterAttributeDrawer : PropertyDrawer { private bool hasAnimator; diff --git a/Packages/com.jovian.inspector/Editor/Attributes/ArrayAttribute.cs b/Packages/com.jovian.inspector/Editor/Attributes/ArrayAttribute.cs index f15cc54..39b9fe7 100644 --- a/Packages/com.jovian.inspector/Editor/Attributes/ArrayAttribute.cs +++ b/Packages/com.jovian.inspector/Editor/Attributes/ArrayAttribute.cs @@ -7,7 +7,7 @@ using System.Reflection; using UnityEditor; #endif -namespace InspectorToolkit { +namespace Jovian.InspectorTools { [AttributeUsage(AttributeTargets.Field)] public abstract class ArrayAttribute : Attribute { diff --git a/Packages/com.jovian.inspector/Editor/Attributes/AssetDropdownAttribute.cs b/Packages/com.jovian.inspector/Editor/Attributes/AssetDropdownAttribute.cs index 1bed383..27aafd6 100644 --- a/Packages/com.jovian.inspector/Editor/Attributes/AssetDropdownAttribute.cs +++ b/Packages/com.jovian.inspector/Editor/Attributes/AssetDropdownAttribute.cs @@ -5,7 +5,7 @@ using Jovian.Utilities; using UnityEngine; using Object = UnityEngine.Object; -namespace InspectorToolkit +namespace Jovian.InspectorTools { /// /// Finds all objects in the project matching filter string and lists alphabetically in a dropdown (if they are assetType) @@ -24,7 +24,7 @@ namespace InspectorToolkit } #if UNITY_EDITOR -namespace InspectorToolkit.Internal +namespace Jovian.InspectorTools.Internal { using UnityEditor; diff --git a/Packages/com.jovian.inspector/Editor/Attributes/AttributeBase.cs b/Packages/com.jovian.inspector/Editor/Attributes/AttributeBase.cs index 91968e7..4b4bde6 100644 --- a/Packages/com.jovian.inspector/Editor/Attributes/AttributeBase.cs +++ b/Packages/com.jovian.inspector/Editor/Attributes/AttributeBase.cs @@ -1,7 +1,7 @@ using System; using UnityEngine; -namespace InspectorToolkit.Internal +namespace Jovian.InspectorTools.Internal { [AttributeUsage(AttributeTargets.Field)] public abstract class AttributeBase : PropertyAttribute diff --git a/Packages/com.jovian.inspector/Editor/Attributes/AttributeBaseDrawer.cs b/Packages/com.jovian.inspector/Editor/Attributes/AttributeBaseDrawer.cs index 01b1ef7..21e77d0 100644 --- a/Packages/com.jovian.inspector/Editor/Attributes/AttributeBaseDrawer.cs +++ b/Packages/com.jovian.inspector/Editor/Attributes/AttributeBaseDrawer.cs @@ -3,7 +3,7 @@ using System.Linq; using UnityEditor; using UnityEngine; -namespace InspectorToolkit.Internal +namespace Jovian.InspectorTools.Internal { [CustomPropertyDrawer(typeof(AttributeBase), true)] public class AttributeBaseDrawer : PropertyDrawer diff --git a/Packages/com.jovian.inspector/Editor/Attributes/AutoFindAttribute.cs b/Packages/com.jovian.inspector/Editor/Attributes/AutoFindAttribute.cs index d79869f..224cc1f 100644 --- a/Packages/com.jovian.inspector/Editor/Attributes/AutoFindAttribute.cs +++ b/Packages/com.jovian.inspector/Editor/Attributes/AutoFindAttribute.cs @@ -8,7 +8,7 @@ using Object = UnityEngine.Object; #if UNITY_EDITOR #endif -namespace InspectorToolkit { +namespace Jovian.InspectorTools { public enum AutoFindScope { Self, SelfAndChildren, @@ -51,7 +51,7 @@ namespace InspectorToolkit { } #if UNITY_EDITOR -namespace InspectorToolkit.Internal { +namespace Jovian.InspectorTools.Internal { [CustomPropertyDrawer(typeof(AutoFindAttribute))] public class AutoFindAttributeDrawer : PropertyDrawer { private GUIContent searchButtonContent; diff --git a/Packages/com.jovian.inspector/Editor/Attributes/BitmaskAttribute.cs b/Packages/com.jovian.inspector/Editor/Attributes/BitmaskAttribute.cs index 8cea482..2431620 100644 --- a/Packages/com.jovian.inspector/Editor/Attributes/BitmaskAttribute.cs +++ b/Packages/com.jovian.inspector/Editor/Attributes/BitmaskAttribute.cs @@ -1,7 +1,7 @@ using UnityEditor; using UnityEngine; -namespace InspectorToolkit +namespace Jovian.InspectorTools { public class BitmaskAttribute : PropertyAttribute { public string[] groupNames; @@ -12,7 +12,7 @@ namespace InspectorToolkit } #if UNITY_EDITOR -namespace InspectorToolkit.Internal +namespace Jovian.InspectorTools.Internal { [CustomPropertyDrawer(typeof(BitmaskAttribute))] diff --git a/Packages/com.jovian.inspector/Editor/Attributes/ButtonMethodAttribute.cs b/Packages/com.jovian.inspector/Editor/Attributes/ButtonMethodAttribute.cs index 43d8a1a..404b4d2 100644 --- a/Packages/com.jovian.inspector/Editor/Attributes/ButtonMethodAttribute.cs +++ b/Packages/com.jovian.inspector/Editor/Attributes/ButtonMethodAttribute.cs @@ -9,7 +9,7 @@ using Jovian.Utilities; using UnityEngine; using Object = UnityEngine.Object; -namespace InspectorToolkit { +namespace Jovian.InspectorTools { [AttributeUsage(AttributeTargets.Method)] public class ButtonMethodAttribute : PropertyAttribute { public readonly ButtonMethodDrawOrder DrawOrder; @@ -33,7 +33,7 @@ namespace InspectorToolkit { } #if UNITY_EDITOR -namespace InspectorToolkit.Internal { +namespace Jovian.InspectorTools.Internal { using System.Collections.Generic; using System.Linq; using System.Reflection; diff --git a/Packages/com.jovian.inspector/Editor/Attributes/CharactersRangeAttribute.cs b/Packages/com.jovian.inspector/Editor/Attributes/CharactersRangeAttribute.cs index 723ce32..e1c5256 100644 --- a/Packages/com.jovian.inspector/Editor/Attributes/CharactersRangeAttribute.cs +++ b/Packages/com.jovian.inspector/Editor/Attributes/CharactersRangeAttribute.cs @@ -1,6 +1,6 @@ using UnityEngine; -namespace InspectorToolkit +namespace Jovian.InspectorTools { /// /// Validate a string field to only allow or disallow a set of pre-defined @@ -43,7 +43,7 @@ namespace InspectorToolkit } #if UNITY_EDITOR -namespace InspectorToolkit.Internal +namespace Jovian.InspectorTools.Internal { using UnityEditor; using EditorTools; diff --git a/Packages/com.jovian.inspector/Editor/Attributes/CompactDrawerAttribute.cs b/Packages/com.jovian.inspector/Editor/Attributes/CompactDrawerAttribute.cs index 792de9d..1868156 100644 --- a/Packages/com.jovian.inspector/Editor/Attributes/CompactDrawerAttribute.cs +++ b/Packages/com.jovian.inspector/Editor/Attributes/CompactDrawerAttribute.cs @@ -7,12 +7,12 @@ using System.Text; using UnityEditor; #endif -namespace InspectorToolkit { +namespace Jovian.InspectorTools { public class CompactDrawerAttribute : PropertyAttribute { } } #if UNITY_EDITOR -namespace InspectorToolkit.Internal { +namespace Jovian.InspectorTools.Internal { [CustomPropertyDrawer(typeof(CompactDrawerAttribute))] public class CompactDrawerAttributeDrawer : PropertyDrawer { private static readonly List cacheProperties = new(); diff --git a/Packages/com.jovian.inspector/Editor/Attributes/CompactVector4Attribute.cs b/Packages/com.jovian.inspector/Editor/Attributes/CompactVector4Attribute.cs index afe0f6c..2641474 100644 --- a/Packages/com.jovian.inspector/Editor/Attributes/CompactVector4Attribute.cs +++ b/Packages/com.jovian.inspector/Editor/Attributes/CompactVector4Attribute.cs @@ -3,7 +3,7 @@ using UnityEngine; using UnityEditor; #endif -namespace InspectorToolkit { +namespace Jovian.InspectorTools { public class CompactVector4Attribute : PropertyAttribute { public CompactVector4Attribute() { } @@ -11,7 +11,7 @@ namespace InspectorToolkit { } #if UNITY_EDITOR -namespace InspectorToolkit.Internal { +namespace Jovian.InspectorTools.Internal { [CustomPropertyDrawer(typeof(CompactVector4Attribute))] public class CompactVector4AttributeDrawer : PropertyDrawer { diff --git a/Packages/com.jovian.inspector/Editor/Attributes/ConditionalFieldAttribute.cs b/Packages/com.jovian.inspector/Editor/Attributes/ConditionalFieldAttribute.cs index 8d39a99..25f5f98 100644 --- a/Packages/com.jovian.inspector/Editor/Attributes/ConditionalFieldAttribute.cs +++ b/Packages/com.jovian.inspector/Editor/Attributes/ConditionalFieldAttribute.cs @@ -4,7 +4,7 @@ using System.Linq; using System.Reflection; using UnityEngine; -namespace InspectorToolkit { +namespace Jovian.InspectorTools { /// /// Conditionally Show/Hide field in inspector, based on some other field value /// @@ -26,7 +26,7 @@ namespace InspectorToolkit { } #if UNITY_EDITOR -namespace InspectorToolkit.Internal { +namespace Jovian.InspectorTools.Internal { using EditorTools; using UnityEditor; diff --git a/Packages/com.jovian.inspector/Editor/Attributes/ConstantsSelectionAttribute.cs b/Packages/com.jovian.inspector/Editor/Attributes/ConstantsSelectionAttribute.cs index 0ddfbf0..e81ea18 100644 --- a/Packages/com.jovian.inspector/Editor/Attributes/ConstantsSelectionAttribute.cs +++ b/Packages/com.jovian.inspector/Editor/Attributes/ConstantsSelectionAttribute.cs @@ -3,7 +3,7 @@ using System.Collections.Generic; using System.Reflection; using UnityEngine; -namespace InspectorToolkit +namespace Jovian.InspectorTools { public class ConstantsSelectionAttribute : PropertyAttribute { @@ -17,7 +17,7 @@ namespace InspectorToolkit } #if UNITY_EDITOR -namespace InspectorToolkit.Internal +namespace Jovian.InspectorTools.Internal { using UnityEditor; using EditorTools; diff --git a/Packages/com.jovian.inspector/Editor/Attributes/DefinedValuesAttribute.cs b/Packages/com.jovian.inspector/Editor/Attributes/DefinedValuesAttribute.cs index ba60b6b..2fd2477 100644 --- a/Packages/com.jovian.inspector/Editor/Attributes/DefinedValuesAttribute.cs +++ b/Packages/com.jovian.inspector/Editor/Attributes/DefinedValuesAttribute.cs @@ -2,7 +2,7 @@ using System.Linq; using UnityEngine; -namespace InspectorToolkit +namespace Jovian.InspectorTools { /// /// Create Popup with predefined values for string, int or float property @@ -19,7 +19,7 @@ namespace InspectorToolkit } #if UNITY_EDITOR -namespace InspectorToolkit.Internal +namespace Jovian.InspectorTools.Internal { using UnityEditor; diff --git a/Packages/com.jovian.inspector/Editor/Attributes/DisplayInspectorAttribute.cs b/Packages/com.jovian.inspector/Editor/Attributes/DisplayInspectorAttribute.cs index 389f193..a96d2ab 100644 --- a/Packages/com.jovian.inspector/Editor/Attributes/DisplayInspectorAttribute.cs +++ b/Packages/com.jovian.inspector/Editor/Attributes/DisplayInspectorAttribute.cs @@ -1,7 +1,7 @@ using System.Collections.Generic; using UnityEngine; -namespace InspectorToolkit +namespace Jovian.InspectorTools { /// /// Use to display inspector of property object @@ -18,7 +18,7 @@ namespace InspectorToolkit } #if UNITY_EDITOR -namespace InspectorToolkit.Internal +namespace Jovian.InspectorTools.Internal { using EditorTools; using UnityEditor; diff --git a/Packages/com.jovian.inspector/Editor/Attributes/FoldoutAttribute.cs b/Packages/com.jovian.inspector/Editor/Attributes/FoldoutAttribute.cs index 8eeca80..0926ab2 100644 --- a/Packages/com.jovian.inspector/Editor/Attributes/FoldoutAttribute.cs +++ b/Packages/com.jovian.inspector/Editor/Attributes/FoldoutAttribute.cs @@ -8,7 +8,7 @@ using UnityEngine; -namespace InspectorToolkit +namespace Jovian.InspectorTools { public class FoldoutAttribute : PropertyAttribute { @@ -27,7 +27,7 @@ namespace InspectorToolkit } #if UNITY_EDITOR -namespace InspectorToolkit.Internal +namespace Jovian.InspectorTools.Internal { using System; using System.Collections.Generic; diff --git a/Packages/com.jovian.inspector/Editor/Attributes/InfoAttribute.cs b/Packages/com.jovian.inspector/Editor/Attributes/InfoAttribute.cs index cec600e..4311c14 100644 --- a/Packages/com.jovian.inspector/Editor/Attributes/InfoAttribute.cs +++ b/Packages/com.jovian.inspector/Editor/Attributes/InfoAttribute.cs @@ -1,6 +1,6 @@ using UnityEngine; -namespace InspectorToolkit { +namespace Jovian.InspectorTools { public class InfoAttribute : PropertyAttribute { public enum MessageType { Info, @@ -34,7 +34,7 @@ namespace InspectorToolkit { } #if UNITY_EDITOR -namespace InspectorToolkit.Internal { +namespace Jovian.InspectorTools.Internal { using UnityEditor; [CustomPropertyDrawer(typeof(InfoAttribute))] diff --git a/Packages/com.jovian.inspector/Editor/Attributes/InitializationFieldAttribute.cs b/Packages/com.jovian.inspector/Editor/Attributes/InitializationFieldAttribute.cs index 366eb9d..2cec979 100644 --- a/Packages/com.jovian.inspector/Editor/Attributes/InitializationFieldAttribute.cs +++ b/Packages/com.jovian.inspector/Editor/Attributes/InitializationFieldAttribute.cs @@ -1,6 +1,6 @@ using UnityEngine; -namespace InspectorToolkit +namespace Jovian.InspectorTools { /// /// Field will be Read-Only in Playmode @@ -11,7 +11,7 @@ namespace InspectorToolkit } #if UNITY_EDITOR -namespace InspectorToolkit.Internal +namespace Jovian.InspectorTools.Internal { using UnityEditor; diff --git a/Packages/com.jovian.inspector/Editor/Attributes/InterfaceComponentAttribute.cs b/Packages/com.jovian.inspector/Editor/Attributes/InterfaceComponentAttribute.cs index 0df4f5e..59d7ade 100644 --- a/Packages/com.jovian.inspector/Editor/Attributes/InterfaceComponentAttribute.cs +++ b/Packages/com.jovian.inspector/Editor/Attributes/InterfaceComponentAttribute.cs @@ -1,7 +1,7 @@ using System; using UnityEngine; -namespace InspectorToolkit { +namespace Jovian.InspectorTools { public class InterfaceComponentAttribute : PropertyAttribute { public readonly Type interfaceType; public readonly bool allowMismatch; @@ -14,7 +14,7 @@ namespace InspectorToolkit { } #if UNITY_EDITOR -namespace InspectorToolkit.Internal { +namespace Jovian.InspectorTools.Internal { using UnityEditor; [CustomPropertyDrawer(typeof(InterfaceComponentAttribute))] diff --git a/Packages/com.jovian.inspector/Editor/Attributes/LayerAttribute.cs b/Packages/com.jovian.inspector/Editor/Attributes/LayerAttribute.cs index 67f8a49..f83046b 100644 --- a/Packages/com.jovian.inspector/Editor/Attributes/LayerAttribute.cs +++ b/Packages/com.jovian.inspector/Editor/Attributes/LayerAttribute.cs @@ -1,6 +1,6 @@ using UnityEngine; -namespace InspectorToolkit +namespace Jovian.InspectorTools { public class LayerAttribute : PropertyAttribute { @@ -8,7 +8,7 @@ namespace InspectorToolkit } #if UNITY_EDITOR -namespace InspectorToolkit.Internal +namespace Jovian.InspectorTools.Internal { using UnityEditor; diff --git a/Packages/com.jovian.inspector/Editor/Attributes/LinkAttribute.cs b/Packages/com.jovian.inspector/Editor/Attributes/LinkAttribute.cs index 083bec8..b64b7be 100644 --- a/Packages/com.jovian.inspector/Editor/Attributes/LinkAttribute.cs +++ b/Packages/com.jovian.inspector/Editor/Attributes/LinkAttribute.cs @@ -1,7 +1,7 @@ using UnityEditor; using UnityEngine; -namespace InspectorToolkit { +namespace Jovian.InspectorTools { public class LinkAttribute : PropertyAttribute { public readonly string message; @@ -15,7 +15,7 @@ namespace InspectorToolkit { } #if UNITY_EDITOR -namespace InspectorToolkit.Internal { +namespace Jovian.InspectorTools.Internal { [CustomPropertyDrawer(typeof(LinkAttribute))] public class LinkAttributeDrawer : PropertyDrawer { diff --git a/Packages/com.jovian.inspector/Editor/Attributes/MaxValueAttribute.cs b/Packages/com.jovian.inspector/Editor/Attributes/MaxValueAttribute.cs index 45ab7bf..d652386 100644 --- a/Packages/com.jovian.inspector/Editor/Attributes/MaxValueAttribute.cs +++ b/Packages/com.jovian.inspector/Editor/Attributes/MaxValueAttribute.cs @@ -1,12 +1,12 @@ -using InspectorToolkit.Internal; +using Jovian.InspectorTools.Internal; using UnityEngine; #if UNITY_EDITOR using UnityEditor; -using InspectorToolkit.EditorTools; +using Jovian.InspectorTools.EditorTools; #endif #pragma warning disable 0414 -namespace InspectorToolkit +namespace Jovian.InspectorTools { public class MaxValueAttribute : AttributeBase { diff --git a/Packages/com.jovian.inspector/Editor/Attributes/MinMaxRangeAttribute.cs b/Packages/com.jovian.inspector/Editor/Attributes/MinMaxRangeAttribute.cs index dcf66eb..3dc0d7c 100644 --- a/Packages/com.jovian.inspector/Editor/Attributes/MinMaxRangeAttribute.cs +++ b/Packages/com.jovian.inspector/Editor/Attributes/MinMaxRangeAttribute.cs @@ -6,7 +6,7 @@ using System; using UnityEngine; -namespace InspectorToolkit { +namespace Jovian.InspectorTools { public class MinMaxRangeAttribute : PropertyAttribute { public MinMaxRangeAttribute(float min, float max) { Min = min; @@ -59,7 +59,7 @@ namespace InspectorToolkit { } #if UNITY_EDITOR -namespace InspectorToolkit.Internal { +namespace Jovian.InspectorTools.Internal { using UnityEditor; [CustomPropertyDrawer(typeof(MinMaxRangeAttribute))] diff --git a/Packages/com.jovian.inspector/Editor/Attributes/MinValueAttribute.cs b/Packages/com.jovian.inspector/Editor/Attributes/MinValueAttribute.cs index da61418..7e5618c 100644 --- a/Packages/com.jovian.inspector/Editor/Attributes/MinValueAttribute.cs +++ b/Packages/com.jovian.inspector/Editor/Attributes/MinValueAttribute.cs @@ -1,12 +1,12 @@ -using InspectorToolkit.Internal; +using Jovian.InspectorTools.Internal; using UnityEngine; #if UNITY_EDITOR using UnityEditor; -using InspectorToolkit.EditorTools; +using Jovian.InspectorTools.EditorTools; #endif #pragma warning disable 0414 -namespace InspectorToolkit +namespace Jovian.InspectorTools { public class MinValueAttribute : AttributeBase { diff --git a/Packages/com.jovian.inspector/Editor/Attributes/ObjectsPropertyAttribute.cs b/Packages/com.jovian.inspector/Editor/Attributes/ObjectsPropertyAttribute.cs index 170ee56..d1ffa9f 100644 --- a/Packages/com.jovian.inspector/Editor/Attributes/ObjectsPropertyAttribute.cs +++ b/Packages/com.jovian.inspector/Editor/Attributes/ObjectsPropertyAttribute.cs @@ -5,7 +5,7 @@ using System.Linq; using Jovian.Utilities; using UnityEngine; -namespace InspectorToolkit +namespace Jovian.InspectorTools { /// /// Finds all objects in the project of 'objectType' then creates a dropdown showing all values matching 'memberName' @@ -25,7 +25,7 @@ namespace InspectorToolkit } #if UNITY_EDITOR -namespace InspectorToolkit.Internal +namespace Jovian.InspectorTools.Internal { using UnityEditor; using System.Reflection; diff --git a/Packages/com.jovian.inspector/Editor/Attributes/OnValueChangedAttribute.cs b/Packages/com.jovian.inspector/Editor/Attributes/OnValueChangedAttribute.cs index 65465f2..2063e72 100644 --- a/Packages/com.jovian.inspector/Editor/Attributes/OnValueChangedAttribute.cs +++ b/Packages/com.jovian.inspector/Editor/Attributes/OnValueChangedAttribute.cs @@ -2,7 +2,7 @@ using System.Reflection; using UnityEditor; using UnityEngine; -namespace InspectorToolkit { +namespace Jovian.InspectorTools { public class OnValueChangedAttribute : PropertyAttribute { public readonly string methodName; public OnValueChangedAttribute(string methodName) { @@ -12,7 +12,7 @@ namespace InspectorToolkit { } #if UNITY_EDITOR -namespace InspectorToolkit.Internal { +namespace Jovian.InspectorTools.Internal { [CustomPropertyDrawer(typeof(OnValueChangedAttribute))] public class OnValueChangedAttributeDrawer : PropertyDrawer { diff --git a/Packages/com.jovian.inspector/Editor/Attributes/OptionalAttribute.cs b/Packages/com.jovian.inspector/Editor/Attributes/OptionalAttribute.cs index c0e3d60..8db347b 100644 --- a/Packages/com.jovian.inspector/Editor/Attributes/OptionalAttribute.cs +++ b/Packages/com.jovian.inspector/Editor/Attributes/OptionalAttribute.cs @@ -1,12 +1,12 @@ using UnityEditor; using UnityEngine; -namespace InspectorToolkit { +namespace Jovian.InspectorTools { public class OptionalAttribute : PropertyAttribute { } } #if UNITY_EDITOR -namespace InspectorToolkit.Internal { +namespace Jovian.InspectorTools.Internal { [CustomPropertyDrawer(typeof(OptionalAttribute))] public class OptionalAttributePropertyDrawer : PropertyDrawer { diff --git a/Packages/com.jovian.inspector/Editor/Attributes/OverrideLabelAttribute.cs b/Packages/com.jovian.inspector/Editor/Attributes/OverrideLabelAttribute.cs index 7383a9b..c585b03 100644 --- a/Packages/com.jovian.inspector/Editor/Attributes/OverrideLabelAttribute.cs +++ b/Packages/com.jovian.inspector/Editor/Attributes/OverrideLabelAttribute.cs @@ -1,6 +1,6 @@ using UnityEngine; -namespace InspectorToolkit +namespace Jovian.InspectorTools { public class OverrideLabelAttribute : PropertyAttribute { @@ -11,7 +11,7 @@ namespace InspectorToolkit } #if UNITY_EDITOR -namespace InspectorToolkit.Internal +namespace Jovian.InspectorTools.Internal { using UnityEditor; diff --git a/Packages/com.jovian.inspector/Editor/Attributes/PositiveValueOnlyAttribute.cs b/Packages/com.jovian.inspector/Editor/Attributes/PositiveValueOnlyAttribute.cs index d37bd6d..56f7755 100644 --- a/Packages/com.jovian.inspector/Editor/Attributes/PositiveValueOnlyAttribute.cs +++ b/Packages/com.jovian.inspector/Editor/Attributes/PositiveValueOnlyAttribute.cs @@ -7,7 +7,7 @@ using UnityEngine; -namespace InspectorToolkit +namespace Jovian.InspectorTools { public class PositiveValueOnlyAttribute : PropertyAttribute { @@ -15,7 +15,7 @@ namespace InspectorToolkit } #if UNITY_EDITOR -namespace InspectorToolkit.Internal +namespace Jovian.InspectorTools.Internal { using UnityEditor; using EditorTools; diff --git a/Packages/com.jovian.inspector/Editor/Attributes/ReadOnlyAttribute.cs b/Packages/com.jovian.inspector/Editor/Attributes/ReadOnlyAttribute.cs index 33adf86..902df1b 100644 --- a/Packages/com.jovian.inspector/Editor/Attributes/ReadOnlyAttribute.cs +++ b/Packages/com.jovian.inspector/Editor/Attributes/ReadOnlyAttribute.cs @@ -1,6 +1,6 @@ using UnityEngine; -namespace InspectorToolkit +namespace Jovian.InspectorTools { public class ReadOnlyAttribute : ConditionalFieldAttribute { @@ -15,7 +15,7 @@ namespace InspectorToolkit } #if UNITY_EDITOR -namespace InspectorToolkit.Internal +namespace Jovian.InspectorTools.Internal { using UnityEditor; @@ -45,4 +45,4 @@ namespace InspectorToolkit.Internal } } } -#endif \ No newline at end of file +#endif diff --git a/Packages/com.jovian.inspector/Editor/Attributes/RegexStringAttribute.cs b/Packages/com.jovian.inspector/Editor/Attributes/RegexStringAttribute.cs index bf58fa9..0cc7afe 100644 --- a/Packages/com.jovian.inspector/Editor/Attributes/RegexStringAttribute.cs +++ b/Packages/com.jovian.inspector/Editor/Attributes/RegexStringAttribute.cs @@ -1,7 +1,7 @@ using System.Text.RegularExpressions; using UnityEngine; -namespace InspectorToolkit +namespace Jovian.InspectorTools { /// /// Validate a string field by regex expression @@ -42,7 +42,7 @@ namespace InspectorToolkit } #if UNITY_EDITOR -namespace InspectorToolkit.Internal +namespace Jovian.InspectorTools.Internal { using UnityEditor; using EditorTools; diff --git a/Packages/com.jovian.inspector/Editor/Attributes/RequireArraySizeAttribute.cs b/Packages/com.jovian.inspector/Editor/Attributes/RequireArraySizeAttribute.cs index d2364e1..b1c702f 100644 --- a/Packages/com.jovian.inspector/Editor/Attributes/RequireArraySizeAttribute.cs +++ b/Packages/com.jovian.inspector/Editor/Attributes/RequireArraySizeAttribute.cs @@ -1,12 +1,12 @@ using System; -using InspectorToolkit.Internal; +using Jovian.InspectorTools.Internal; using Jovian.Utilities.Editor; using UnityEngine; #if UNITY_EDITOR using UnityEditor; #endif -namespace InspectorToolkit { +namespace Jovian.InspectorTools { public class RequireArraySizeAttribute : ArrayAttribute, IPropertyCondition { public readonly int size; diff --git a/Packages/com.jovian.inspector/Editor/Attributes/RequireLayerAttribute.cs b/Packages/com.jovian.inspector/Editor/Attributes/RequireLayerAttribute.cs index 1124921..dc5f0fd 100644 --- a/Packages/com.jovian.inspector/Editor/Attributes/RequireLayerAttribute.cs +++ b/Packages/com.jovian.inspector/Editor/Attributes/RequireLayerAttribute.cs @@ -1,6 +1,6 @@ using System; -namespace InspectorToolkit +namespace Jovian.InspectorTools { [AttributeUsage(AttributeTargets.Class)] public class RequireLayerAttribute : Attribute diff --git a/Packages/com.jovian.inspector/Editor/Attributes/RequireLayerOrTagAttributeHandler.cs b/Packages/com.jovian.inspector/Editor/Attributes/RequireLayerOrTagAttributeHandler.cs index bd52f27..51f4c10 100644 --- a/Packages/com.jovian.inspector/Editor/Attributes/RequireLayerOrTagAttributeHandler.cs +++ b/Packages/com.jovian.inspector/Editor/Attributes/RequireLayerOrTagAttributeHandler.cs @@ -1,5 +1,5 @@ #if UNITY_EDITOR -namespace InspectorToolkit.Internal +namespace Jovian.InspectorTools.Internal { using UnityEditor; using UnityEngine; diff --git a/Packages/com.jovian.inspector/Editor/Attributes/RequireMethodAttribute.cs b/Packages/com.jovian.inspector/Editor/Attributes/RequireMethodAttribute.cs index 3b31ae3..52ff91e 100644 --- a/Packages/com.jovian.inspector/Editor/Attributes/RequireMethodAttribute.cs +++ b/Packages/com.jovian.inspector/Editor/Attributes/RequireMethodAttribute.cs @@ -3,10 +3,10 @@ using UnityEngine; #if UNITY_EDITOR using System.Reflection; using UnityEditor; -using InspectorToolkit.EditorTools; +using Jovian.InspectorTools.EditorTools; #endif -namespace InspectorToolkit { +namespace Jovian.InspectorTools { /// /// Does not work on objects with children - will break their UI /// @@ -55,7 +55,7 @@ namespace InspectorToolkit { } #if UNITY_EDITOR -namespace InspectorToolkit.Internal { +namespace Jovian.InspectorTools.Internal { [CustomPropertyDrawer(typeof(RequireMethodAttribute))] public class RequireMethodAttributePropertyDrawer : PropertyDrawer { diff --git a/Packages/com.jovian.inspector/Editor/Attributes/RequireTagAttribute.cs b/Packages/com.jovian.inspector/Editor/Attributes/RequireTagAttribute.cs index b50d775..4bc7478 100644 --- a/Packages/com.jovian.inspector/Editor/Attributes/RequireTagAttribute.cs +++ b/Packages/com.jovian.inspector/Editor/Attributes/RequireTagAttribute.cs @@ -1,6 +1,6 @@ using System; -namespace InspectorToolkit +namespace Jovian.InspectorTools { [AttributeUsage(AttributeTargets.Class)] public class RequireTagAttribute : Attribute diff --git a/Packages/com.jovian.inspector/Editor/Attributes/RequiredAttribute.cs b/Packages/com.jovian.inspector/Editor/Attributes/RequiredAttribute.cs index 702d78c..368eb46 100644 --- a/Packages/com.jovian.inspector/Editor/Attributes/RequiredAttribute.cs +++ b/Packages/com.jovian.inspector/Editor/Attributes/RequiredAttribute.cs @@ -7,7 +7,7 @@ using UnityEditor; using UnityEditor.SceneManagement; #endif -namespace InspectorToolkit { +namespace Jovian.InspectorTools { public class RequiredAttribute : PropertyAttribute, IPropertyCondition { public enum Scope { @@ -239,7 +239,7 @@ namespace InspectorToolkit { } #if UNITY_EDITOR -namespace InspectorToolkit.Internal { +namespace Jovian.InspectorTools.Internal { [CustomPropertyDrawer(typeof(RequiredAttribute))] public class RequiredAttributePropertyDrawer : PropertyDrawer { diff --git a/Packages/com.jovian.inspector/Editor/Attributes/SceneAttribute.cs b/Packages/com.jovian.inspector/Editor/Attributes/SceneAttribute.cs index d15b546..ae693b1 100644 --- a/Packages/com.jovian.inspector/Editor/Attributes/SceneAttribute.cs +++ b/Packages/com.jovian.inspector/Editor/Attributes/SceneAttribute.cs @@ -7,7 +7,7 @@ using System; using System.Linq; using UnityEngine; -namespace InspectorToolkit +namespace Jovian.InspectorTools { /// /// Used to pick scene from inspector. @@ -20,7 +20,7 @@ namespace InspectorToolkit } #if UNITY_EDITOR -namespace InspectorToolkit.Internal +namespace Jovian.InspectorTools.Internal { using UnityEditor; diff --git a/Packages/com.jovian.inspector/Editor/Attributes/SearchableEnumAttribute.cs b/Packages/com.jovian.inspector/Editor/Attributes/SearchableEnumAttribute.cs index 86db54d..f1528c5 100644 --- a/Packages/com.jovian.inspector/Editor/Attributes/SearchableEnumAttribute.cs +++ b/Packages/com.jovian.inspector/Editor/Attributes/SearchableEnumAttribute.cs @@ -12,7 +12,7 @@ using UnityEngine; using UnityEditor; #endif -namespace InspectorToolkit +namespace Jovian.InspectorTools { /// /// Put this attribute on a public (or SerializeField) enum in a @@ -26,7 +26,7 @@ namespace InspectorToolkit } #if UNITY_EDITOR -namespace InspectorToolkit.Internal +namespace Jovian.InspectorTools.Internal { /// /// Draws the custom enum selector popup for enum fields using the diff --git a/Packages/com.jovian.inspector/Editor/Attributes/SeparatorAttribute.cs b/Packages/com.jovian.inspector/Editor/Attributes/SeparatorAttribute.cs index 31d2ec1..104d356 100644 --- a/Packages/com.jovian.inspector/Editor/Attributes/SeparatorAttribute.cs +++ b/Packages/com.jovian.inspector/Editor/Attributes/SeparatorAttribute.cs @@ -1,6 +1,6 @@ using UnityEngine; -namespace InspectorToolkit +namespace Jovian.InspectorTools { public class SeparatorAttribute : PropertyAttribute { @@ -22,7 +22,7 @@ namespace InspectorToolkit } #if UNITY_EDITOR -namespace InspectorToolkit.Internal +namespace Jovian.InspectorTools.Internal { using UnityEditor; diff --git a/Packages/com.jovian.inspector/Editor/Attributes/ShowInInspectorAttribute.cs b/Packages/com.jovian.inspector/Editor/Attributes/ShowInInspectorAttribute.cs index 3fc25a2..4a944cd 100644 --- a/Packages/com.jovian.inspector/Editor/Attributes/ShowInInspectorAttribute.cs +++ b/Packages/com.jovian.inspector/Editor/Attributes/ShowInInspectorAttribute.cs @@ -10,7 +10,7 @@ using Jovian.Utilities; using UnityObject = UnityEngine.Object; #endif -namespace InspectorToolkit { +namespace Jovian.InspectorTools { [AttributeUsage(AttributeTargets.Field | AttributeTargets.Property)] public class ShowInInspectorAttribute : PropertyAttribute { public readonly PlayModeVisibility Visibility; @@ -29,7 +29,7 @@ namespace InspectorToolkit { } #if UNITY_EDITOR -namespace InspectorToolkit.Internal { +namespace Jovian.InspectorTools.Internal { public class ShowInInspectorAttributeHandler { private const int MAX_DEPTH = 10; diff --git a/Packages/com.jovian.inspector/Editor/Attributes/SpriteLayerAttribute.cs b/Packages/com.jovian.inspector/Editor/Attributes/SpriteLayerAttribute.cs index 663cebd..fa7096c 100644 --- a/Packages/com.jovian.inspector/Editor/Attributes/SpriteLayerAttribute.cs +++ b/Packages/com.jovian.inspector/Editor/Attributes/SpriteLayerAttribute.cs @@ -10,7 +10,7 @@ using UnityEngine; using UnityEditor; #endif -namespace InspectorToolkit +namespace Jovian.InspectorTools { public class SpriteLayerAttribute : PropertyAttribute { @@ -18,7 +18,7 @@ namespace InspectorToolkit } #if UNITY_EDITOR -namespace InspectorToolkit.Internal +namespace Jovian.InspectorTools.Internal { [CustomPropertyDrawer(typeof(SpriteLayerAttribute))] public class SpriteLayerAttributeDrawer : PropertyDrawer diff --git a/Packages/com.jovian.inspector/Editor/Attributes/SuffixAttribute.cs b/Packages/com.jovian.inspector/Editor/Attributes/SuffixAttribute.cs index 2adf159..08f109c 100644 --- a/Packages/com.jovian.inspector/Editor/Attributes/SuffixAttribute.cs +++ b/Packages/com.jovian.inspector/Editor/Attributes/SuffixAttribute.cs @@ -1,6 +1,6 @@ using UnityEngine; -namespace InspectorToolkit { +namespace Jovian.InspectorTools { public class SuffixAttribute : PropertyAttribute { public readonly string suffix; @@ -9,7 +9,7 @@ namespace InspectorToolkit { } #if UNITY_EDITOR -namespace InspectorToolkit.Internal { +namespace Jovian.InspectorTools.Internal { using UnityEditor; [CustomPropertyDrawer(typeof(SuffixAttribute))] diff --git a/Packages/com.jovian.inspector/Editor/Attributes/TagAttribute.cs b/Packages/com.jovian.inspector/Editor/Attributes/TagAttribute.cs index bb9dffa..efa4465 100644 --- a/Packages/com.jovian.inspector/Editor/Attributes/TagAttribute.cs +++ b/Packages/com.jovian.inspector/Editor/Attributes/TagAttribute.cs @@ -10,7 +10,7 @@ using UnityEngine; using UnityEditor; #endif -namespace InspectorToolkit +namespace Jovian.InspectorTools { public class TagAttribute : PropertyAttribute { @@ -18,7 +18,7 @@ namespace InspectorToolkit } #if UNITY_EDITOR -namespace InspectorToolkit.Internal +namespace Jovian.InspectorTools.Internal { [CustomPropertyDrawer(typeof(TagAttribute))] public class TagAttributeDrawer : PropertyDrawer diff --git a/Packages/com.jovian.inspector/Editor/Attributes/UniformVector3Attribute.cs b/Packages/com.jovian.inspector/Editor/Attributes/UniformVector3Attribute.cs index 47d7e67..4742f90 100644 --- a/Packages/com.jovian.inspector/Editor/Attributes/UniformVector3Attribute.cs +++ b/Packages/com.jovian.inspector/Editor/Attributes/UniformVector3Attribute.cs @@ -3,7 +3,7 @@ using UnityEngine; using UnityEditor; #endif -namespace InspectorToolkit { +namespace Jovian.InspectorTools { public class UniformVector3Attribute : PropertyAttribute { public UniformVector3Attribute() { } @@ -11,7 +11,7 @@ namespace InspectorToolkit { } #if UNITY_EDITOR -namespace InspectorToolkit.Internal { +namespace Jovian.InspectorTools.Internal { [CustomPropertyDrawer(typeof(UniformVector3Attribute))] public class UniformVector3AttributeDrawer : PropertyDrawer { diff --git a/Packages/com.jovian.inspector/Editor/Extensions/EditorExtensions/MyGUI.cs b/Packages/com.jovian.inspector/Editor/Extensions/EditorExtensions/MyGUI.cs index 2143aaf..58b8721 100644 --- a/Packages/com.jovian.inspector/Editor/Extensions/EditorExtensions/MyGUI.cs +++ b/Packages/com.jovian.inspector/Editor/Extensions/EditorExtensions/MyGUI.cs @@ -7,7 +7,7 @@ using UnityEditor; using UnityEngine; using Object = UnityEngine.Object; -namespace InspectorToolkit.EditorTools { +namespace Jovian.InspectorTools.EditorTools { public static class MyGUI { #region Colors diff --git a/Packages/com.jovian.inspector/Editor/Extensions/EditorExtensions/MySerializedProperty.cs b/Packages/com.jovian.inspector/Editor/Extensions/EditorExtensions/MySerializedProperty.cs index a64cdfc..d238692 100644 --- a/Packages/com.jovian.inspector/Editor/Extensions/EditorExtensions/MySerializedProperty.cs +++ b/Packages/com.jovian.inspector/Editor/Extensions/EditorExtensions/MySerializedProperty.cs @@ -7,7 +7,7 @@ using System.Reflection; using UnityEditor; using Object = UnityEngine.Object; -namespace InspectorToolkit.EditorTools { +namespace Jovian.InspectorTools.EditorTools { public static class MySerializedProperty { #region Collections Handling diff --git a/Packages/com.jovian.inspector/Editor/Extensions/MyCollections.cs b/Packages/com.jovian.inspector/Editor/Extensions/MyCollections.cs index de4209c..47cc177 100644 --- a/Packages/com.jovian.inspector/Editor/Extensions/MyCollections.cs +++ b/Packages/com.jovian.inspector/Editor/Extensions/MyCollections.cs @@ -3,7 +3,7 @@ using System.Collections.Generic; using System.Linq; using UnityEngine; -namespace InspectorToolkit { +namespace Jovian.InspectorTools { public static class MyCollections { /// /// Returns new array with inserted empty element at index diff --git a/Packages/com.jovian.inspector/Editor/Extensions/MyRegex.cs b/Packages/com.jovian.inspector/Editor/Extensions/MyRegex.cs index 84a340f..71cb0f2 100644 --- a/Packages/com.jovian.inspector/Editor/Extensions/MyRegex.cs +++ b/Packages/com.jovian.inspector/Editor/Extensions/MyRegex.cs @@ -1,7 +1,7 @@ using System.Linq; using System.Text.RegularExpressions; -namespace InspectorToolkit +namespace Jovian.InspectorTools { public static class MyRegex { diff --git a/Packages/com.jovian.inspector/Editor/Tools/AutoFindUtil.cs b/Packages/com.jovian.inspector/Editor/Tools/AutoFindUtil.cs index ad5481a..cd5fe6c 100644 --- a/Packages/com.jovian.inspector/Editor/Tools/AutoFindUtil.cs +++ b/Packages/com.jovian.inspector/Editor/Tools/AutoFindUtil.cs @@ -8,7 +8,7 @@ using UnityEditor; using UnityEngine; using Object = UnityEngine.Object; -namespace InspectorToolkit { +namespace Jovian.InspectorTools { public static class AutoFindUtil { public static void Search(AutoFindAttribute autoFindAttribute, SerializedProperty property, bool autoAddIfMissing = false) { Type propertyType = EditorSerializationUtility.GetTypeFromProperty(property); diff --git a/Packages/com.jovian.inspector/Editor/Tools/IActionableAttribute.cs b/Packages/com.jovian.inspector/Editor/Tools/IActionableAttribute.cs index 4044f0b..e95cfe1 100644 --- a/Packages/com.jovian.inspector/Editor/Tools/IActionableAttribute.cs +++ b/Packages/com.jovian.inspector/Editor/Tools/IActionableAttribute.cs @@ -2,7 +2,7 @@ using UnityEditor; #endif -namespace InspectorToolkit { +namespace Jovian.InspectorTools { public interface IActionableAttribute { #if UNITY_EDITOR void Trigger(SerializedProperty serializedProperty); diff --git a/Packages/com.jovian.inspector/Editor/Tools/IPropertyCondition.cs b/Packages/com.jovian.inspector/Editor/Tools/IPropertyCondition.cs index 4273c24..c401ea2 100644 --- a/Packages/com.jovian.inspector/Editor/Tools/IPropertyCondition.cs +++ b/Packages/com.jovian.inspector/Editor/Tools/IPropertyCondition.cs @@ -2,7 +2,7 @@ using UnityEditor; #endif -namespace InspectorToolkit { +namespace Jovian.InspectorTools { public interface IPropertyCondition { #if UNITY_EDITOR bool DoesPropertyMeetCondition(SerializedProperty property, out string description); diff --git a/Packages/com.jovian.inspector/Editor/Tools/Internal/PlayModeVisibility.cs b/Packages/com.jovian.inspector/Editor/Tools/Internal/PlayModeVisibility.cs index 6f763f9..e15a097 100644 --- a/Packages/com.jovian.inspector/Editor/Tools/Internal/PlayModeVisibility.cs +++ b/Packages/com.jovian.inspector/Editor/Tools/Internal/PlayModeVisibility.cs @@ -2,7 +2,7 @@ using System.Collections; using System.Collections.Generic; using UnityEngine; -namespace InspectorToolkit { +namespace Jovian.InspectorTools { public enum PlayModeVisibility { Always, EditMode, diff --git a/Packages/com.jovian.inspector/Editor/Tools/Internal/UnityObjectEditor.cs b/Packages/com.jovian.inspector/Editor/Tools/Internal/UnityObjectEditor.cs index d772e70..8f6ca63 100644 --- a/Packages/com.jovian.inspector/Editor/Tools/Internal/UnityObjectEditor.cs +++ b/Packages/com.jovian.inspector/Editor/Tools/Internal/UnityObjectEditor.cs @@ -2,7 +2,7 @@ using UnityEngine; #if UNITY_EDITOR -namespace InspectorToolkit.Internal { +namespace Jovian.InspectorTools.Internal { public interface IGUILayoutPropertyField { void GUILayoutPropertyField(SerializedProperty serializedProperty, params GUILayoutOption[] options); diff --git a/Packages/com.jovian.inspector/Editor/Tools/RequiredUtil.cs b/Packages/com.jovian.inspector/Editor/Tools/RequiredUtil.cs index 40b708d..af9bcd4 100644 --- a/Packages/com.jovian.inspector/Editor/Tools/RequiredUtil.cs +++ b/Packages/com.jovian.inspector/Editor/Tools/RequiredUtil.cs @@ -3,7 +3,7 @@ using UnityEngine; #if UNITY_EDITOR using UnityEditor; -namespace InspectorToolkit.Internal { +namespace Jovian.InspectorTools.Internal { public static class RequiredUtil { private const float ICON_X_OFFSET = 15f;