Merge branch 'master' of https://github.com/IntelOrca/OpenRCT2
Merge branch 'master' of https://github.com/IntelOrca/OpenRCT2
Merge branch 'master' of https://github.com/IntelOrca/OpenRCT2
add park_init
add park_reset_awards_and_history
Merge branch 'master' of https://github.com/IntelOrca/OpenRCT2
Merge branch 'window_options' of https://github.com/ddevrien/OpenRCT2 into ddevrien-window_options
Merge branch 'ddevrien-window_options'
Merge branch 'window_options' of https://github.com/ddevrien/OpenRCT2 into ddevrien-window_options
Merge branch 'ddevrien-window_options'
Initial rewrite of gfx_draw_line
fix dropdown argument arrays
Merge branch 'window_options' of https://github.com/ddevrien/OpenRCT2 into ddevrien-window_options
Merge branch 'ddevrien-window_options'
Rewrote gfx_draw_line_on_buffer after realising how it works
Replaced decompiled code with bresenhams algorithm. Gfx_draw_line finished.
Merge branch 'gfx_draw_line' of https://github.com/duncanspumpkin/OpenRCT2 into duncanspumpkin-gfx_draw_line
Merge branch 'duncanspumpkin-gfx_draw_line'
Implement ride upkeep payments
Implement update for ride favourited numbers