Merge remote-tracking branch 'origin/master'
# Conflicts: # view/FormMainMenu.Designer.cs
Showing
- model/Map.cs 8 additions, 1 deletionmodel/Map.cs
- model/Tile.cs 8 additions, 1 deletionmodel/Tile.cs
- view/Controls/MapView.cs 12 additions, 1 deletionview/Controls/MapView.cs
- view/Controls/TileView.cs 3 additions, 1 deletionview/Controls/TileView.cs
- view/FormJeu.cs 5 additions, 0 deletionsview/FormJeu.cs
- view/FormJeu.resx 1165 additions, 138693 deletionsview/FormJeu.resx
- view/FormMainMenu.Designer.cs 12 additions, 0 deletionsview/FormMainMenu.Designer.cs