Added shards and orbs currencies
Added shards and orbs currencies (updated)
Merge pull request #1 from ChristianDevs/HEAD

Adding shards and orbs currencies
Added unit upgrade feature
Added unit upgrade feature (updated)
Merge pull request #2 from ChristianDevs/HEAD

Added unit upgrade feature
fixed timer bug

Added a bug fix to replaying levels
Merge pull request #3 from codergreen/master

fixed timer bug
Fixed upgrade bugs
Fixed drag-and-drop null reference error
Added Options

Added Options Prefab and Script for evaluation to AttackSceneLeft only
Merge pull request #4 from codergreen/master

Added Options
Fixed getStats null reference bug
Merge pull request #5 from brandav/dev

Unit upgrade and bug fixes test
Update assets

BarRed prefab was missing
Merge pull request #6 from brandav/dev

Update assets
Unit UI

An update to unit UI

Unit UI Positioning

Unit UI swaps sides depending on what side you are on

Revert "Unit UI Positioning"

This reverts commit a21d6041bf91d18e925bd913f4298a7604c76063.

Revert "Revert "Unit UI Positioning""

This reverts commit 33e7596b886dabf198d79ee6b6ae3d4d6004e6af.

Removed junk files

Needs double checked

Project Settings added back

included fix

Unit UI Positioning

Unit UI swaps sides depending on what side you are on

Revert "Unit UI Positioning"

This reverts commit a21d6041bf91d18e925bd913f4298a7604c76063.

Unit UI Positioning

Unit UI swaps sides depending on what side you are on

Unit UI Positioning

Unit UI swaps sides depending on what side you are on

Revert "Unit UI Positioning"

This reverts commit a21d6041bf91d18e925bd913f4298a7604c76063.

Revert "Unit UI Positioning"

This reverts commit 8ff3a2aec69ac0364f7fd44526b238752d754127.

Finally

done
Options Update

Options on all levels
Merge remote-tracking branch 'upstream/master'

Conflicts:
	Gates of Mansole/Assets/Scenes/AttackSceneLeft.unity
removed junk files