Skip to content

Add base AIController / Move camera follow logice to CamFollow script #2

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
WVAviator wants to merge 7 commits into
base: Main-Game
Choose a base branch
from
Open

Add base AIController / Move camera follow logice to CamFollow script #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
ffe6362
Add base AIController / Move camera follow logice to CamFollow script
WVAviator Oct 9, 2021
c1ec93c
Updated AIController with better logic, added AIWandererController
WVAviator Oct 9, 2021
9bd41a5
Merge pull request #1 from WVAviator/main
WVAviator Oct 9, 2021
1078b0d
Merge branch 'Quontium:Main-Game' into Main-Game
WVAviator Oct 9, 2021
a826c7e
Moved all controller files into their won folder
WVAviator Oct 9, 2021
0ba2ed7
Added AI States, created SimpleAI and CombatAI
WVAviator Oct 9, 2021
8afa84c
Added Aerodynamic Profile scriptable objects
WVAviator Oct 10, 2021
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
49 changes: 42 additions & 7 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,34 @@
[Ll]ibrary/
[Tt]emp/
[Oo]bj/
[Bb]uild/
[Bb]uilds/
Assets/AssetStoreTools*
# This .gitignore file should be placed at the root of your Unity project directory
#
# Get latest from https://github.com/github/gitignore/blob/master/Unity.gitignore
#
/[Ll]ibrary/
/[Tt]emp/
/[Oo]bj/
/[Bb]uild/
/[Bb]uilds/
/[Ll]ogs/
/[Uu]ser[Ss]ettings/

# MemoryCaptures can get excessive in size.
# They also could contain extremely sensitive data
/[Mm]emoryCaptures/

# Asset meta data should only be ignored when the corresponding asset is also ignored
!/[Aa]ssets/**/*.meta

# Uncomment this line if you wish to ignore the asset store tools plugin
# /[Aa]ssets/AssetStoreTools*

# Autogenerated Jetbrains Rider plugin
/[Aa]ssets/Plugins/Editor/JetBrains*

# Visual Studio cache directory
.vs/

# Gradle cache directory
.gradle/

# Autogenerated VS/MD/Consulo solution and project files
ExportedObj/
.consulo/
Expand All @@ -22,16 +43,30 @@ ExportedObj/
*.booproj
*.svd
*.pdb
*.mdb
*.opendb
*.VC.db

# Unity3D generated meta files
*.pidb.meta
*.pdb.meta
*.mdb.meta

# Unity3D Generated File On Crash Reports
# Unity3D generated file on crash reports
sysinfo.txt

# Builds
*.apk
*.aab
*.unitypackage

# Crashlytics generated file
crashlytics-build.properties

