Skip to content
Snippets Groups Projects
  1. Nov 27, 2016
    • Jordan's avatar
      Added 2 new animations, minor fix to slash anim · 01dee8fe
      Jordan authored
      - Throw
      - Push
      01dee8fe
    • Jordan's avatar
      New animations merge · fb871289
      Jordan authored
      # Conflicts:
      #	Zookeepers Trial/Library/CurrentLayout.dwlt
      #	Zookeepers Trial/Library/InspectorExpandedItems.asset
      #	Zookeepers Trial/Library/LastSceneManagerSetup.txt
      #	Zookeepers Trial/Library/ScriptAssemblies/Assembly-CSharp.dll
      #	Zookeepers Trial/Library/ScriptAssemblies/Assembly-CSharp.dll.mdb
      #	Zookeepers Trial/Library/assetDatabase3
      #	Zookeepers Trial/Library/metadata/00/00000000000000004000000000000000
      #	Zookeepers Trial/Library/metadata/00/00000000000000006100000000000000
      fb871289
Loading