Skip to content
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

Jump to bottom

Npc behaviour Rudimentary setup #78

Merged
merged 49 commits into from
Jan 27, 2022
Merged

Npc behaviour Rudimentary setup #78

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
49 commits
Select commit Hold shift + click to select a range
fcbec4a
Added NPC script
TheUQGuy Sep 28, 2021
190a26e
Update Agent.cs
TheUQGuy Sep 28, 2021
3bf19d1
Make a testNPC
TheUQGuy Sep 28, 2021
f8ddbb1
Add option to turn NPC to enemy
TheUQGuy Sep 29, 2021
28d214f
Designate script for NPC movement
TheUQGuy Sep 29, 2021
67aa169
Add array iterator example nodes
JadenBalogh Oct 3, 2021
e50567d
Merge branch 'dev' into npc-behaviour
TheUQGuy Oct 5, 2021
4b42d5e
Format NPC to function with rpg branch
TheUQGuy Oct 6, 2021
420fe41
Update missed Scene Save
TheUQGuy Oct 6, 2021
24ea566
Merge branch 'dev' into npc-behaviour
TheUQGuy Oct 8, 2021
d9c030d
Add ForceDialogueNode
TheUQGuy Oct 8, 2021
6db8bf8
Remove redundant code for ForceDialogue
TheUQGuy Oct 8, 2021
6ada982
Merge branch 'iterator-node' into npc-behaviour
JadenBalogh Nov 10, 2021
6d9cf38
Merge branch 'dev' into npc-behaviour
JadenBalogh Nov 10, 2021
a6566b2
Fix merge conflicts
JadenBalogh Nov 10, 2021
61c37f5
Update test actors
JadenBalogh Nov 10, 2021
6d6608d
Merge branch 'dev' into npc-behaviour
JadenBalogh Nov 10, 2021
9a85792
Merge branch 'dev' into npc-behaviour
JadenBalogh Nov 10, 2021
7852567
Implement patrol behaviour
JadenBalogh Nov 11, 2021
42e13a9
Rename EqualsNode to IntEqualsNode
JadenBalogh Nov 11, 2021
3ecced8
Rename IntEqualsNode
JadenBalogh Nov 11, 2021
a3574c1
Implement NPC idle logic
JadenBalogh Nov 11, 2021
dacc581
Fix array reset inspector bug
JadenBalogh Nov 11, 2021
abfecd3
Remove Animator from Agent
JadenBalogh Nov 17, 2021
7c8b1ad
Update NPC directory structure
JadenBalogh Nov 17, 2021
30de1dc
Update NPCs
JadenBalogh Nov 17, 2021
da700e7
Fix dialogue option timing
JadenBalogh Nov 17, 2021
fa4b30e
Implement player enable/disable system and forced dialogue node
JadenBalogh Nov 17, 2021
df1ebf6
Implement basic enemy/npc conversion and jimmy behaviour tree
JadenBalogh Nov 21, 2021
ac441d3
Update UniqueId API
JadenBalogh Nov 23, 2021
b5ad211
Remove Entity parent from Interactable
JadenBalogh Nov 23, 2021
a68a44e
Change dialogue behaviours to run on current NPC
JadenBalogh Nov 23, 2021
14ff5ef
Implement behaviours for enemy management and update jimmy
JadenBalogh Nov 23, 2021
4887777
Implement DILF system
JadenBalogh Nov 24, 2021
40ab692
Remove now-unused comparison nodes
JadenBalogh Nov 24, 2021
31360dd
Update BehaviourTreeNodeCreator.cs
JadenBalogh Nov 24, 2021
50b9962
Implement DILF-based set property node
JadenBalogh Nov 25, 2021
b4d5df3
Remove behaviour debug logging
JadenBalogh Nov 25, 2021
4b4c0c7
Implement DILF-based array nodes
JadenBalogh Nov 26, 2021
aa3cb14
Force disable NPC movement during dialogue
JadenBalogh Nov 26, 2021
5f8364c
Merge branch 'dev' into npc-behaviour
JadenBalogh Dec 3, 2021
213e784
Remove BaseNPC class
JadenBalogh Dec 3, 2021
e7fed8b
Fix comment typo
JadenBalogh Dec 3, 2021
2170812
Refactor agent enable logic
JadenBalogh Dec 3, 2021
24f9d77
Update array increment comment
JadenBalogh Dec 3, 2021
d91a5a2
Add newline at end of file
JadenBalogh Dec 3, 2021
f3dd7df
Remove VectorIteratorNode
JadenBalogh Dec 3, 2021
ae0b4b9
Make Animator preset the default
JadenBalogh Dec 8, 2021
f0d618c
Merge branch 'dev' into npc-behaviour
JadenBalogh Dec 8, 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
7 changes: 7 additions & 0 deletions Assets/Data/Behaviour Trees/AnimatedEnemy.asset
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@ MonoBehaviour:
property:
propertyType: 2
objectType:
forceReserialization: 0
value:
b: 0
n: 0
Expand All @@ -59,6 +60,7 @@ MonoBehaviour:
property:
propertyType: 4
objectType:
forceReserialization: 0
value:
b: 0
n: 0
Expand All @@ -72,6 +74,7 @@ MonoBehaviour:
property:
propertyType: 1
objectType:
forceReserialization: 0
value:
b: 0
n: 0.1
Expand All @@ -85,6 +88,7 @@ MonoBehaviour:
property:
propertyType: 2
objectType:
forceReserialization: 0
value:
b: 0
n: 0
Expand All @@ -103,6 +107,7 @@ MonoBehaviour:
property:
propertyType: 2
objectType:
forceReserialization: 0
value:
b: 0
n: 0
Expand All @@ -116,6 +121,7 @@ MonoBehaviour:
property:
propertyType: 1
objectType:
forceReserialization: 0
value:
b: 0
n: 0.1
Expand All @@ -129,6 +135,7 @@ MonoBehaviour:
property:
propertyType: 1
objectType:
forceReserialization: 0
value:
b: 0
n: 0.8
Expand Down
Loading