8 Commits

Author SHA1 Message Date
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
Michael Turcotte
1e59b9fb12 Added the panel for ending the turn that notifies the changes you're about to make to your game (still needs some functionality like cancel).
Added some functions in Stats.
2015-08-13 13:59:26 -04:00
Marc-Antoine Dumont
d71e178ce6 Panel for ressource work. 2015-08-13 12:06:18 -04:00
Marc-Antoine Dumont
f1d0093b5d Add panel worker and modification for it. 2015-08-13 09:36:02 -04:00
Mike
00ac24146f Updated some of our Model Classes.
New Class: Stats (Main class storing our variables for our resources)
Added some buttons and text fields to the scene to show off the functionality of our Stats class.
2015-08-12 16:08:14 -04:00
Marc-Antoine Dumont
adbb55054f Saving the GameBoard scene. 2015-08-12 12:31:58 -04:00
Marc-Antoine Dumont
c845b4d18b Add some class for MVC (not done) and modification of folder name. 2015-08-12 11:40:59 -04:00
Marc-Antoine Dumont
c2c65239cd Changement du positionnement de la scène GameBoard 2015-08-11 10:04:45 -04:00