+ Added AudioBehavior.cs which will handle Game music and combat music.
The back end of the grid editor is done but not tested. Waiting for Niel's work.
Made changes to the GridEditor.cs that didn't merge. Made inheritance come from the EditorBase rather than just editor

Signed-off-by: Neal Valiant <neavalia@uat.edu>
Merge https://github.com/n3amarvalia/Game into n3amarvalia-master

Conflicts:
	Assets/Scripts/Editor/GridEditor.cs
	Assets/Scripts/Editor/GridEditor.cs.meta

Signed-off-by: Ken "Minalien" Murray <minalien@gmail.com>
Working on depth search. Grid stuff isn't working in my build. Thinking that the upstream thing I emailed ken about is breaking my project.

Signed-off-by: Neal Valiant <neavalia@uat.edu>
Merge pull request #25 from AlexReiss/master

The back end of the grid editor is done but not tested. Waiting for Niel's wok
I changed a few things, in GridEditor.cs.
Merge pull request #26 from AlexReiss/master

I changed a few things, in GridEditor.cs.
Merge branch 'master' of https://github.com/Tactibru/Game

Conflicts:
	Assets/Prefabs/Waypoint.prefab.meta
	Assets/Scripts/Behaviors/MovePoint.cs
	Assets/Scripts/Behaviors/Movement/GridBehavior.cs

Signed-off-by: Neal Valiant <neavalia@uat.edu>
The grid editor, is working now. I need to figure how to delete the current move points when the function is called. I also need to figure out how to add the move points into the grid object.
Merge pull request #27 from n3amarvalia/master

Merge 10-7-2013
Merge pull request #28 from AlexReiss/master

The grid editor, is working now. I need to figure how to delete the current
Updated Grid Behavior.

Updated grid behavior to delete old grid objects and appropriately parent objects.
Update GridEditor.cs

Changed button text.
Added the game game controller not done yet, will commit later.
Added the ignore list, put the ignore into the path finding. Added win and loss condition, added a basic turn in the code, hit space to reset the turn. Added the option to have neutrals in the mission. Changed the GameController/GameControllerBehaviour.cs, to have the list for both of the sides, when either side is completely dead the win condition is triggered.

Have not added the separate turn for each side yet. Will implement later.
Merge pull request #29 from AlexReiss/master

The game controller is in, so is the win and loss conditions.
+Changed Audio clips to a list of audio clips that can be accessed in the editor (Can add or delete audio clips from the list)
+The audio will play an audio clip from the list either by random or to its position in the list

Signed-off-by: Adester <Dsternejr@gmail.com>
Merge branch 'master' of https://github.com/Tactibru/Game
Merge pull request #30 from Adester/master

Audio Behavior / Audio Manager