Merge remote-tracking branch 'origin/develop' into Antoine
Modify GamePage & add InfoBox UserControls
Merge remote-tracking branch 'origin/Emilie' into Antoine
Village object created
Add family gold stash modification
Modify gold type
Bug fixed
CloseStep()
Begin village tests
Merge remote-tracking branch 'origin/Village' into Emilie
Modeling.
structural changes not finished. tests red.
Merge remote-tracking branch 'origin/fx-spi-model' into Emilie
Merge remote-tracking branch 'origin/fx-spi-model' into Stéphane
more changes, not over. does not compile.
more more changes, not over, does not compile.
more more more. absolutely unstable.
about right. began rewriting tests.
took out thisGame, (use Game instead)
Beginning of Contextual Menu InGame