Skip to content
Snippets Groups Projects
  1. Nov 26, 2016
    • Michael LaFreniere's avatar
      Merge remote-tracking branch 'origin/master' · f255a630
      Michael LaFreniere authored
      # Conflicts:
      #	Zookeepers Trial/Assets/Scenes/Town01.unity
      #	Zookeepers Trial/Library/CurrentLayout.dwlt
      #	Zookeepers Trial/Library/CurrentMaximizeLayout.dwlt
      #	Zookeepers Trial/Library/LastSceneManagerSetup.txt
      #	Zookeepers Trial/Library/assetDatabase3
      #	Zookeepers Trial/Library/expandedItems
      #	Zookeepers Trial/Library/metadata/00/00000000000000004000000000000000
      #	Zookeepers Trial/Library/metadata/00/00000000000000006100000000000000
      f255a630
  2. Nov 14, 2016
  3. Nov 13, 2016
  4. Nov 09, 2016
    • Jordan's avatar
      Starting character creation · d63a97c8
      Jordan authored
      - Added stats script which will be filled in during character creation
      - Added character creation scene
      - UI not really implemented at this point
      d63a97c8
  5. Oct 10, 2016
  6. Oct 08, 2016
  7. Sep 22, 2016
Loading