Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
56 changes: 56 additions & 0 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
@@ -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
}
}
Binary file modified Assets/Resources/Materials/Foodbit.mat
Binary file not shown.
Binary file modified Assets/Resources/Materials/font.mat
Binary file not shown.
Binary file modified Assets/Resources/Materials/genital_vector.mat
Binary file not shown.
Binary file modified Assets/Resources/Materials/grid.mat
Binary file not shown.
Binary file modified Assets/Resources/Materials/mouth_vector.mat
Binary file not shown.
Binary file modified Assets/Resources/Physics Materials/Creature.physicmaterial
Binary file not shown.
Binary file modified Assets/Resources/Prefabs/Aperatus.prefab
Binary file not shown.
Binary file modified Assets/Resources/Prefabs/Energy.prefab
Binary file not shown.
Binary file modified Assets/Resources/Prefabs/Ether.prefab
Binary file not shown.
Binary file modified Assets/Resources/Prefabs/Foodbit.prefab
Binary file not shown.
Binary file modified Assets/Resources/Prefabs/Plane.prefab
Binary file not shown.
Binary file modified Assets/Resources/Prefabs/UI/Selection.prefab
Binary file not shown.
Binary file modified Assets/Scenes/Main.unity
Binary file not shown.
1 change: 0 additions & 1 deletion Assets/Scripts/Creature/Creature.cs
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
using UnityEngine;
using System;
using System.Collections;
using System.Collections.Generic;

Expand Down
1 change: 0 additions & 1 deletion Assets/Scripts/Creature/Eye.cs
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
using UnityEngine;
using System.Collections;

public class Eye : MonoBehaviour
{
Expand Down
10 changes: 2 additions & 8 deletions Assets/Scripts/Creature/Genitalia.cs
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
using UnityEngine;
using System.Collections;

/*
* Author: Craig Lomax
Expand All @@ -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;
Expand All @@ -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");
Expand All @@ -47,7 +45,6 @@ void Start () {
lr.SetVertexCount(2);
lr.GetComponent<Renderer>().enabled = true;
timeCreated = Time.time;

line_length = float.Parse( settings.contents["genitalia"]["line_length"].ToString() );
}

Expand All @@ -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);
Expand Down
2 changes: 0 additions & 2 deletions Assets/Scripts/Creature/Limb.cs
Original file line number Diff line number Diff line change
@@ -1,6 +1,4 @@
using UnityEngine;
using System.Collections;

public class Limb : MonoBehaviour {

HingeJoint hj;
Expand Down
7 changes: 0 additions & 7 deletions Assets/Scripts/Creature/Mouth.cs
Original file line number Diff line number Diff line change
@@ -1,6 +1,4 @@
using UnityEngine;
using System.Collections;


/*
* Author: Craig Lomax
Expand All @@ -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 () {
Expand Down
8 changes: 0 additions & 8 deletions Assets/Scripts/Creature/Root.cs
Original file line number Diff line number Diff line change
@@ -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<MeshRenderer>();

crt = _t.parent.gameObject.GetComponent<Creature>();
eye = crt.eye;
mouth = crt.mouth;
genital = crt.genital;

tag = "Creature";
}

Expand Down
Binary file modified Library/CurrentMaximizeLayout.dwlt
Binary file not shown.
Binary file modified Library/ShaderCache.db
Binary file not shown.
45 changes: 45 additions & 0 deletions Logs/Packages-Update.log
Original file line number Diff line number Diff line change
@@ -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
42 changes: 42 additions & 0 deletions Packages/manifest.json
Original file line number Diff line number Diff line change
@@ -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"
}
}
Binary file modified ProjectSettings/ClusterInputManager.asset
Binary file not shown.
Binary file modified ProjectSettings/DynamicsManager.asset
Binary file not shown.
Binary file modified ProjectSettings/EditorBuildSettings.asset
Binary file not shown.
Binary file modified ProjectSettings/GraphicsSettings.asset
Binary file not shown.
Binary file modified ProjectSettings/InputManager.asset
Binary file not shown.
Binary file modified ProjectSettings/Physics2DSettings.asset
Binary file not shown.
7 changes: 7 additions & 0 deletions ProjectSettings/PresetManager.asset
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!1386491679 &1
PresetManager:
m_ObjectHideFlags: 0
serializedVersion: 2
m_DefaultPresets: {}
Binary file modified ProjectSettings/ProjectSettings.asset
Binary file not shown.
Binary file modified ProjectSettings/QualitySettings.asset
Binary file not shown.
Binary file modified ProjectSettings/TagManager.asset
Binary file not shown.
Binary file modified ProjectSettings/TimeManager.asset
Binary file not shown.
Binary file removed ProjectSettings/UnityAdsSettings.asset
Binary file not shown.
Binary file modified ProjectSettings/UnityConnectSettings.asset
Binary file not shown.
12 changes: 12 additions & 0 deletions ProjectSettings/VFXManager.asset
Original file line number Diff line number Diff line change
@@ -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
10 changes: 10 additions & 0 deletions ProjectSettings/XRSettings.asset
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
{
"m_SettingKeys": [
"VR Device Disabled",
"VR Device User Alert"
],
"m_SettingValues": [
"False",
"False"
]
}
4 changes: 4 additions & 0 deletions obj/Debug/.NETFramework,Version=v4.7.1.AssemblyAttributes.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
// <autogenerated />
using System;
using System.Reflection;
[assembly: global::System.Runtime.Versioning.TargetFrameworkAttribute(".NETFramework,Version=v4.7.1", FrameworkDisplayName = ".NET Framework 4.7.1")]
Binary file not shown.