Commit Graph

Select branches

Hide Pull Requests

master

Mono Color

• c99fb32b5e Version Finale master unknown 2015-08-17 00:02:33 -04:00
• 7d4c0f1050 Version Finale unknown 2015-08-16 23:45:01 -04:00
• df68564ce6 Jeu pas tout a fait terminer unknown 2015-08-16 23:19:35 -04:00
• 1caf4fa7ff Jeu pas tout a fait terminer unknown 2015-08-16 23:17:52 -04:00
• 4abd161d59 Modification of the UI and HungerPanel work. Marc-Antoine Dumont 2015-08-15 18:33:51 -04:00
• 3d02ac7f7f More shit I did unknown 2015-08-14 18:36:57 -04:00
• de094d4488 Merge avec shit de Mike unknown 2015-08-14 18:12:29 -04:00
• c1b929d5c0 Merge scene MAScene and AntoineScene. Marc-Antoine Dumont 2015-08-14 11:52:29 -04:00
• 3bed6f6f84 Merge branch 'master' of https://github.com/ConjureETS/Human-Farm-Tycoon Marc-Antoine Dumont 2015-08-14 11:06:08 -04:00
• 9314f3f74e Antoine GameBoard + Panel 2 unknown 2015-08-14 11:05:12 -04:00
• ded44cc258 Want AntoineScene Marc-Antoine Dumont 2015-08-14 11:04:01 -04:00
• 57513d7d77 Random event and end turn work. Marc-Antoine Dumont 2015-08-14 10:20:11 -04:00
• d5cd425061 Add Random Even(not finish). and some finalisation. Marc-Antoine Dumont 2015-08-14 01:02:28 -04:00
• 30d6f29f80 Merge branch 'master' of https://github.com/ConjureETS/Human-Farm-Tycoon Marc-Antoine Dumont 2015-08-13 21:10:30 -04:00
• cf4d125764 Add splashscreen, FarmPanel and VillagePanel. Modification of MAScene. Marc-Antoine Dumont 2015-08-13 21:10:25 -04:00
• 9faadc585d Merge branch 'master' of https://github.com/ConjureETS/Human-Farm-Tycoon unknown 2015-08-13 19:27:41 -04:00
• 60db101ce2 Antoine GameBoard + Panel unknown 2015-08-13 19:27:07 -04:00
• 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. Michael Turcotte 2015-08-13 17:40:12 -04:00
• b3499addc0 Merge branch 'master' of https://github.com/ConjureETS/Human-Farm-Tycoon unknown 2015-08-13 15:25:35 -04:00
• 2911b3aaf3 Modif scene Antoine unknown 2015-08-13 15:25:25 -04:00
• 47f8963dab Modification of assets and creation of MikeScene. Marc-Antoine Dumont 2015-08-13 15:06:03 -04:00
• 92a3f7b270 Merge branch 'master' of https://github.com/ConjureETS/Human-Farm-Tycoon Marc-Antoine Dumont 2015-08-13 14:51:06 -04:00
• 02959e8765 Modifcation of position of SceneAntoine and creation MAScene. Marc-Antoine Dumont 2015-08-13 14:50:43 -04:00
• 5f731eac0d Praying to god that nothing explodes. Pushing gameboard with my changes (panel to accept changes for a day). Michael Turcotte 2015-08-13 14:47:33 -04:00
• 734c5e80e5 Merge branch 'master' of https://github.com/ConjureETS/Human-Farm-Tycoon Michael Turcotte 2015-08-13 14:11:33 -04:00
• 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. Michael Turcotte 2015-08-13 13:59:26 -04:00
• 29352dba1b Merge branch 'master' of https://github.com/ConjureETS/Human-Farm-Tycoon unknown 2015-08-13 13:39:57 -04:00
• ff3dc23d58 Commit Antoine Prefab Assets et Gameboard unknown 2015-08-13 13:29:57 -04:00
• d71e178ce6 Panel for ressource work. Marc-Antoine Dumont 2015-08-13 12:06:18 -04:00
• f1d0093b5d Add panel worker and modification for it. Marc-Antoine Dumont 2015-08-13 09:36:02 -04:00
• 47f1d52e44 Merge branch 'master' of https://github.com/ConjureETS/Human-Farm-Tycoon Marc-Antoine Dumont 2015-08-12 18:13:47 -04:00
• dc07b32057 Modification of the name of a class. Marc-Antoine Dumont 2015-08-12 18:13:42 -04:00
• 8c4dbda19c Merge branch 'master' of https://github.com/ConjureETS/Human-Farm-Tycoon Mike 2015-08-12 17:27:55 -04:00
• e1389233cb Added some missing variables in Stats. (Humans, Zombies) Mike 2015-08-12 17:27:28 -04:00
• 93d52ee2a8 Merge branch 'master' of https://github.com/ConjureETS/Human-Farm-Tycoon Marc-Antoine Dumont 2015-08-12 16:13:26 -04:00
• bb047041e3 Add some sprite and some modification. Marc-Antoine Dumont 2015-08-12 16:13:19 -04:00
• 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. Mike 2015-08-12 16:08:14 -04:00
• adbb55054f Saving the GameBoard scene. Marc-Antoine Dumont 2015-08-12 12:31:58 -04:00
• 999eca061a Merge branch 'master' of https://github.com/ConjureETS/Human-Farm-Tycoon Marc-Antoine Dumont 2015-08-12 11:58:14 -04:00
• 9cbd459ec4 Correction of mistake between Controller and View. Marc-Antoine Dumont 2015-08-12 11:58:10 -04:00
• 4c0b0af058 Merge branch 'master' of https://github.com/ConjureETS/Human-Farm-Tycoon Mike 2015-08-12 11:53:38 -04:00
• 0229887a25 Committing the Maison and MaisonZombie files to the modèle folder. Mike 2015-08-12 11:53:25 -04:00
• c845b4d18b Add some class for MVC (not done) and modification of folder name. Marc-Antoine Dumont 2015-08-12 11:40:59 -04:00
• c2c65239cd Changement du positionnement de la scène GameBoard Marc-Antoine Dumont 2015-08-11 10:04:45 -04:00
• 90dbc4aee3 Merge branch 'master' of https://github.com/ConjureETS/Human-Farm-Tycoon Marc-Antoine Dumont 2015-08-11 09:59:29 -04:00
• 193ac3d8b3 Menu de départ non finalise Marc-Antoine Dumont 2015-08-11 09:59:12 -04:00
• 978e27a6f4 Gameboard unknown 2015-08-10 17:57:31 -04:00
• 376f752748 Commit antoine unknown 2015-08-10 16:29:37 -04:00
• 42618189a0 Add a button in menu scene. It's a test Marc-Antoine Dumont 2015-08-10 16:09:47 -04:00
• cb7ff0c3e8 Initiale setup project. Should work Marc-Antoine Dumont 2015-08-10 16:03:32 -04:00
• e0f1d7e0f6 Delete Unity stuff Marc-Antoine Dumont 2015-08-10 15:45:51 -04:00
• f90bfccff5 - Initial commit Marc-Antoine Dumont 2015-08-10 15:36:37 -04:00
• 388ba8f7fc Modification GitIgnore Marc-Antoine Dumont 2015-08-10 15:23:27 -04:00
• 18e91f8da9 Initial commit MaDumont 2015-08-10 15:10:36 -04:00