19 Commits

Author SHA1 Message Date
Marc-Antoine Dumont
4abd161d59 Modification of the UI and HungerPanel work. 2015-08-15 18:33:51 -04:00
Marc-Antoine Dumont
57513d7d77 Random event and end turn work. 2015-08-14 10:20:11 -04:00
Marc-Antoine Dumont
d5cd425061 Add Random Even(not finish). and some finalisation. 2015-08-14 01:02:28 -04:00
Marc-Antoine Dumont
30d6f29f80 Merge branch 'master' of https://github.com/ConjureETS/Human-Farm-Tycoon 2015-08-13 21:10:30 -04:00
Marc-Antoine Dumont
cf4d125764 Add splashscreen, FarmPanel and VillagePanel. Modification of MAScene. 2015-08-13 21:10:25 -04:00
unknown
9faadc585d Merge branch 'master' of https://github.com/ConjureETS/Human-Farm-Tycoon 2015-08-13 19:27:41 -04:00
unknown
60db101ce2 Antoine GameBoard + Panel 2015-08-13 19:27:07 -04:00
Michael Turcotte
be73c8fdc8 Added a test to my scene where we can end a turn and see the hunger being affected.
Added some functions to the Stats script.
Added the HungerScript to manage the hunger bars.
2015-08-13 17:40:12 -04:00
unknown
b3499addc0 Merge branch 'master' of https://github.com/ConjureETS/Human-Farm-Tycoon 2015-08-13 15:25:35 -04:00
unknown
2911b3aaf3 Modif scene Antoine 2015-08-13 15:25:25 -04:00
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
unknown
29352dba1b Merge branch 'master' of https://github.com/ConjureETS/Human-Farm-Tycoon 2015-08-13 13:39:57 -04:00
unknown
ff3dc23d58 Commit Antoine Prefab Assets et Gameboard 2015-08-13 13:29:57 -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
e1389233cb Added some missing variables in Stats. (Humans, Zombies) 2015-08-12 17:27:28 -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
193ac3d8b3 Menu de départ non finalise 2015-08-11 09:59:12 -04:00