From e9acf249853b8f0b4e6ad0ce49b0ac9451626a28 Mon Sep 17 00:00:00 2001 From: KUNGERMOoN <60297336+KUNGERMOoN@users.noreply.github.com> Date: Sun, 7 Jul 2024 20:35:57 +0200 Subject: [PATCH] Odin inspector removed from the repo --- .gitignore | 7 ++++++- Assets/GameOfLife.unity | 6 ++---- Assets/Shaders/GameOfLifeSimulation.compute.meta | 2 +- sus.json | 1 - 4 files changed, 9 insertions(+), 7 deletions(-) delete mode 100644 sus.json diff --git a/.gitignore b/.gitignore index d4eaa51..ee3015b 100644 --- a/.gitignore +++ b/.gitignore @@ -70,4 +70,9 @@ crashlytics-build.properties # Temporary auto-generated Android Assets /[Aa]ssets/[Ss]treamingAssets/aa.meta /[Aa]ssets/[Ss]treamingAssets/aa/* -Assets/Docs/~$LookupTables.xlsx + +# Temporary excel files +/[Aa]ssets/~$LookupTables.xlsx + +# Odin inspector (optionally used for Assets Scripts/Editor/LookupTableBuilderEditor.cs) +/[Aa]ssets/Plugins/Sirenix/* \ No newline at end of file diff --git a/Assets/GameOfLife.unity b/Assets/GameOfLife.unity index fd17f64..30934a6 100644 --- a/Assets/GameOfLife.unity +++ b/Assets/GameOfLife.unity @@ -370,9 +370,7 @@ MonoBehaviour: Grid: {r: 0.26666668, g: 0.3019608, b: 0.5176471, a: 1} AliveCell: {r: 0.69803923, g: 0.8352941, b: 0.81960785, a: 1} Name: Cold Light - Description: 'Cold Light palette by @A-LAMP on Lospec - - https://lospec.com/palette-list/cold-light' + Description: Settings: CameraMaxSpeed: 2 CameraAcceleration: 0.2 @@ -490,7 +488,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: ee28e3c4ff94dda449efb75f64e150da, type: 3} m_Name: m_EditorClassIdentifier: - ComputeShader: {fileID: 7200000, guid: b33be95b30b36914e87fa054dc3f2c83, type: 3} + ComputeShader: {fileID: 7200000, guid: e2a7997474cc52d428aff7a92d7a6592, type: 3} Renderer: {fileID: 1518814360} Material: {fileID: 2100000, guid: eae4068e4c3ce52428fa7d2f6af5a091, type: 2} --- !u!1660057539 &9223372036854775807 diff --git a/Assets/Shaders/GameOfLifeSimulation.compute.meta b/Assets/Shaders/GameOfLifeSimulation.compute.meta index dc96903..b28f447 100644 --- a/Assets/Shaders/GameOfLifeSimulation.compute.meta +++ b/Assets/Shaders/GameOfLifeSimulation.compute.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: cc09f7390a9a85e459cce8a01718250c +guid: e2a7997474cc52d428aff7a92d7a6592 ComputeShaderImporter: externalObjects: {} preprocessorOverride: 0 diff --git a/sus.json b/sus.json deleted file mode 100644 index addde63..0000000 --- a/sus.json +++ /dev/null @@ -1 +0,0 @@ -{"AliveCell":{"r":0.6980392336845398,"g":0.8352941274642944,"b":0.8196078538894653,"a":0.0},"DeadCell":{"r":0.0313725508749485,"g":0.0,"b":0.12156862765550614,"a":0.0},"Grid":{"r":0.2666666805744171,"g":0.3019607961177826,"b":0.5176470875740051,"a":0.0}} \ No newline at end of file