Skip to content
Snippets Groups Projects
  1. Nov 19, 2016
  2. 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
  3. Nov 13, 2016
  4. Nov 12, 2016
  5. Nov 11, 2016
  6. 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
  7. Nov 09, 2016
  8. Nov 08, 2016
  9. Nov 07, 2016
    • Michael LaFreniere's avatar
      Shop Tweaks · 2564a257
      Michael LaFreniere authored
      Gets crazy skewed when screen size changes.... -__-
      Will have to play with that more... Looks decent at current screen size.
      - Couldn't figure out how to make a transparant background for the axes.
      2564a257
    • Michael LaFreniere's avatar
      Blacksmith Shop · dc579efe
      Michael LaFreniere authored
      *bugs:
      unsure why buttons are skewing size, can't figure out how to make them
      all the same regardless of text length in each.....
      - will have to make the weapon choice a permanent change through static
      variables - but i have to go eat supper so i'll figure that out later
      lol.
      dc579efe
    • Michael LaFreniere's avatar
      Door Text · 08d19642
      Michael LaFreniere authored
      entering a door area triggers a text to let the player know how to
      enter/exit
      08d19642
    • Graham Solie's avatar
      AI Fixes · 8a52b191
      Graham Solie authored
      Please keep Left is true and Right is false
      Started to add player health
      8a52b191
  10. Nov 02, 2016
  11. Oct 31, 2016
  12. Oct 30, 2016
  13. Oct 29, 2016
Loading