Michael Turcotte 734c5e80e5 Merge branch 'master' of https://github.com/ConjureETS/Human-Farm-Tycoon ...

Conflicts:
	Assets/Scene/GameBoard.unity
	Assets/Script/Stats.cs

2015-08-13 14:11:33 -04:00

..

Controller

Panel for ressource work.

2015-08-13 12:06:18 -04:00

Editor

Initiale setup project. Should work

2015-08-10 16:03:32 -04:00

Model

Merge branch 'master' of https://github.com/ConjureETS/Human-Farm-Tycoon

2015-08-12 16:13:26 -04:00

Prefabs

Commit Antoine Prefab Assets et Gameboard

2015-08-13 13:29:57 -04:00

Scene

Merge branch 'master' of https://github.com/ConjureETS/Human-Farm-Tycoon

2015-08-13 14:11:33 -04:00

Script

Merge branch 'master' of https://github.com/ConjureETS/Human-Farm-Tycoon

2015-08-13 14:11:33 -04:00

Sprite

Merge branch 'master' of https://github.com/ConjureETS/Human-Farm-Tycoon

2015-08-13 13:39:57 -04:00

Standard Assets

Gameboard

2015-08-10 17:57:31 -04:00

View

Updated some of our Model Classes.

2015-08-12 16:08:14 -04:00

Controller.meta

Updated some of our Model Classes.

2015-08-12 16:08:14 -04:00

Editor.meta

Initiale setup project. Should work

2015-08-10 16:03:32 -04:00

Model.meta

Updated some of our Model Classes.

2015-08-12 16:08:14 -04:00

Prefab.meta

Panel for ressource work.

2015-08-13 12:06:18 -04:00

Prefabs.meta

Commit Antoine Prefab Assets et Gameboard

2015-08-13 13:29:57 -04:00

Scene.meta

Add a button in menu scene. It's a test

2015-08-10 16:09:47 -04:00

SceneAntoine.unity

Commit Antoine Prefab Assets et Gameboard

2015-08-13 13:29:57 -04:00

SceneAntoine.unity.meta

Commit Antoine Prefab Assets et Gameboard

2015-08-13 13:29:57 -04:00

Script.meta

Menu de départ non finalise

2015-08-11 09:59:12 -04:00

Sprite.meta

Add some sprite and some modification.

2015-08-12 16:13:19 -04:00

Standard Assets.meta

Initiale setup project. Should work

2015-08-10 16:03:32 -04:00

View.meta

Updated some of our Model Classes.

2015-08-12 16:08:14 -04:00