# Packed Addressables
/[Aa]ssets/[Aa]ddressable[Aa]ssets[Dd]ata/*/*.bin*

# Temporary auto-generated Android Assets
/[Aa]ssets/[Ss]treamingAssets/aa.meta
/[Aa]ssets/[Ss]treamingAssets/aa/*
*.log
2 changes: 1 addition & 1 deletion Assets/AIBehavior/Editor/AIBehaviorsMadeEasy/AIBehaviorsEditor.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -339,7 +339,7 @@ void InitNewStates()
}
else
{
statesDictionary["Attack"] = typeof(AttackState);
statesDictionary["Attack"] = typeof(AIBehavior.AttackState);
}

statesDictionary["Defend"] = typeof(DefendState);
Expand Down
8 changes: 8 additions & 0 deletions Assets/Prefabs Models/PaperPlanes/Aerodynamic Profiles.meta
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

19 changes: 19 additions & 0 deletions Assets/Prefabs Models/PaperPlanes/Aerodynamic Profiles/Hunting Flight.asset
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
%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: 5f3359a4bded458bb94532e0641e1ae3, type: 3}
m_Name: Hunting Flight
m_EditorClassIdentifier:
torque: 900
reverse: 30
thrust: 120000
speed: 5
rotationSpeed: 100
8 changes: 8 additions & 0 deletions Assets/Prefabs Models/PaperPlanes/Aerodynamic Profiles/Hunting Flight.asset.meta
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

19 changes: 19 additions & 0 deletions Assets/Prefabs Models/PaperPlanes/Aerodynamic Profiles/The Basic.asset
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
%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: 5f3359a4bded458bb94532e0641e1ae3, type: 3}
m_Name: The Basic
m_EditorClassIdentifier:
torque: 750
reverse: 50
thrust: 120000
speed: 90
rotationSpeed: 130
8 changes: 8 additions & 0 deletions Assets/Prefabs Models/PaperPlanes/Aerodynamic Profiles/The Basic.asset.meta
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

19 changes: 19 additions & 0 deletions Assets/Prefabs Models/PaperPlanes/Aerodynamic Profiles/The Buzz.asset
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
%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: 5f3359a4bded458bb94532e0641e1ae3, type: 3}
m_Name: The Buzz
m_EditorClassIdentifier:
torque: 900
reverse: 60
thrust: 140000
speed: 90
rotationSpeed: 0.01
8 changes: 8 additions & 0 deletions Assets/Prefabs Models/PaperPlanes/Aerodynamic Profiles/The Buzz.asset.meta
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

19 changes: 19 additions & 0 deletions Assets/Prefabs Models/PaperPlanes/Aerodynamic Profiles/The Dart.asset
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
%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: 5f3359a4bded458bb94532e0641e1ae3, type: 3}
m_Name: The Dart
m_EditorClassIdentifier:
torque: 950
reverse: 50
thrust: 130000
speed: 100
rotationSpeed: 50
8 changes: 8 additions & 0 deletions Assets/Prefabs Models/PaperPlanes/Aerodynamic Profiles/The Dart.asset.meta
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

19 changes: 19 additions & 0 deletions Assets/Prefabs Models/PaperPlanes/Aerodynamic Profiles/The Sea Glider.asset
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
%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: 5f3359a4bded458bb94532e0641e1ae3, type: 3}
m_Name: The Sea Glider
m_EditorClassIdentifier:
torque: 750
reverse: 50
thrust: 120000
speed: 45
rotationSpeed: 130
8 changes: 8 additions & 0 deletions Assets/Prefabs Models/PaperPlanes/Aerodynamic Profiles/The Sea Glider.asset.meta
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

19 changes: 19 additions & 0 deletions Assets/Prefabs Models/PaperPlanes/Aerodynamic Profiles/The Sprinter.asset
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
%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: 5f3359a4bded458bb94532e0641e1ae3, type: 3}
m_Name: The Sprinter
m_EditorClassIdentifier:
torque: 900
reverse: 30
thrust: 110000
speed: 80
rotationSpeed: 90
8 changes: 8 additions & 0 deletions Assets/Prefabs Models/PaperPlanes/Aerodynamic Profiles/The Sprinter.asset.meta
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

19 changes: 19 additions & 0 deletions Assets/Prefabs Models/PaperPlanes/Aerodynamic Profiles/The Stable.asset
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
%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: 5f3359a4bded458bb94532e0641e1ae3, type: 3}
m_Name: The Stable
m_EditorClassIdentifier:
torque: 900
reverse: 50
thrust: 100000
speed: 45
rotationSpeed: 90
8 changes: 8 additions & 0 deletions Assets/Prefabs Models/PaperPlanes/Aerodynamic Profiles/The Stable.asset.meta
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion Assets/Prefabs Models/PaperPlanes/Hunting Flight.prefab
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8606,7 +8606,7 @@ MonoBehaviour:
thrust: 120000
speed: 5
rotationSpeed: 100
yaw: 90
aerodynamicProperties: {fileID: 11400000, guid: dc9510c38e759dc43992c7f43dfbbc40, type: 2}
--- !u!114 &-5089756287788566731
MonoBehaviour:
m_ObjectHideFlags: 0
Expand Down
2 changes: 1 addition & 1 deletion Assets/Prefabs Models/PaperPlanes/The Basic.prefab
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2498,7 +2498,7 @@ MonoBehaviour:
thrust: 120000
speed: 90
rotationSpeed: 130
yaw: 90
aerodynamicProperties: {fileID: 11400000, guid: f01e07d1133357e4f8ba7d446ed3169b, type: 2}
--- !u!114 &7780682244276142680
MonoBehaviour:
m_ObjectHideFlags: 0
Expand Down
2 changes: 1 addition & 1 deletion Assets/Prefabs Models/PaperPlanes/The Buzz.prefab
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1860,7 +1860,7 @@ MonoBehaviour:
thrust: 140000
speed: 90
rotationSpeed: 0.01
yaw: 90
aerodynamicProperties: {fileID: 11400000, guid: 44fda2a904ea5ed4787662e56d692add, type: 2}
--- !u!114 &-6721631156744520290
MonoBehaviour:
m_ObjectHideFlags: 0
Expand Down
2 changes: 1 addition & 1 deletion Assets/Prefabs Models/PaperPlanes/The Dart.prefab
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6177,7 +6177,7 @@ MonoBehaviour:
thrust: 130000
speed: 100
rotationSpeed: 50
yaw: 90
aerodynamicProperties: {fileID: 11400000, guid: fd8f70a1b1a90be45bc527c73f3e2e2f, type: 2}
--- !u!114 &-5634098342623982450
MonoBehaviour:
m_ObjectHideFlags: 0
Expand Down
2 changes: 1 addition & 1 deletion Assets/Prefabs Models/PaperPlanes/The Sea Glider.prefab
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6545,7 +6545,7 @@ MonoBehaviour:
thrust: 120000
speed: 45
rotationSpeed: 130
yaw: 90
aerodynamicProperties: {fileID: 11400000, guid: 052ec79fca119144e98891334cbb0c44, type: 2}
--- !u!114 &-6352292425392488833
MonoBehaviour:
m_ObjectHideFlags: 0
Expand Down
2 changes: 1 addition & 1 deletion Assets/Prefabs Models/PaperPlanes/The Sprinter.prefab
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7633,7 +7633,7 @@ MonoBehaviour:
thrust: 110000
speed: 80
rotationSpeed: 90
yaw: 90
aerodynamicProperties: {fileID: 11400000, guid: 861be44c575c59940a0d7936b5024f6b, type: 2}
--- !u!114 &-1218063470004189874
MonoBehaviour:
m_ObjectHideFlags: 0
Expand Down
2 changes: 1 addition & 1 deletion Assets/Prefabs Models/PaperPlanes/The Stable.prefab
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2926,7 +2926,7 @@ MonoBehaviour:
thrust: 100000
speed: 45
rotationSpeed: 90
yaw: 90
aerodynamicProperties: {fileID: 11400000, guid: 566ef7ff626a23b45b07a62249158490, type: 2}
--- !u!114 &-1586028042976975720
MonoBehaviour:
m_ObjectHideFlags: 0
Expand Down
8 changes: 8 additions & 0 deletions Assets/Scripts/Flight Controllers.meta
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading