Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
move settings to config and improve
Merge branch 'update_objective' of https://github.com/lnz/OpenRCT2 into lnz-update_objective
Merge branch 'lnz-update_objective'
fix scenario_entrance_fee_too_high_check
fix call for scenario_entrance_fee_too_high_check
Adding enum with trigger flags for peeps
Merge branch 'master' of https://github.com/MaciekBaron/OpenRCT2 into MaciekBaron-master
clean peep.h
Merge branch 'MaciekBaron-master'
Update readme to reflect changes to game_path
Merge pull request #54 from ZedThree/readme

Update readme to reflect changes to game_path
add end game update in load or quit command
Settings: Use enum for screenshot format, Extension name for screenshot format in config file
refactor map and add get surface tile helper
Merge branch 'settings-screenshot-enum-extension' of https://github.com/atmaxinger/OpenRCT2 into atmaxinger-settings-screenshot-enum-extension
Merge branch 'atmaxinger-settings-screenshot-enum-extension'
Label unimplemented functions in scenario_update