-
-
Notifications
You must be signed in to change notification settings - Fork 136
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
* Little cleanup * Split Place() into two with input acitons * Place action is performed on release * Rewrite tile construction menu script * Implement dragging * Implement correct placing * Implement deleting * Fix stuff, implement square form * Rearrange stuff * Fix everything, rearrenge methods into regions, rename GhostManager to BuildGhost * Add comments, resize menu * Add comment * Move methods into helpers * Reimplement restrained rotations * Remove redundant dependencies * make it work * activate ghosts * add material database * renaming * set rotation correctly * add last registered direction * fix merge errors * fix broken body parts * big refactor * another bunch of refactoring * some encapsulation * more splitting * some doc and renaming * some more refactoring * doc and clean up * doc * clean up, doc and renaming * set up missing value * fix hand bugging due to bad merge * refresh hologram after adding them * move handle load and handle save to tilemapmenusaveandloadtabs * Rename stuff, beutify code, move handlers * Move input logic --------- Co-authored-by: Mechar418 <[email protected]>
- Loading branch information
1 parent
ad4e1ea
commit 63eeeab
Showing
39 changed files
with
1,248 additions
and
892 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
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,37 @@ | ||
| %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: bbb281ee3bf0b054c82ac2347e9e782c, type: 3} | ||
| m_Name: Materials | ||
| m_EditorClassIdentifier: | ||
| m_GroupName: Materials | ||
| m_Data: | ||
| m_SerializedData: [] | ||
| m_GUID: ca573a7d9c8fb1044a5ceb85f048f213 | ||
| m_SerializeEntries: | ||
| - m_GUID: ed5a1263eb564c94abc6407ac0919ea7 | ||
| m_Address: Assets/Content/WorldObjects/World/VFX/Construction/DeleteConstruction.mat | ||
| m_ReadOnly: 0 | ||
| m_SerializedLabels: [] | ||
| - m_GUID: e9b99cfb2e59ffa40a062c2f4b88b729 | ||
| m_Address: Assets/Content/WorldObjects/World/VFX/Construction/InvalidConstruction.mat | ||
| m_ReadOnly: 0 | ||
| m_SerializedLabels: [] | ||
| - m_GUID: 6d2a18aa72cbaf94694dce9f8451160b | ||
| m_Address: Assets/Content/WorldObjects/World/VFX/Construction/ValidConstruction.mat | ||
| m_ReadOnly: 0 | ||
| m_SerializedLabels: [] | ||
| m_ReadOnly: 0 | ||
| m_Settings: {fileID: 11400000, guid: ddc57d0f5f9fb874e8a26db0c5b215e0, type: 2} | ||
| m_SchemaSet: | ||
| m_Schemas: | ||
| - {fileID: 11400000, guid: 84c038900429ad74e9cf6f6d27f33ade, type: 2} | ||
| - {fileID: 11400000, guid: b22abbf9f6bc06c4491b5c4a8258a702, type: 2} |
14 changes: 14 additions & 0 deletions
14
Assets/Content/Addressables/AssetGroups/Materials.asset.meta
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
45 changes: 45 additions & 0 deletions
45
Assets/Content/Addressables/AssetGroups/Schemas/Materials_BundledAssetGroupSchema.asset
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,45 @@ | ||
| %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: e5d17a21594effb4e9591490b009e7aa, type: 3} | ||
| m_Name: Materials_BundledAssetGroupSchema | ||
| m_EditorClassIdentifier: | ||
| m_Group: {fileID: 11400000, guid: 2caa591261a883b4183d04829ce705fd, type: 2} | ||
| m_InternalBundleIdMode: 1 | ||
| m_Compression: 1 | ||
| m_IncludeAddressInCatalog: 1 | ||
| m_IncludeGUIDInCatalog: 1 | ||
| m_IncludeLabelsInCatalog: 1 | ||
| m_InternalIdNamingMode: 0 | ||
| m_CacheClearBehavior: 0 | ||
| m_IncludeInBuild: 1 | ||
| m_BundledAssetProviderType: | ||
| m_AssemblyName: Unity.ResourceManager, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null | ||
| m_ClassName: UnityEngine.ResourceManagement.ResourceProviders.BundledAssetProvider | ||
| m_ForceUniqueProvider: 0 | ||
| m_UseAssetBundleCache: 1 | ||
| m_UseAssetBundleCrc: 1 | ||
| m_UseAssetBundleCrcForCachedBundles: 1 | ||
| m_UseUWRForLocalBundles: 0 | ||
| m_Timeout: 0 | ||
| m_ChunkedTransfer: 0 | ||
| m_RedirectLimit: -1 | ||
| m_RetryCount: 0 | ||
| m_BuildPath: | ||
| m_Id: 56790a984472fbe4a809c1ab1b0e4c79 | ||
| m_LoadPath: | ||
| m_Id: 8abc09617b79e8b4994b07cc672cbbe5 | ||
| m_BundleMode: 0 | ||
| m_AssetBundleProviderType: | ||
| m_AssemblyName: Unity.ResourceManager, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null | ||
| m_ClassName: UnityEngine.ResourceManagement.ResourceProviders.AssetBundleProvider | ||
| m_BundleNaming: 0 | ||
| m_AssetLoadMode: 0 |
8 changes: 8 additions & 0 deletions
8
Assets/Content/Addressables/AssetGroups/Schemas/Materials_BundledAssetGroupSchema.asset.meta
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
16 changes: 16 additions & 0 deletions
16
Assets/Content/Addressables/AssetGroups/Schemas/Materials_ContentUpdateGroupSchema.asset
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 @@ | ||
| %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: 5834b5087d578d24c926ce20cd31e6d6, type: 3} | ||
| m_Name: Materials_ContentUpdateGroupSchema | ||
| m_EditorClassIdentifier: | ||
| m_Group: {fileID: 11400000, guid: 2caa591261a883b4183d04829ce705fd, type: 2} | ||
| m_StaticContent: 0 |
8 changes: 8 additions & 0 deletions
8
...ts/Content/Addressables/AssetGroups/Schemas/Materials_ContentUpdateGroupSchema.asset.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,21 @@ | ||
| %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: 3c9b6c8ad6324c838c1743c2a2e2abc4, type: 3} | ||
| m_Name: Materials | ||
| m_EditorClassIdentifier: | ||
| EnumNamespaceName: SS3D.Data.Enums | ||
| EnumName: MaterialsIds | ||
| AssetGroup: {fileID: 11400000, guid: 2caa591261a883b4183d04829ce705fd, type: 2} | ||
| Assets: | ||
| - {fileID: 2100000, guid: ed5a1263eb564c94abc6407ac0919ea7, type: 2} | ||
| - {fileID: 2100000, guid: e9b99cfb2e59ffa40a062c2f4b88b729, type: 2} | ||
| - {fileID: 2100000, guid: 6d2a18aa72cbaf94694dce9f8451160b, type: 2} |
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
Oops, something went wrong.