Commit b79da9c2 authored 8 years ago by Michael LaFreniere

Merge remote-tracking branch 'origin/master'

parents fcff29f8 1898b07b

No related branches found

No related tags found

No related merge requests found

Hide whitespace changes

Inline Side-by-side

Showing

Zookeepers Trial/Assets/Art/animations/character.controller 0 additions, 0 deletions

Zookeepers Trial/Assets/Art/animations/character.controller
Zookeepers Trial/Assets/Scripts/ArenaCombatControl.cs 28 additions, 5 deletions

Zookeepers Trial/Assets/Scripts/ArenaCombatControl.cs
Zookeepers Trial/Assets/Scripts/EnemyAI.cs 93 additions, 10 deletions

Zookeepers Trial/Assets/Scripts/EnemyAI.cs
Zookeepers Trial/Library/LastSceneManagerSetup.txt 4 additions, 0 deletions

Zookeepers Trial/Library/LastSceneManagerSetup.txt
Zookeepers Trial/Library/metadata/00/00000000000000002000000000000000 0 additions, 0 deletions

...rial/Library/metadata/00/00000000000000002000000000000000
Zookeepers Trial/Library/metadata/00/00000000000000003000000000000000 0 additions, 0 deletions

...rial/Library/metadata/00/00000000000000003000000000000000
Zookeepers Trial/Library/metadata/00/00000000000000004100000000000000 0 additions, 0 deletions

...rial/Library/metadata/00/00000000000000004100000000000000
Zookeepers Trial/Library/metadata/00/00000000000000005000000000000000 0 additions, 0 deletions

...rial/Library/metadata/00/00000000000000005000000000000000
Zookeepers Trial/Library/metadata/00/00000000000000005100000000000000 0 additions, 0 deletions

...rial/Library/metadata/00/00000000000000005100000000000000
Zookeepers Trial/Library/metadata/00/00000000000000006000000000000000 0 additions, 0 deletions

...rial/Library/metadata/00/00000000000000006000000000000000
Zookeepers Trial/Library/metadata/00/00000000000000007000000000000000 0 additions, 0 deletions

...rial/Library/metadata/00/00000000000000007000000000000000
Zookeepers Trial/Library/metadata/00/00000000000000007100000000000000 0 additions, 0 deletions

...rial/Library/metadata/00/00000000000000007100000000000000
Zookeepers Trial/Library/metadata/00/00000000000000008000000000000000 0 additions, 0 deletions

...rial/Library/metadata/00/00000000000000008000000000000000
Zookeepers Trial/Library/metadata/00/00000000000000008100000000000000 0 additions, 0 deletions

...rial/Library/metadata/00/00000000000000008100000000000000
Zookeepers Trial/Library/metadata/00/00000000000000009000000000000000 0 additions, 0 deletions

...rial/Library/metadata/00/00000000000000009000000000000000
Zookeepers Trial/Library/metadata/00/0000000000000000a000000000000000 0 additions, 0 deletions

...rial/Library/metadata/00/0000000000000000a000000000000000
Zookeepers Trial/Library/metadata/00/0000000000000000a100000000000000 0 additions, 0 deletions

...rial/Library/metadata/00/0000000000000000a100000000000000
Zookeepers Trial/Library/metadata/00/0000000000000000b000000000000000 0 additions, 0 deletions

...rial/Library/metadata/00/0000000000000000b000000000000000
Zookeepers Trial/Library/metadata/00/0000000000000000c000000000000000 0 additions, 0 deletions

...rial/Library/metadata/00/0000000000000000c000000000000000
Zookeepers Trial/Library/metadata/53/537bd552e039b684db164ee454e43761 0 additions, 0 deletions

...rial/Library/metadata/53/537bd552e039b684db164ee454e43761

with 125 additions and 15 deletions

Please register or to comment