Commits · 00d4e6c9a049bf03fb0fcd73a2b822fe01c4c3ca · Ryan Hoppe (rmh898) / OriginalGladiator

Nov 27, 2016
- Desert Doors fixed · 00d4e6c9
  Ryan Hoppe (rmh898) authored 8 years ago
  
  00d4e6c9
- Merge remote-tracking branch 'origin/master' · b79da9c2
  Michael LaFreniere authored 8 years ago
  
  b79da9c2
- For Ryan · fcff29f8
  Michael LaFreniere authored 8 years ago
  
  fcff29f8
- AI Tweaks · 1898b07b
  Graham Solie authored 8 years ago
  
  1898b07b
Nov 26, 2016
- Blacksmith, Church, & Armoury all functional. · d47db6eb
  Michael LaFreniere authored 8 years ago
  
  whoop whoop!
  d47db6eb
- Merge remote-tracking branch 'origin/master' · 7387adda
  Michael LaFreniere authored 8 years ago
  
  7387adda
- Armoury Coming Together - Still lots to do.. · 3414f533
  Michael LaFreniere authored 8 years ago
  
  3414f533
- Merge remote-tracking branch 'origin/master' · 151f83ce
  Graham Solie authored 8 years ago
  
  151f83ce
- Desert Arena - Battle of the cat faced men · 78dcfd34
  Graham Solie authored 8 years ago
  
  78dcfd34
- Merge remote-tracking branch 'origin/master' · f255a630
  Michael LaFreniere authored 8 years ago
  
  # 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
- Merge remote-tracking branch 'origin/master' · cc2bcc61
  Michael LaFreniere authored 8 years ago
  
  cc2bcc61
- Minor UI Tweaks - Getting Armory · 02c2bd26
  Michael LaFreniere authored 8 years ago
  
  New shop up and running soon!
  02c2bd26
- Merge remote-tracking branch 'origin/master' · bcc46800
  Graham Solie authored 8 years ago
  
  bcc46800
- Armoury Added, with sign post · dd958146
  Graham Solie authored 8 years ago
  
  dd958146
- Blessings last for one arena fight · 19d0b088
  Michael LaFreniere authored 8 years ago
  
  19d0b088
- Merge remote-tracking branch 'origin/master' · 3a510c08
  Michael LaFreniere authored 8 years ago
  
  3a510c08
- Blessings · 1a16a222
  Michael LaFreniere authored 8 years ago
  
  1a16a222
- Background between Towns · 152ddad8
  Graham Solie authored 8 years ago
  
  152ddad8
Nov 25, 2016
- Church: Colour Notifcations, Fonts, & Anchors · f2220a88
  Michael LaFreniere authored 8 years ago
  
  f2220a88
- Church Buttons Working · dde2f590
  Michael LaFreniere authored 8 years ago
  
  dde2f590
- Added More Scriptable Objects · e24b5c5a
  Michael LaFreniere authored 8 years ago
  
  assets -> create -> new potion/armour
  e24b5c5a
- UI is so tedious · d4eb41d9
  Michael LaFreniere authored 8 years ago
  
  added church-ideas.txt, give it a read and give me some feedback!
  d4eb41d9
- Initial Church UI Settings · 0797689a
  Michael LaFreniere authored 8 years ago
  
  0797689a
- Scripts added to travel scene + "spawn" ;) · 4923b9ad
  Michael LaFreniere authored 8 years ago
  
  4923b9ad
- Merge remote-tracking branch 'origin/master' · 63c1c683
  Michael LaFreniere authored 8 years ago
  
  63c1c683
- The Shop Has Swords Now!! · 55936bbf
  Michael LaFreniere authored 8 years ago
  
  55936bbf
- camera for platformer · 7c28c569
  Mitchel Kovacs (mdk181) authored 8 years ago
  
  7c28c569
- inbetween worlds has random platforms and enemies · 5453c932
  mitchelkovacs authored 8 years ago
  
  5453c932
- makes enemies chase player · e91488fd
  Mitchel Kovacs (mdk181) authored 8 years ago
  
  e91488fd
- inbetween worlds has random platforms and enemies · 6c8682b9
  mitchelkovacs authored 8 years ago
  
  6c8682b9
- conflict · 43526433
  Mitchel Kovacs (mdk181) authored 8 years ago
  
  43526433
- inbetween worlds has random platforms and enemies · c8a99d2f
  mitchelkovacs authored 8 years ago
  
  c8a99d2f
- inbetween worlds has random platforms and enemies · 05cbb9b8
  mitchelkovacs authored 8 years ago
  
  05cbb9b8
- AI now Kicks to disarm your shield · 12aac6e0
  Graham Solie authored 8 years ago
  
  12aac6e0
- Oops forgot to push the AI · 6e4b7990
  Graham Solie authored 8 years ago
  
  6e4b7990
- AI Tweak Push before I break it with Kicks · 6e479301
  Graham Solie authored 8 years ago
  
  Just getting a working copy before I break it
  6e479301
- Merge branch 'master' of https://git.cs.usask.ca/mrl718/306-Group-Project · 6452f628
  Graham Solie authored 8 years ago
  
  6452f628
- Little · 3fe70388
  Graham Solie authored 8 years ago
  
  3fe70388
- f · 803ac1df
  Mitchel Kovacs (mdk181) authored 8 years ago
  
  803ac1df
- because · 1a1d9d80
  Mitchel Kovacs (mdk181) authored 8 years ago
  
  1a1d9d80