forked from RE-SS3D/SS3D
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Include Minds to Entity workflow (RE-SS3D#974)
* Rename PlayerControllable to Entity * Continue Mind inclusion to player workflow * Reorganize a bit how the stamina system is laid out * Add sync var callback for stamina * Remove FindObjectOfType * Rename PlayerControlSystem to PlayerSystem and fix bugs * Rename UI * Fix missing custom editor * Change variable naming * Code cleanup * Fix errors when late joining as a client after the round started * Remove debug.logs * Fix NullRef Exceptions * Add documentation and reorganize methods * Change how the inventory UI is loaded Co-authored-by: TaylorNAlbarnaz <[email protected]>
- Loading branch information
1 parent
2abc5c1
commit 38bc89e
Showing
100 changed files
with
2,466 additions
and
1,382 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,16 @@ | ||
| <linker> | ||
| <assembly fullname="Unity.Addressables, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null" preserve="all"> | ||
| <type fullname="UnityEngine.AddressableAssets.Addressables" preserve="all" /> | ||
| </assembly> | ||
| <assembly fullname="Unity.ResourceManager, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null" preserve="all"> | ||
| <type fullname="UnityEngine.ResourceManagement.ResourceProviders.AssetBundleProvider" preserve="all" /> | ||
| <type fullname="UnityEngine.ResourceManagement.ResourceProviders.BundledAssetProvider" preserve="all" /> | ||
| <type fullname="UnityEngine.ResourceManagement.ResourceProviders.InstanceProvider" preserve="all" /> | ||
| <type fullname="UnityEngine.ResourceManagement.ResourceProviders.LegacyResourcesProvider" preserve="all" /> | ||
| <type fullname="UnityEngine.ResourceManagement.ResourceProviders.SceneProvider" preserve="all" /> | ||
| </assembly> | ||
| <assembly fullname="UnityEngine.CoreModule, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null"> | ||
| <type fullname="UnityEngine.Sprite" preserve="all" /> | ||
| <type fullname="UnityEngine.Texture2D" preserve="all" /> | ||
| </assembly> | ||
| </linker> |
5 changes: 2 additions & 3 deletions
5
...tems/Generic/ToolBoxes/Toolbox.asset.meta → Assets/AddressableAssetsData/link.xml.meta
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,138 @@ | ||
| %YAML 1.1 | ||
| %TAG !u! tag:unity3d.com,2011: | ||
| --- !u!1 &8103066686919155798 | ||
| GameObject: | ||
| m_ObjectHideFlags: 0 | ||
| m_CorrespondingSourceObject: {fileID: 0} | ||
| m_PrefabInstance: {fileID: 0} | ||
| m_PrefabAsset: {fileID: 0} | ||
| serializedVersion: 6 | ||
| m_Component: | ||
| - component: {fileID: 4873977336851923621} | ||
| - component: {fileID: 562230263738288595} | ||
| - component: {fileID: 3486636391395698902} | ||
| - component: {fileID: 3363661164123955675} | ||
| - component: {fileID: 1256239026443271520} | ||
| m_Layer: 0 | ||
| m_Name: Mind | ||
| m_TagString: Untagged | ||
| m_Icon: {fileID: 0} | ||
| m_NavMeshLayer: 0 | ||
| m_StaticEditorFlags: 0 | ||
| m_IsActive: 1 | ||
| --- !u!4 &4873977336851923621 | ||
| Transform: | ||
| m_ObjectHideFlags: 0 | ||
| m_CorrespondingSourceObject: {fileID: 0} | ||
| m_PrefabInstance: {fileID: 0} | ||
| m_PrefabAsset: {fileID: 0} | ||
| m_GameObject: {fileID: 8103066686919155798} | ||
| m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} | ||
| m_LocalPosition: {x: 0, y: 0, z: 0} | ||
| m_LocalScale: {x: 1, y: 1, z: 1} | ||
| m_ConstrainProportionsScale: 0 | ||
| m_Children: [] | ||
| m_Father: {fileID: 0} | ||
| m_RootOrder: 0 | ||
| m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} | ||
| --- !u!114 &562230263738288595 | ||
| MonoBehaviour: | ||
| m_ObjectHideFlags: 0 | ||
| m_CorrespondingSourceObject: {fileID: 0} | ||
| m_PrefabInstance: {fileID: 0} | ||
| m_PrefabAsset: {fileID: 0} | ||
| m_GameObject: {fileID: 8103066686919155798} | ||
| m_Enabled: 1 | ||
| m_EditorHideFlags: 0 | ||
| m_Script: {fileID: 11500000, guid: 26b716c41e9b56b4baafaf13a523ba2e, type: 3} | ||
| m_Name: | ||
| m_EditorClassIdentifier: | ||
| <IsNested>k__BackingField: 0 | ||
| <ComponentIndex>k__BackingField: 0 | ||
| _networkBehaviours: | ||
| - {fileID: 0} | ||
| - {fileID: 3486636391395698902} | ||
| <ParentNetworkObject>k__BackingField: {fileID: 0} | ||
| <ChildNetworkObjects>k__BackingField: [] | ||
| _isNetworked: 1 | ||
| _isGlobal: 0 | ||
| _defaultDespawnType: 0 | ||
| NetworkObserver: {fileID: 0} | ||
| <PrefabId>k__BackingField: -1 | ||
| _scenePathHash: 0 | ||
| <SceneId>k__BackingField: 0 | ||
| <AssetPathHash>k__BackingField: 17065920712306154591 | ||
| _sceneNetworkObjects: [] | ||
| --- !u!114 &3486636391395698902 | ||
| MonoBehaviour: | ||
| m_ObjectHideFlags: 0 | ||
| m_CorrespondingSourceObject: {fileID: 0} | ||
| m_PrefabInstance: {fileID: 0} | ||
| m_PrefabAsset: {fileID: 0} | ||
| m_GameObject: {fileID: 8103066686919155798} | ||
| m_Enabled: 1 | ||
| m_EditorHideFlags: 0 | ||
| m_Script: {fileID: 11500000, guid: a2836e36774ca1c4bbbee976e17b649c, type: 3} | ||
| m_Name: | ||
| m_EditorClassIdentifier: | ||
| _componentIndexCache: 1 | ||
| _addedNetworkObject: {fileID: 562230263738288595} | ||
| _networkObjectCache: {fileID: 562230263738288595} | ||
| _synchronizeParent: 0 | ||
| _packing: | ||
| Position: 1 | ||
| Rotation: 1 | ||
| Scale: 0 | ||
| _interpolation: 2 | ||
| _extrapolation: 2 | ||
| _enableTeleport: 0 | ||
| _teleportThreshold: 1 | ||
| _clientAuthoritative: 1 | ||
| _sendToOwner: 1 | ||
| _interval: 1 | ||
| _synchronizePosition: 1 | ||
| _positionSnapping: | ||
| X: 0 | ||
| Y: 0 | ||
| Z: 0 | ||
| _synchronizeRotation: 1 | ||
| _rotationSnapping: | ||
| X: 0 | ||
| Y: 0 | ||
| Z: 0 | ||
| _synchronizeScale: 1 | ||
| _scaleSnapping: | ||
| X: 0 | ||
| Y: 0 | ||
| Z: 0 | ||
| --- !u!114 &3363661164123955675 | ||
| MonoBehaviour: | ||
| m_ObjectHideFlags: 0 | ||
| m_CorrespondingSourceObject: {fileID: 0} | ||
| m_PrefabInstance: {fileID: 0} | ||
| m_PrefabAsset: {fileID: 0} | ||
| m_GameObject: {fileID: 8103066686919155798} | ||
| m_Enabled: 1 | ||
| m_EditorHideFlags: 0 | ||
| m_Script: {fileID: 11500000, guid: 7d331f979d46e8e4a9fc90070c596d44, type: 3} | ||
| m_Name: | ||
| m_EditorClassIdentifier: | ||
| _updateHostVisibility: 1 | ||
| _defaultConditions: | ||
| - {fileID: 11400000, guid: 2033f54fd2794464bae08fa5a55c8996, type: 2} | ||
| --- !u!114 &1256239026443271520 | ||
| MonoBehaviour: | ||
| m_ObjectHideFlags: 0 | ||
| m_CorrespondingSourceObject: {fileID: 0} | ||
| m_PrefabInstance: {fileID: 0} | ||
| m_PrefabAsset: {fileID: 0} | ||
| m_GameObject: {fileID: 8103066686919155798} | ||
| m_Enabled: 1 | ||
| m_EditorHideFlags: 0 | ||
| m_Script: {fileID: 11500000, guid: 29d089bc254643d3bbb0c93cdd6c0b82, type: 3} | ||
| m_Name: | ||
| m_EditorClassIdentifier: | ||
| _componentIndexCache: 255 | ||
| _addedNetworkObject: {fileID: 562230263738288595} | ||
| _networkObjectCache: {fileID: 0} | ||
| Soul: {fileID: 0} |
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
File renamed without changes.
Oops, something went wrong.