Skip to content

Commit

Permalink
Forgot to add this important change to the ESC inspector
Browse files Browse the repository at this point in the history
  • Loading branch information
Nebby1999 committed Dec 8, 2021
1 parent 13a9c2c commit 062569b
Show file tree
Hide file tree
Showing 9 changed files with 283 additions and 8 deletions.
2 changes: 1 addition & 1 deletion RoR2EditorKit/Assets/RoR2EditorKit.asset
Original file line number Diff line number Diff line change
Expand Up @@ -79,5 +79,5 @@ MonoBehaviour:
Name: RoR2EditorKit
Description: RoR2EditorKit is a toolkit built around developing mods for Risk of
Rain 2
Version: 0.2.1
Version: 0.2.2
Dependencies: []
Original file line number Diff line number Diff line change
Expand Up @@ -208,7 +208,8 @@ private void PopulateSerializableFields()
{
bool canSerialize = SerializedValue.CanSerializeField(fieldInfo);
bool shouldSerialize = !fieldInfo.IsStatic || (fieldInfo.DeclaringType == entityStateType);
return canSerialize && shouldSerialize;
bool doesNotHaveAttribute = fieldInfo.GetCustomAttribute<HideInInspector>() == null;
return canSerialize && shouldSerialize && doesNotHaveAttribute;
});

serializableStaticFields.AddRange(filteredFields.Where(fieldInfo => fieldInfo.IsStatic));
Expand Down
4 changes: 4 additions & 0 deletions RoR2EditorKit/Assets/RoR2EditorKit/OldChangelogs.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
### 0.1.2

* Fixed no assembly definition being packaged with the toolkit, whoops.

### 0.1.1

- RoR2EditorKitSettings:
Expand Down
11 changes: 6 additions & 5 deletions RoR2EditorKit/Assets/RoR2EditorKit/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ RoR2EditorKit comes with special editor windows designed specifically for creati

## Other:

* UnlockableDef script: Fixes a bug in the base game where unlockableDefs can't be created in the createAsset menu.
* ScriptableCreators: A lot of MenuItems to create a myriad of scriptable objects, including the UnlockableDef and a miryad of hidden SkillDefs.

## Credits

Expand All @@ -50,6 +50,11 @@ RoR2EditorKit comes with special editor windows designed specifically for creati
## Changelog

(Old Changelogs can be found [here](https://github.com/Nebby1999/RoR2EditorKit/blob/main/RoR2EditorKit/Assets/RoR2EditorKit/OldChangelogs.md))

### 0.2.3

* Added the ability for the EntityStateConfiguration inspector to ignore fields with HideInInspector attribute.

### 0.2.2

* Added 2 new Extended Inspector inheriting classes
Expand Down Expand Up @@ -81,7 +86,3 @@ RoR2EditorKit comes with special editor windows designed specifically for creati

* Separated the Enabled and Disabled inspector settings to its own setting file. allowing projects to git ignore it.
* The Toggle for enabling and disabling the inspector is now on its header GUI for a more pleasant experience.

### 0.1.2

* Fixed no assembly definition being packaged with the toolkit, whoops.
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!114 &11400000
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 2f9af1c6015733a42be940cc462aa7ed, type: 3}
m_Name: Log 10
m_EditorClassIdentifier:
pipeline: {fileID: 11400000, guid: 95c42be21b50898489b6e40d35ab0046, type: 2}
creationDate:
ticks: 637745734401674353
entries: []

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!114 &11400000
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 2f9af1c6015733a42be940cc462aa7ed, type: 3}
m_Name: Log 11
m_EditorClassIdentifier:
pipeline: {fileID: 11400000, guid: 95c42be21b50898489b6e40d35ab0046, type: 2}
creationDate:
ticks: 637745734797578735
entries: []

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

219 changes: 218 additions & 1 deletion RoR2EditorKit/Assets/ThunderKitSettings/Logs/PublishToZip/Log 9.asset

Large diffs are not rendered by default.

0 comments on commit 062569b

Please sign in to comment.