diff --git a/.vscode/settings.json b/.vscode/settings.json new file mode 100644 index 0000000..1060b04 --- /dev/null +++ b/.vscode/settings.json @@ -0,0 +1,56 @@ +{ + "files.exclude": + { + "**/.DS_Store":true, + "**/.git":true, + "**/.gitignore":true, + "**/.gitmodules":true, + "**/*.booproj":true, + "**/*.pidb":true, + "**/*.suo":true, + "**/*.user":true, + "**/*.userprefs":true, + "**/*.unityproj":true, + "**/*.dll":true, + "**/*.exe":true, + "**/*.pdf":true, + "**/*.mid":true, + "**/*.midi":true, + "**/*.wav":true, + "**/*.gif":true, + "**/*.ico":true, + "**/*.jpg":true, + "**/*.jpeg":true, + "**/*.png":true, + "**/*.psd":true, + "**/*.tga":true, + "**/*.tif":true, + "**/*.tiff":true, + "**/*.3ds":true, + "**/*.3DS":true, + "**/*.fbx":true, + "**/*.FBX":true, + "**/*.lxo":true, + "**/*.LXO":true, + "**/*.ma":true, + "**/*.MA":true, + "**/*.obj":true, + "**/*.OBJ":true, + "**/*.asset":true, + "**/*.cubemap":true, + "**/*.flare":true, + "**/*.mat":true, + "**/*.meta":true, + "**/*.prefab":true, + "**/*.unity":true, + "build/":true, + "Build/":true, + "Library/":true, + "library/":true, + "obj/":true, + "Obj/":true, + "ProjectSettings/":true, + "temp/":true, + "Temp/":true + } +} \ No newline at end of file diff --git a/Assets/Resources/Materials/Foodbit.mat b/Assets/Resources/Materials/Foodbit.mat index df65da5..c09fb32 100644 Binary files a/Assets/Resources/Materials/Foodbit.mat and b/Assets/Resources/Materials/Foodbit.mat differ diff --git a/Assets/Resources/Materials/font.mat b/Assets/Resources/Materials/font.mat index 70466cd..8f28f53 100644 Binary files a/Assets/Resources/Materials/font.mat and b/Assets/Resources/Materials/font.mat differ diff --git a/Assets/Resources/Materials/genital_vector.mat b/Assets/Resources/Materials/genital_vector.mat index df81441..690b855 100644 Binary files a/Assets/Resources/Materials/genital_vector.mat and b/Assets/Resources/Materials/genital_vector.mat differ diff --git a/Assets/Resources/Materials/grid.mat b/Assets/Resources/Materials/grid.mat index cba73c9..640700d 100644 Binary files a/Assets/Resources/Materials/grid.mat and b/Assets/Resources/Materials/grid.mat differ diff --git a/Assets/Resources/Materials/mouth_vector.mat b/Assets/Resources/Materials/mouth_vector.mat index f3cafe2..c82e292 100644 Binary files a/Assets/Resources/Materials/mouth_vector.mat and b/Assets/Resources/Materials/mouth_vector.mat differ diff --git a/Assets/Resources/Physics Materials/Creature.physicmaterial b/Assets/Resources/Physics Materials/Creature.physicmaterial index 2efaecc..da266d5 100644 Binary files a/Assets/Resources/Physics Materials/Creature.physicmaterial and b/Assets/Resources/Physics Materials/Creature.physicmaterial differ diff --git a/Assets/Resources/Prefabs/Aperatus.prefab b/Assets/Resources/Prefabs/Aperatus.prefab index 7b88dc9..32af500 100644 Binary files a/Assets/Resources/Prefabs/Aperatus.prefab and b/Assets/Resources/Prefabs/Aperatus.prefab differ diff --git a/Assets/Resources/Prefabs/Energy.prefab b/Assets/Resources/Prefabs/Energy.prefab index 673bdc3..620e9f2 100644 Binary files a/Assets/Resources/Prefabs/Energy.prefab and b/Assets/Resources/Prefabs/Energy.prefab differ diff --git a/Assets/Resources/Prefabs/Ether.prefab b/Assets/Resources/Prefabs/Ether.prefab index 3f60bc8..72170c3 100644 Binary files a/Assets/Resources/Prefabs/Ether.prefab and b/Assets/Resources/Prefabs/Ether.prefab differ diff --git a/Assets/Resources/Prefabs/Foodbit.prefab b/Assets/Resources/Prefabs/Foodbit.prefab index b769c84..6243a9a 100644 Binary files a/Assets/Resources/Prefabs/Foodbit.prefab and b/Assets/Resources/Prefabs/Foodbit.prefab differ diff --git a/Assets/Resources/Prefabs/Plane.prefab b/Assets/Resources/Prefabs/Plane.prefab index ca14d74..55bae2e 100644 Binary files a/Assets/Resources/Prefabs/Plane.prefab and b/Assets/Resources/Prefabs/Plane.prefab differ diff --git a/Assets/Resources/Prefabs/UI/Selection.prefab b/Assets/Resources/Prefabs/UI/Selection.prefab index 4745d4f..d4d30f4 100644 Binary files a/Assets/Resources/Prefabs/UI/Selection.prefab and b/Assets/Resources/Prefabs/UI/Selection.prefab differ diff --git a/Assets/Scenes/Main.unity b/Assets/Scenes/Main.unity index 2b0a7b8..a60e021 100644 Binary files a/Assets/Scenes/Main.unity and b/Assets/Scenes/Main.unity differ diff --git a/Assets/Scripts/Creature/Creature.cs b/Assets/Scripts/Creature/Creature.cs index d9907a7..6f34748 100644 --- a/Assets/Scripts/Creature/Creature.cs +++ b/Assets/Scripts/Creature/Creature.cs @@ -1,5 +1,4 @@ using UnityEngine; -using System; using System.Collections; using System.Collections.Generic; diff --git a/Assets/Scripts/Creature/Eye.cs b/Assets/Scripts/Creature/Eye.cs index fa182ab..b623d8b 100644 --- a/Assets/Scripts/Creature/Eye.cs +++ b/Assets/Scripts/Creature/Eye.cs @@ -1,5 +1,4 @@ using UnityEngine; -using System.Collections; public class Eye : MonoBehaviour { diff --git a/Assets/Scripts/Creature/Genitalia.cs b/Assets/Scripts/Creature/Genitalia.cs index 027992e..3dbc52b 100644 --- a/Assets/Scripts/Creature/Genitalia.cs +++ b/Assets/Scripts/Creature/Genitalia.cs @@ -1,5 +1,4 @@ using UnityEngine; -using System.Collections; /* * Author: Craig Lomax @@ -21,8 +20,8 @@ public class Genitalia : MonoBehaviour { Transform _t; LineRenderer lr; Vector3 line_start; - float line_length = 0.05F; // default - float line_width = 0.05F; // values + float line_length = 0.05F; // default + float line_width = 0.05F; // values Vector3 line_end; double timeCreated; double timeToEnableMating = 1.0F; @@ -31,7 +30,6 @@ public class Genitalia : MonoBehaviour { void Start () { settings = Settings.getInstance(); - _t = transform; gameObject.tag = "Genital"; crt = (Creature)_t.parent.parent.gameObject.GetComponent("Creature"); @@ -47,7 +45,6 @@ void Start () { lr.SetVertexCount(2); lr.GetComponent().enabled = true; timeCreated = Time.time; - line_length = float.Parse( settings.contents["genitalia"]["line_length"].ToString() ); } @@ -74,9 +71,6 @@ void Update () { lr.SetPosition(1,line_end); } } - - - void resetStart () { line_start = new Vector3(_t.position.x,_t.position.y,_t.position.z); lr.SetPosition(0,line_start); diff --git a/Assets/Scripts/Creature/Limb.cs b/Assets/Scripts/Creature/Limb.cs index f8f654d..5a25fe3 100644 --- a/Assets/Scripts/Creature/Limb.cs +++ b/Assets/Scripts/Creature/Limb.cs @@ -1,6 +1,4 @@ using UnityEngine; -using System.Collections; - public class Limb : MonoBehaviour { HingeJoint hj; diff --git a/Assets/Scripts/Creature/Mouth.cs b/Assets/Scripts/Creature/Mouth.cs index 3908366..d7546c9 100644 --- a/Assets/Scripts/Creature/Mouth.cs +++ b/Assets/Scripts/Creature/Mouth.cs @@ -1,6 +1,4 @@ using UnityEngine; -using System.Collections; - /* * Author: Craig Lomax @@ -16,18 +14,13 @@ public class Mouth : MonoBehaviour { Foodbit fb; Creature crt; Eye eye; - Transform _t; LineRenderer lr; - Vector3 line_start; Vector3 line_end; - float line_length = 0.05F; float line_width = 0.05F; - int fb_detect_range = 40; - GameObject cf; void Start () { diff --git a/Assets/Scripts/Creature/Root.cs b/Assets/Scripts/Creature/Root.cs index 56bcc1d..7579892 100644 --- a/Assets/Scripts/Creature/Root.cs +++ b/Assets/Scripts/Creature/Root.cs @@ -1,30 +1,22 @@ using UnityEngine; -using System.Collections; - public class Root : MonoBehaviour { Transform _t; - public Creature crt; public GameObject eye; public GameObject mouth; public GameObject genital; - public MeshRenderer mr; public Material mt; - public Color original_colour; void Start () { _t = transform; - mr = gameObject.GetComponent(); - crt = _t.parent.gameObject.GetComponent(); eye = crt.eye; mouth = crt.mouth; genital = crt.genital; - tag = "Creature"; } diff --git a/Library/CurrentMaximizeLayout.dwlt b/Library/CurrentMaximizeLayout.dwlt index 15ec118..29c1982 100644 Binary files a/Library/CurrentMaximizeLayout.dwlt and b/Library/CurrentMaximizeLayout.dwlt differ diff --git a/Library/ShaderCache.db b/Library/ShaderCache.db index b3f9882..93f0bb9 100644 Binary files a/Library/ShaderCache.db and b/Library/ShaderCache.db differ diff --git a/Logs/Packages-Update.log b/Logs/Packages-Update.log new file mode 100644 index 0000000..3dc9afb --- /dev/null +++ b/Logs/Packages-Update.log @@ -0,0 +1,45 @@ + +=== Mon Nov 16 08:48:53 2020 + +Packages were changed. +Update Mode: resetToDefaultDependencies + +The following packages were added: + com.unity.collab-proxy@1.2.16 + com.unity.ide.rider@1.1.4 + com.unity.ide.vscode@1.2.0 + com.unity.modules.ai@1.0.0 + com.unity.modules.androidjni@1.0.0 + com.unity.modules.animation@1.0.0 + com.unity.modules.assetbundle@1.0.0 + com.unity.modules.audio@1.0.0 + com.unity.modules.cloth@1.0.0 + com.unity.modules.director@1.0.0 + com.unity.modules.imageconversion@1.0.0 + com.unity.modules.imgui@1.0.0 + com.unity.modules.jsonserialize@1.0.0 + com.unity.modules.particlesystem@1.0.0 + com.unity.modules.physics@1.0.0 + com.unity.modules.physics2d@1.0.0 + com.unity.modules.screencapture@1.0.0 + com.unity.modules.terrain@1.0.0 + com.unity.modules.terrainphysics@1.0.0 + com.unity.modules.tilemap@1.0.0 + com.unity.modules.ui@1.0.0 + com.unity.modules.uielements@1.0.0 + com.unity.modules.umbra@1.0.0 + com.unity.modules.unityanalytics@1.0.0 + com.unity.modules.unitywebrequest@1.0.0 + com.unity.modules.unitywebrequestassetbundle@1.0.0 + com.unity.modules.unitywebrequestaudio@1.0.0 + com.unity.modules.unitywebrequesttexture@1.0.0 + com.unity.modules.unitywebrequestwww@1.0.0 + com.unity.modules.vehicles@1.0.0 + com.unity.modules.video@1.0.0 + com.unity.modules.vr@1.0.0 + com.unity.modules.wind@1.0.0 + com.unity.modules.xr@1.0.0 + com.unity.test-framework@1.1.14 + com.unity.textmeshpro@2.0.1 + com.unity.timeline@1.2.14 + com.unity.ugui@1.0.0 diff --git a/Packages/manifest.json b/Packages/manifest.json new file mode 100644 index 0000000..9e7c23a --- /dev/null +++ b/Packages/manifest.json @@ -0,0 +1,42 @@ +{ + "dependencies": { + "com.unity.collab-proxy": "1.2.16", + "com.unity.ide.rider": "1.1.4", + "com.unity.ide.vscode": "1.2.0", + "com.unity.test-framework": "1.1.14", + "com.unity.textmeshpro": "2.0.1", + "com.unity.timeline": "1.2.14", + "com.unity.ugui": "1.0.0", + "com.unity.modules.ai": "1.0.0", + "com.unity.modules.androidjni": "1.0.0", + "com.unity.modules.animation": "1.0.0", + "com.unity.modules.assetbundle": "1.0.0", + "com.unity.modules.audio": "1.0.0", + "com.unity.modules.cloth": "1.0.0", + "com.unity.modules.director": "1.0.0", + "com.unity.modules.imageconversion": "1.0.0", + "com.unity.modules.imgui": "1.0.0", + "com.unity.modules.jsonserialize": "1.0.0", + "com.unity.modules.particlesystem": "1.0.0", + "com.unity.modules.physics": "1.0.0", + "com.unity.modules.physics2d": "1.0.0", + "com.unity.modules.screencapture": "1.0.0", + "com.unity.modules.terrain": "1.0.0", + "com.unity.modules.terrainphysics": "1.0.0", + "com.unity.modules.tilemap": "1.0.0", + "com.unity.modules.ui": "1.0.0", + "com.unity.modules.uielements": "1.0.0", + "com.unity.modules.umbra": "1.0.0", + "com.unity.modules.unityanalytics": "1.0.0", + "com.unity.modules.unitywebrequest": "1.0.0", + "com.unity.modules.unitywebrequestassetbundle": "1.0.0", + "com.unity.modules.unitywebrequestaudio": "1.0.0", + "com.unity.modules.unitywebrequesttexture": "1.0.0", + "com.unity.modules.unitywebrequestwww": "1.0.0", + "com.unity.modules.vehicles": "1.0.0", + "com.unity.modules.video": "1.0.0", + "com.unity.modules.vr": "1.0.0", + "com.unity.modules.wind": "1.0.0", + "com.unity.modules.xr": "1.0.0" + } +} diff --git a/ProjectSettings/ClusterInputManager.asset b/ProjectSettings/ClusterInputManager.asset index 25f957d..e7886b2 100644 Binary files a/ProjectSettings/ClusterInputManager.asset and b/ProjectSettings/ClusterInputManager.asset differ diff --git a/ProjectSettings/DynamicsManager.asset b/ProjectSettings/DynamicsManager.asset index 913475a..3db204e 100644 Binary files a/ProjectSettings/DynamicsManager.asset and b/ProjectSettings/DynamicsManager.asset differ diff --git a/ProjectSettings/EditorBuildSettings.asset b/ProjectSettings/EditorBuildSettings.asset index 95c8d23..a96bbab 100644 Binary files a/ProjectSettings/EditorBuildSettings.asset and b/ProjectSettings/EditorBuildSettings.asset differ diff --git a/ProjectSettings/GraphicsSettings.asset b/ProjectSettings/GraphicsSettings.asset index 3ddee0c..2dae38c 100644 Binary files a/ProjectSettings/GraphicsSettings.asset and b/ProjectSettings/GraphicsSettings.asset differ diff --git a/ProjectSettings/InputManager.asset b/ProjectSettings/InputManager.asset index 34357dd..4e0546e 100644 Binary files a/ProjectSettings/InputManager.asset and b/ProjectSettings/InputManager.asset differ diff --git a/ProjectSettings/Physics2DSettings.asset b/ProjectSettings/Physics2DSettings.asset index ab4e04d..417ef45 100644 Binary files a/ProjectSettings/Physics2DSettings.asset and b/ProjectSettings/Physics2DSettings.asset differ diff --git a/ProjectSettings/PresetManager.asset b/ProjectSettings/PresetManager.asset new file mode 100644 index 0000000..67a94da --- /dev/null +++ b/ProjectSettings/PresetManager.asset @@ -0,0 +1,7 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1386491679 &1 +PresetManager: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_DefaultPresets: {} diff --git a/ProjectSettings/ProjectSettings.asset b/ProjectSettings/ProjectSettings.asset index 6420504..e784607 100644 Binary files a/ProjectSettings/ProjectSettings.asset and b/ProjectSettings/ProjectSettings.asset differ diff --git a/ProjectSettings/QualitySettings.asset b/ProjectSettings/QualitySettings.asset index 22e3efb..378c60b 100644 Binary files a/ProjectSettings/QualitySettings.asset and b/ProjectSettings/QualitySettings.asset differ diff --git a/ProjectSettings/TagManager.asset b/ProjectSettings/TagManager.asset index 1809759..1abf056 100644 Binary files a/ProjectSettings/TagManager.asset and b/ProjectSettings/TagManager.asset differ diff --git a/ProjectSettings/TimeManager.asset b/ProjectSettings/TimeManager.asset index ce81fc9..92133a2 100644 Binary files a/ProjectSettings/TimeManager.asset and b/ProjectSettings/TimeManager.asset differ diff --git a/ProjectSettings/UnityAdsSettings.asset b/ProjectSettings/UnityAdsSettings.asset deleted file mode 100644 index 1a3437d..0000000 Binary files a/ProjectSettings/UnityAdsSettings.asset and /dev/null differ diff --git a/ProjectSettings/UnityConnectSettings.asset b/ProjectSettings/UnityConnectSettings.asset index fbf5f05..fa0b146 100644 Binary files a/ProjectSettings/UnityConnectSettings.asset and b/ProjectSettings/UnityConnectSettings.asset differ diff --git a/ProjectSettings/VFXManager.asset b/ProjectSettings/VFXManager.asset new file mode 100644 index 0000000..3a95c98 --- /dev/null +++ b/ProjectSettings/VFXManager.asset @@ -0,0 +1,12 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!937362698 &1 +VFXManager: + m_ObjectHideFlags: 0 + m_IndirectShader: {fileID: 0} + m_CopyBufferShader: {fileID: 0} + m_SortShader: {fileID: 0} + m_StripUpdateShader: {fileID: 0} + m_RenderPipeSettingsPath: + m_FixedTimeStep: 0.016666668 + m_MaxDeltaTime: 0.05 diff --git a/ProjectSettings/XRSettings.asset b/ProjectSettings/XRSettings.asset new file mode 100644 index 0000000..482590c --- /dev/null +++ b/ProjectSettings/XRSettings.asset @@ -0,0 +1,10 @@ +{ + "m_SettingKeys": [ + "VR Device Disabled", + "VR Device User Alert" + ], + "m_SettingValues": [ + "False", + "False" + ] +} \ No newline at end of file diff --git a/obj/Debug/.NETFramework,Version=v4.7.1.AssemblyAttributes.cs b/obj/Debug/.NETFramework,Version=v4.7.1.AssemblyAttributes.cs new file mode 100644 index 0000000..2afc031 --- /dev/null +++ b/obj/Debug/.NETFramework,Version=v4.7.1.AssemblyAttributes.cs @@ -0,0 +1,4 @@ +// +using System; +using System.Reflection; +[assembly: global::System.Runtime.Versioning.TargetFrameworkAttribute(".NETFramework,Version=v4.7.1", FrameworkDisplayName = ".NET Framework 4.7.1")] diff --git a/obj/Debug/Assembly-CSharp.csprojAssemblyReference.cache b/obj/Debug/Assembly-CSharp.csprojAssemblyReference.cache new file mode 100644 index 0000000..2f6ee2e Binary files /dev/null and b/obj/Debug/Assembly-CSharp.csprojAssemblyReference.cache differ