Merge branch 'controller' into mauricio
Warnings
allow for a bunch of AP points for testing. In middle of implementing endTurnAction jank.
Validity checking
Settling merge conflict for deleted actions
Merge branch 'mauricio' into controller
Merge branch 'controller' of https://github.com/ssyyddnneeyy/ChokingHazard-Iteration2 into controller
Changed return type in EndTurnAction to match with change in super's. Added EndTurnAction file
Merge branch 'controller' into mauricio
Warnings
Tiles on view now have correct elevation displayed on the tile. Assumes that all the spaces have the same elevation as the middle space
Implemented functionality for EndTurnAction. Checks validity in player. Does not ask for festivals or account for final round turns.
Tile bugs
Merge branch 'master' into controller
Merge branch 'controller' into mauricio
Merge branch 'mauricio' into controller
Simulator, rotate before placing
Merge branch 'mauricio' into controller
Highlights the first player when the game starts
Merge branch 'controller' of https://github.com/ssyyddnneeyy/ChokingHazard-Iteration2 into controller