26 Commits

Author SHA1 Message Date
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
f1d0093b5d Add panel worker and modification for it. 2015-08-13 09:36:02 -04:00
Marc-Antoine Dumont
47f1d52e44 Merge branch 'master' of https://github.com/ConjureETS/Human-Farm-Tycoon 2015-08-12 18:13:47 -04:00
Marc-Antoine Dumont
dc07b32057 Modification of the name of a class. 2015-08-12 18:13:42 -04:00
Mike
8c4dbda19c Merge branch 'master' of https://github.com/ConjureETS/Human-Farm-Tycoon 2015-08-12 17:27:55 -04:00
Mike
e1389233cb Added some missing variables in Stats. (Humans, Zombies) 2015-08-12 17:27:28 -04:00
Marc-Antoine Dumont
93d52ee2a8 Merge branch 'master' of https://github.com/ConjureETS/Human-Farm-Tycoon 2015-08-12 16:13:26 -04:00
Marc-Antoine Dumont
bb047041e3 Add some sprite and some modification. 2015-08-12 16:13:19 -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
999eca061a Merge branch 'master' of https://github.com/ConjureETS/Human-Farm-Tycoon 2015-08-12 11:58:14 -04:00
Marc-Antoine Dumont
9cbd459ec4 Correction of mistake between Controller and View. 2015-08-12 11:58:10 -04:00
Mike
4c0b0af058 Merge branch 'master' of https://github.com/ConjureETS/Human-Farm-Tycoon 2015-08-12 11:53:38 -04:00
Mike
0229887a25 Committing the Maison and MaisonZombie files to the modèle folder. 2015-08-12 11:53:25 -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
Marc-Antoine Dumont
90dbc4aee3 Merge branch 'master' of https://github.com/ConjureETS/Human-Farm-Tycoon 2015-08-11 09:59:29 -04:00
Marc-Antoine Dumont
193ac3d8b3 Menu de départ non finalise 2015-08-11 09:59:12 -04:00
unknown
978e27a6f4 Gameboard 2015-08-10 17:57:31 -04:00
unknown
376f752748 Commit antoine 2015-08-10 16:29:37 -04:00
Marc-Antoine Dumont
42618189a0 Add a button in menu scene. It's a test 2015-08-10 16:09:47 -04:00
Marc-Antoine Dumont
cb7ff0c3e8 Initiale setup project. Should work 2015-08-10 16:03:32 -04:00
Marc-Antoine Dumont
e0f1d7e0f6 Delete Unity stuff 2015-08-10 15:45:51 -04:00
Marc-Antoine Dumont
f90bfccff5 - Initial commit 2015-08-10 15:36:37 -04:00
Marc-Antoine Dumont
388ba8f7fc Modification GitIgnore 2015-08-10 15:23:27 -04:00
MaDumont
18e91f8da9 Initial commit 2015-08-10 15:10:36 -04:00