Added reference to Assembly-CSharp-vs to Assembly-CSharp-Editor-vs in VS2013 project.

Combat squad should now account for the space being occupied when attempting to add a unit.

Signed-off-by: Ken 'Minalien' Murray <minalien@gmail.com>
My side of combat is ready. Did some refactoring.
Forgot the scene. This scene has the camera setup.
Merge pull request #17 from AlexReiss/master

My side of combat is ready. Did some refactoring.
Merge branch 'master' of github.com:Tactibru/Game
Added combat system prefab.
Began work on combat system implementation.

Signed-off-by: Ken 'Minalien' Murray <minalien@gmail.com>
Refactored and updated serialization.
Very early squad editor prototype ready.

Signed-off-by: Ken 'Minalien' Murray <minalien@gmail.com>
Updated squad editor to show position alongside unit name.

Signed-off-by: Ken 'Minalien' Murray <minalien@gmail.com>
Initial combat prototype operational. This is nowhere near what will be ready for the gameplay demo, but it's a step closer.

Signed-off-by: Ken 'Minalien' Murray <minalien@gmail.com>
Updated combat system to account for appropriate combat rounds.

Signed-off-by: Ken 'Minalien' Murray <minalien@gmail.com>
Prototype for the combat system is implemented. Note that all combat occurs in debug output at the moment.

Signed-off-by: Ken 'Minalien' Murray <minalien@gmail.com>
Merge pull request #18 from Minalien/master

Implemented combat system.
Updated assets.
Merge pull request #19 from Minalien/master

Updated assets.
Updated "Awesome Unit" test prefab to be more balanced to show off the combat system. Note that this unit is not going to be used in-game, it exists just to test things.

Signed-off-by: Ken "Minalien" Murray <minalien@gmail.com>
Pulled in assets from Austin's demo level.

Signed-off-by: Ken "Minalien" Murray <minalien@gmail.com>
Added components for gameplay demo.

Signed-off-by: Ken "Minalien" Murray <minalien@gmail.com>
The back end of the grid editor is done but not tested. Waiting for Niel's work.
Removed test_Data and added it to gitignore.

Signed-off-by: Ken "Minalien" Murray <minalien@gmail.com>
Removed Standard Assets (& skyboxes).

Signed-off-by: Ken "Minalien" Murray <minalien@gmail.com>