Update

Signed-off-by: KayFriday <k.viernes@hotmail.com>
Merge branch 'master' of https://github.com/Tactibru/Game
Merge branch 'master' of https://github.com/Tactibru/Game
[Lvl 6-9] Replaced main camera with new prefab (w/mini-map)
Added terrain [Lvl 6-9] and water [Lvl 6]

Signed-off-by: KayFriday <k.viernes@hotmail.com>
Updated HonorSystem to include squad death values that can be editted by the designers

Signed-off-by: adester <DSternejr@gmail.com>
The unit creator to this, I need to know how to raycast towards the screen.
Added in Terrain for all of my levels (03-05, and Arena) to allow for textures to be applied easily and smoothly.

Added in both the New HUD with Minimap and Type Writer system after much finangling to understand the Minimap instructions.

Will be adding in the Morale system shortly as well, expect another commit.
Merge pull request #184 from Adester/master

Updated HonorSystem to include squad death values that can be editted by...
Merge branch 'master' of https://github.com/Tactibru/Game
Added in the new Morale system and tested it out. Things seem to be working great other than unit types not affecting starting Honor but I am already aware of that and it should be fixed soon.

Also practiced adding new textures with the plain grass in the TestingArena.
Merge pull request #188 from Minalien/master

Updated unit shaders.
Merge pull request #185 from AlexReiss/master

The unit creator to this, I need to know how to raycast towards the screen
Added honor system and typewriter to levels 6-9

Signed-off-by: KayFriday <k.viernes@hotmail.com>
Set camera, HUD, typewriter, and honor system to levels 1,2,10, and 11.
Terrain...
terrain again...
More terrain and removing of whiteboxes.
Merge pull request #190 from austinshamp/master

Austin's Levels w/ New HUD, Terrain, etc
Relocated and renamed terrains.

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

Updated levels 6-9