Skip to content
Snippets Groups Projects
  1. Oct 29, 2016
    • Graham Solie's avatar
      Advanced AI created · 884aa8d7
      Graham Solie authored
      So Smart
      884aa8d7
    • Graham Solie's avatar
      Merge remote-tracking branch 'origin/master' · 8f2a2201
      Graham Solie authored
      # Conflicts:
      #	Zookeepers Trial/Assets/Scenes/mainScene1.unity
      #	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/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/cc/cc90e67fd939945489f1138d1179168d
      8f2a2201
    • Michael LaFreniere's avatar
      Started implenting damage based on which weapon is equipped · 643f8449
      Michael LaFreniere authored
      Not finished, brain is quitting - will come back to! (Collision script)
      643f8449
    • Graham Solie's avatar
      Modified edges · 85557b42
      Graham Solie authored
      restrics movement past shops
      85557b42
    • Jordan's avatar
      readding a few change · cb2b31b8
      Jordan authored
      cb2b31b8
  2. Oct 28, 2016
  3. Oct 12, 2016
  4. Oct 10, 2016
  5. Oct 08, 2016
  6. Sep 22, 2016
Loading