Merge pull request #31 from rednaz/development

merging dev into evan-dev
Merge pull request #34 from rednaz/development

Merging fixed project into zan-dev-test
Merge pull request #35 from rednaz/development

Merging fixed project into evan-test
Added basic blocking (EnemyAI)

- changed var "player" to type "PlayerController"
- added Transform "playerTransform"
- all previous entries of "player" changed to "playerTransform"

- changed phase 1 setup to check if handleInterrupt passes
- handleInterrupt ()
- changed to bool (probably not needed)
- removed running assignment
- added check for playerAttack

- block ()
- added print statement for debugging
- random variable, will block only 50% of the time (currently)
- if blocking, sets movement to away from player (NOTE:  MUST BE CHANGED
TO DETECT PROPER SIDE OF AI)
- sets running frames to 2
- returns that it has blocked
Begin testing UI with player variables

Slightly modified the player controller scripts to use both health and
maximum health variables for ease of development.

Strangely, C Player is having max health issues. This will be addressed
in a later commit.
"KO/Time Over" implemented, health UI modified

GUI displaying either KO or "Time Over" messages has been implemented.

Modified health-related GUI to directly use PlayerController health
variables instead of saving their values locally. Slightly modified
Player Controller by adding maxHealth variable, setting its value, and
then setting the normal "health" variable to maxHealth.
Merge pull request #36 from rednaz/chico-dev

Chico dev
Conflict Resolution
Merge pull request #37 from rednaz/evan-dev

Evan dev
conflict resolution
Merge pull request #38 from rednaz/zan-dev-test

Zan dev test
Changed maxhealth back to 1000
Merge pull request #40 from rednaz/development

merging development into chico-dev