27657 Commits

Author SHA1 Message Date
Miso Zmiric (Mike Squinter)
240662ee39 another typo fixed :) 2014-05-08 19:55:35 +01:00
IntelOrca
196bc68acd Merge branch 'duncanspumpkin-master' 2014-05-08 19:48:53 +01:00
IntelOrca
62df9a91bd Merge branch 'master' of https://github.com/duncanspumpkin/OpenRCT2 into duncanspumpkin-master 2014-05-08 19:47:47 +01:00
Duncan Frost
63681f6877 Merge branch 'master' of https://github.com/IntelOrca/OpenRCT2 2014-05-08 19:16:34 +01:00
Duncan Frost
d3be99cc98 Added get_guest_face_sprite small and large functions. 2014-05-08 19:15:31 +01:00
IntelOrca
56bef5f328 Merge branch 'ZedThree-open_news_item' 2014-05-08 17:50:36 +01:00
IntelOrca
1523ac818d Merge branch 'open_news_item' of https://github.com/ZedThree/OpenRCT2 into ZedThree-open_news_item 2014-05-08 17:48:57 +01:00
Duncan Frost
6af1306c23 Merge branch 'master' of https://github.com/IntelOrca/OpenRCT2 2014-05-08 17:38:57 +01:00
ZedThree
85b102c5b0 Change NEWS_ITEM_SCENERY to NEWS_ITEM_RESEARCH 2014-05-08 17:53:57 +02:00
ZedThree
c1ac6edb96 Add function to open park window to guests tab 2014-05-08 17:35:32 +02:00
ZedThree
c94fd53022 Add news_item_open_subject() 2014-05-08 17:14:08 +02:00
ZedThree
a35289fc9f Add functions to open park window to awards/rating
Also update replace some address that have constants/functions
2014-05-08 17:11:26 +02:00
IntelOrca
17389d18b3 Merge branch 'mzmiric5-master' 2014-05-08 16:08:15 +01:00
IntelOrca
231777d131 clean up config 2014-05-08 16:07:57 +01:00
IntelOrca
0e7283679b Merge branch 'master' of https://github.com/mzmiric5/OpenRCT2 into mzmiric5-master 2014-05-08 15:58:31 +01:00
IntelOrca
c7b7976743 Merge branch 'jvlomax-master' 2014-05-08 15:43:41 +01:00
Miso Zmiric (Mike Squinter)
b1017a839f fix late night typo 2014-05-08 13:06:36 +01:00
Jørn Lomax
7d4a80cea2 Merge remote-tracking branch 'upstream/master'
Conflicts:
	src/config.c
	src/config.h
2014-05-08 11:09:31 +02:00
Jørn Lomax
4e13b24104 Revamped the config system. Now enables sections and comments.
Also enables some validation checking of the config file
2014-05-08 11:05:07 +02:00
Miso Zmiric (Mike Squinter)
b04b25d013 Add directory_browser to config_create_default
partially resolves #42 [https://github.com/IntelOrca/OpenRCT2/issues/42]
2014-05-08 07:10:26 +01:00
IntelOrca
d5927e415f use finance_payment in do_game_command 2014-05-07 23:45:16 +01:00
IntelOrca
1610970bfe Merge branch 'MaciekBaron-master' 2014-05-07 22:42:54 +01:00
IntelOrca
9e6d19a672 Merge branch 'master' of https://github.com/MaciekBaron/OpenRCT2 into MaciekBaron-master 2014-05-07 22:42:01 +01:00
IntelOrca
cf80dd42d1 Merge branch 'lnz-scenario_update' 2014-05-07 22:41:11 +01:00
IntelOrca
3792b2b72e Merge branch 'scenario_update' of https://github.com/lnz/OpenRCT2 into lnz-scenario_update 2014-05-07 22:40:23 +01:00