Skip to content
Snippets Groups Projects
  1. Nov 27, 2016
  2. Nov 25, 2016
  3. Nov 14, 2016
    • Michael LaFreniere's avatar
      a6192cd4
    • mitchelkovacs's avatar
      reverting back to mikes commit · 950bd3e0
      mitchelkovacs authored
      950bd3e0
    • mitchelkovacs's avatar
      Revert "Revert "commit before reverting"" · a196d2f6
      mitchelkovacs authored
      This reverts commit 9c227764.
      a196d2f6
    • mitchelkovacs's avatar
      Revert "commit before reverting" · 9c227764
      mitchelkovacs authored
      This reverts commit eecf28f8.
      9c227764
    • mitchelkovacs's avatar
      commit before reverting · eecf28f8
      mitchelkovacs authored
      eecf28f8
    • Graham Solie's avatar
      Yolo Commit · 096eeb02
      Graham Solie authored
      # Conflicts:
      #	Zookeepers Trial/.vs/Zookeepers Trial/v14/.suo
      #	Zookeepers Trial/Assets/Scenes/arena.unity
      #	Zookeepers Trial/Assets/Scripts/EnemyAI.cs
      #	Zookeepers Trial/Assets/Scripts/WeaponList.cs.meta
      #	Zookeepers Trial/Library/CurrentLayout.dwlt
      #	Zookeepers Trial/Library/ScriptAssemblies/Assembly-CSharp.dll
      #	Zookeepers Trial/Library/ScriptAssemblies/Assembly-CSharp.dll.mdb
      #	Zookeepers Trial/Library/assetDatabase3
      #	Zookeepers Trial/Library/expandedItems
      #	Zookeepers Trial/Library/metadata/00/00000000000000002000000000000000
      #	Zookeepers Trial/Library/metadata/00/00000000000000003000000000000000
      #	Zookeepers Trial/Library/metadata/00/00000000000000004000000000000000
      #	Zookeepers Trial/Library/metadata/00/00000000000000004100000000000000
      #	Zookeepers Trial/Library/metadata/00/00000000000000005000000000000000
      #	Zookeepers Trial/Library/metadata/00/00000000000000005100000000000000
      #	Zookeepers Trial/Library/metadata/00/00000000000000006000000000000000
      #	Zookeepers Trial/Library/metadata/00/00000000000000006100000000000000
      #	Zookeepers Trial/Library/metadata/00/00000000000000007000000000000000
      #	Zookeepers Trial/Library/metadata/00/00000000000000007100000000000000
      #	Zookeepers Trial/Library/metadata/00/00000000000000008000000000000000
      #	Zookeepers Trial/Library/metadata/00/00000000000000008100000000000000
      #	Zookeepers Trial/Library/metadata/00/00000000000000009000000000000000
      #	Zookeepers Trial/Library/metadata/00/0000000000000000a000000000000000
      #	Zookeepers Trial/Library/metadata/00/0000000000000000a100000000000000
      #	Zookeepers Trial/Library/metadata/00/0000000000000000b000000000000000
      #	Zookeepers Trial/Library/metadata/00/0000000000000000c000000000000000
      #	Zookeepers Trial/Library/metadata/0a/0a0993049e42c8b41b1c6d4b9753a4d0
      #	Zookeepers Trial/Library/metadata/0a/0a5410bd5abcd9240a90852252a9b918
      #	Zookeepers Trial/Library/metadata/12/121b25d3976123f46820001203d77356
      #	Zookeepers Trial/Library/metadata/35/3590bd84105653a48a7e1671d16ef2f8
      #	Zookeepers Trial/Library/metadata/3c/3c524b654b3be1a40b706265442b627e
      #	Zookeepers Trial/Library/metadata/3f/3fe0717995857f84293c5a545a0182d0
      #	Zookeepers Trial/Library/metadata/52/5249f18a50a612e4f9786623c6ce0d0e
      #	Zookeepers Trial/Library/metadata/53/537bd552e039b684db164ee454e43761
      #	Zookeepers Trial/Library/metadata/63/635041fed7255734985fccf72de67b7b
      #	Zookeepers Trial/Library/metadata/6c/6c3c5e21234caa3468025629dfa57435
      #	Zookeepers Trial/Library/metadata/a8/a8e0d5f7e4068964cb6c2a24f6df4f0f
      #	Zookeepers Trial/Library/metadata/ae/ae80e2caed0f6a8479ba3b3604e39ce4
      #	Zookeepers Trial/Library/metadata/cc/cc90e67fd939945489f1138d1179168d
      #	Zookeepers Trial/Library/metadata/d2/d2fac1114ff93e6498296dd02ae466cc
      #	Zookeepers Trial/Library/metadata/d7/d75682e2eeef4d44e8ef95860e233ba5
      #	Zookeepers Trial/Library/metadata/e0/e0bf1c78c054a6a408949e9df9521b90
      #	Zookeepers Trial/Library/metadata/ea/eac8a591b609c2e44b342900c77e01a5
      096eeb02
  4. Nov 11, 2016
  5. Nov 10, 2016
    • Graham Solie's avatar
      AI Tweaks · c90e185c
      Graham Solie authored
      Rebuilt the tree with more decisions, funky stuff was goin on
      c90e185c
  6. Nov 09, 2016
  7. Oct 29, 2016
  8. Oct 28, 2016
  9. Oct 10, 2016
Loading