Conjure/Human-Farm-Tycoon
6
0
Fork 0
mirror of https://github.com/ConjureETS/Human-Farm-Tycoon.git synced 2026-03-24 10:21:06 +00:00
Code Issues Packages Projects Releases Wiki Activity
48 Commits 1 Branch 0 Tags
Commit Graph

29 Commits

Author SHA1 Message Date
unknown
de094d4488 Merge avec shit de Mike 2015-08-14 18:12:29 -04:00
Marc-Antoine Dumont
c1b929d5c0 Merge scene MAScene and AntoineScene. 2015-08-14 11:52:29 -04:00
Marc-Antoine Dumont
3bed6f6f84 Merge branch 'master' of https://github.com/ConjureETS/Human-Farm-Tycoon 2015-08-14 11:06:08 -04:00
unknown
9314f3f74e Antoine GameBoard + Panel 2 2015-08-14 11:05:12 -04:00
Marc-Antoine Dumont
ded44cc258 Want AntoineScene 2015-08-14 11:04:01 -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
Marc-Antoine Dumont
47f8963dab Modification of assets and creation of MikeScene. 2015-08-13 15:06:03 -04:00
Marc-Antoine Dumont
92a3f7b270 Merge branch 'master' of https://github.com/ConjureETS/Human-Farm-Tycoon 2015-08-13 14:51:06 -04:00
Marc-Antoine Dumont
02959e8765 Modifcation of position of SceneAntoine and creation MAScene. 2015-08-13 14:50:43 -04:00
Michael Turcotte
5f731eac0d Praying to god that nothing explodes. Pushing gameboard with my changes (panel to accept changes for a day). 2015-08-13 14:47:33 -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
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
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
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
193ac3d8b3 Menu de départ non finalise 2015-08-11 09:59:12 -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