Commits · a9d2b2277513c06ee1383206baf15ae728b57fc2 · Ryan Hoppe (rmh898) / OriginalGladiator

Nov 24, 2016
- Made a "Random Features" Button in char creation · a9d2b227
  Ryan Hoppe (rmh898) authored 8 years ago
  
  a9d2b227
Nov 23, 2016
- Minor fixes to character creation, added branch weapon · 97e4a43f
  Jordan authored 8 years ago
  
  97e4a43f
- Added PreFight scene · a2a812c6
  Jordan authored 8 years ago
  
  - Enemy will be generated here - Has timer that auto loads arena scene
  a2a812c6
- Added default character values · 492ccd37
  Jordan authored 8 years ago
  
  492ccd37
- Persistent money tweak · 3c9a4ae3
  Michael LaFreniere authored 8 years ago
  
  Moved one line of code.... don't count this commit ;)
  3c9a4ae3
- Currency System · 3e16df32
  Michael LaFreniere authored 8 years ago
  
  Script is called 'Money' with methods to get current money, add money, and subtract money. (win a fight, add money, etc.)
  3e16df32
- Pleeeease work · e196e5ed
  Ryan Hoppe (rmh898) authored 8 years ago
  
  e196e5ed
- Please work · c7dfa915
  Ryan Hoppe (rmh898) authored 8 years ago
  
  c7dfa915
- AI Tweaks · fd94fe64
  Graham Solie authored 8 years ago
  
  Added more actions, combat feels more life like
  fd94fe64
- Having troubles keeping references intact when uploading, hopefully this works... · 7ae9d71e
  Ryan Hoppe (rmh898) authored 8 years ago
  
  7ae9d71e
- sword · b5540420
  Ryan Hoppe (rmh898) authored 8 years ago
  
  b5540420
- shield · 49fc850c
  Ryan Hoppe (rmh898) authored 8 years ago
  
  49fc850c
- legs · f2ac584d
  Ryan Hoppe (rmh898) authored 8 years ago
  
  f2ac584d
- head · 3ac665f8
  Ryan Hoppe (rmh898) authored 8 years ago
  
  3ac665f8
- face · e57997cb
  Ryan Hoppe (rmh898) authored 8 years ago
  
  e57997cb
- Making a folder for randomly generating enemy appearance... · 52fc5b3f
  Ryan Hoppe (rmh898) authored 8 years ago
  
  52fc5b3f
- zip doesnt work, re-uploading · 52b5e6d6
  Ryan Hoppe (rmh898) authored 8 years ago
  
  52b5e6d6
- Randomly generates enemy appearance. · 29af5c72
  Ryan Hoppe (rmh898) authored 8 years ago
  
  29af5c72
- Fixed previous code, making unallocated requirement work. Also made it so you... · 1b25f9ad
  Ryan Hoppe (rmh898) authored 8 years ago
  
  Fixed previous code, making unallocated requirement work. Also made it so you must enter a name field. Will work on printing an 'error' message viewable by player.
  1b25f9ad
- Fixing update from yesterday, editing script to work with MainMenu.cs · e5885477
  Ryan Hoppe (rmh898) authored 8 years ago
  
  e5885477
Nov 22, 2016
- Added Potential Starting Wep? · b11cff8c
  Graham Solie authored 8 years ago
  
  b11cff8c
- Need to find a way to print this, tried, but cant make text fields static... Suggestions? · 17d771b0
  Ryan Hoppe (rmh898) authored 8 years ago
  
  17d771b0
- Changing character creation screen so you cannot proceed without allocating all stats... · 11b641b5
  Ryan Hoppe (rmh898) authored 8 years ago
  
  11b641b5
- A few comments and working on name persisting through creation · fb7fcef4
  Jordan authored 8 years ago
  
  fb7fcef4
Nov 21, 2016
- Tree rebuilt · e8d2ffdc
  Graham Solie authored 8 years ago
  
  e8d2ffdc
Nov 20, 2016
- scene for in between town 1 and town 2 · ae5bec35
  Mitchel Kovacs (mdk181) authored 8 years ago
  
  ae5bec35
- script for player movement in between worlds · e71c5670
  Mitchel Kovacs (mdk181) authored 8 years ago
  
  e71c5670
- Shop Button Hover - show stats · 4d8a16e9
  Michael LaFreniere authored 8 years ago
  
  4d8a16e9
- Block Timer · f0d0ac36
  Graham Solie authored 8 years ago
  
  can no longer hold block for ever
  f0d0ac36
- Shop - Dynamic Sprite · 1b563b4e
  Michael LaFreniere authored 8 years ago
  
  1b563b4e
- Health Bars · 3a494d7c
  Graham Solie authored 8 years ago
  
  3a494d7c
Nov 19, 2016
- AI Delay- YAY · cdbc47f2
  Graham Solie authored 8 years ago
  
  cdbc47f2
Nov 14, 2016

Added Kick and Drink animations · e473cabe
Jordan authored 8 years ago

e473cabe

Jordan authored 8 years ago

- 7 new shields added
- 2 new legs
- 1 new face
- 2 new background

ad2106a9

Cross Your Fingers (whole project fix ;)) · a6192cd4
Michael LaFreniere authored 8 years ago

a6192cd4
reverting back to mikes commit · 950bd3e0
mitchelkovacs authored 8 years ago

950bd3e0
Revert "Revert "commit before reverting"" · a196d2f6
mitchelkovacs authored 8 years ago
```
This reverts commit 9c227764.
```
a196d2f6
Revert "commit before reverting" · 9c227764
mitchelkovacs authored 8 years ago
```
This reverts commit eecf28f8.
```
9c227764
commit before reverting · eecf28f8
mitchelkovacs authored 8 years ago

eecf28f8

Yolo Commit · 096eeb02

Graham Solie authored 8 years ago

# 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