Commit Graph

  • 1f6d7353c1 Merge branch 'mzmiric5-master' IntelOrca 2014-05-09 14:37:40 +01:00
  • f315013e76 Merge branch 'master' of https://github.com/mzmiric5/OpenRCT2 into mzmiric5-master IntelOrca 2014-05-09 14:36:49 +01:00
  • 45f78eded4 Moved platform specific UI code (MessageBox, DirectoryChooser) into osinterface.c atmaxinger 2014-05-09 11:40:06 +02:00
  • f3e7c6c23c Added more of draw_sprite still needs work. Function call does not work Duncan Frost 2014-05-09 09:18:49 +01:00
  • 6eb635fd2b master project files ddevrien 2014-05-09 10:15:10 +02:00
  • e6e3fce74d Merge branch 'master' of https://github.com/ddevrien/OpenRCT2 ddevrien 2014-05-09 10:12:05 +02:00
  • 3eff5ebf6f Added basic code for banner window ddevrien 2014-05-09 10:04:40 +02:00
  • 1eda151c70 Added basic code for banner window ddevrien 2014-05-09 10:04:40 +02:00
  • dce8c9eaf1 Merge branch 'MaciekBaron-master' IntelOrca 2014-05-08 22:44:55 +01:00
  • 0c34c3791c Cleaning up files and code related to windows Maciek Baron 2014-05-08 21:48:31 +01:00
  • 2276c198fd Removed a pointless call in palette tried to make draw sprite more understandable Duncan Frost 2014-05-08 20:43:10 +01:00
  • f448929f73 First couple lines decoded Duncan Frost 2014-05-08 20:13:58 +01:00
  • 240662ee39 another typo fixed :) Miso Zmiric (Mike Squinter) 2014-05-08 19:55:35 +01:00
  • 196bc68acd Merge branch 'duncanspumpkin-master' IntelOrca 2014-05-08 19:48:53 +01:00
  • 62df9a91bd Merge branch 'master' of https://github.com/duncanspumpkin/OpenRCT2 into duncanspumpkin-master IntelOrca 2014-05-08 19:47:47 +01:00
  • 63681f6877 Merge branch 'master' of https://github.com/IntelOrca/OpenRCT2 Duncan Frost 2014-05-08 19:16:34 +01:00
  • d3be99cc98 Added get_guest_face_sprite small and large functions. Duncan Frost 2014-05-08 19:15:31 +01:00
  • 56bef5f328 Merge branch 'ZedThree-open_news_item' IntelOrca 2014-05-08 17:50:36 +01:00
  • 1523ac818d Merge branch 'open_news_item' of https://github.com/ZedThree/OpenRCT2 into ZedThree-open_news_item IntelOrca 2014-05-08 17:48:57 +01:00
  • 6af1306c23 Merge branch 'master' of https://github.com/IntelOrca/OpenRCT2 Duncan Frost 2014-05-08 17:38:57 +01:00
  • 85b102c5b0 Change NEWS_ITEM_SCENERY to NEWS_ITEM_RESEARCH ZedThree 2014-05-08 17:53:57 +02:00
  • c1ac6edb96 Add function to open park window to guests tab ZedThree 2014-05-08 17:35:32 +02:00
  • c94fd53022 Add news_item_open_subject() ZedThree 2014-05-08 17:14:08 +02:00
  • a35289fc9f Add functions to open park window to awards/rating ZedThree 2014-05-08 17:08:52 +02:00
  • 17389d18b3 Merge branch 'mzmiric5-master' IntelOrca 2014-05-08 16:08:15 +01:00
  • 231777d131 clean up config IntelOrca 2014-05-08 16:07:57 +01:00
  • 0e7283679b Merge branch 'master' of https://github.com/mzmiric5/OpenRCT2 into mzmiric5-master IntelOrca 2014-05-08 15:58:31 +01:00
  • c7b7976743 Merge branch 'jvlomax-master' IntelOrca 2014-05-08 15:43:41 +01:00
  • b1017a839f fix late night typo Miso Zmiric (Mike Squinter) 2014-05-08 13:06:36 +01:00
  • 7d4a80cea2 Merge remote-tracking branch 'upstream/master' Jørn Lomax 2014-05-08 11:09:31 +02:00
  • 4e13b24104 Revamped the config system. Now enables sections and comments. Also enables some validation checking of the config file Jørn Lomax 2014-05-08 11:05:07 +02:00
  • b04b25d013 Add directory_browser to config_create_default Miso Zmiric (Mike Squinter) 2014-05-08 07:10:26 +01:00
  • d5927e415f use finance_payment in do_game_command IntelOrca 2014-05-07 23:45:16 +01:00
  • 1610970bfe Merge branch 'MaciekBaron-master' IntelOrca 2014-05-07 22:42:54 +01:00
  • 9e6d19a672 Merge branch 'master' of https://github.com/MaciekBaron/OpenRCT2 into MaciekBaron-master IntelOrca 2014-05-07 22:42:01 +01:00
  • cf80dd42d1 Merge branch 'lnz-scenario_update' IntelOrca 2014-05-07 22:41:11 +01:00
  • 3792b2b72e Merge branch 'scenario_update' of https://github.com/lnz/OpenRCT2 into lnz-scenario_update IntelOrca 2014-05-07 22:40:23 +01:00
  • 35ea6300fb Merge branch 'duncanspumpkin-fix_park_rating' IntelOrca 2014-05-07 22:39:38 +01:00
  • 8fff53f043 Merge branch 'fix_park_rating' of https://github.com/duncanspumpkin/OpenRCT2 into duncanspumpkin-fix_park_rating IntelOrca 2014-05-07 22:38:22 +01:00
  • b47127f464 Merge branch 'ddevrien-master' IntelOrca 2014-05-07 22:37:15 +01:00
  • 604f61732c Merge branch 'master' of https://github.com/ddevrien/OpenRCT2 into ddevrien-master IntelOrca 2014-05-07 22:36:47 +01:00
  • 6ca9058b70 Merge branch 'ZedThree-loadgame' IntelOrca 2014-05-07 22:36:00 +01:00
  • 76611d054a Fix bug in open_load_game_dialog() ZedThree 2014-05-07 23:11:23 +02:00
  • c70865457c Adding window_ride_init_vars and various enums Maciek Baron 2014-05-07 21:16:57 +01:00
  • dc1386cca2 Merge branch 'master' of https://github.com/duncanspumpkin/OpenRCT2 into fix_park_rating Duncan Frost 2014-05-07 19:58:55 +01:00
  • c70574104d Merge branch 'fix_park_rating' of https://github.com/duncanspumpkin/OpenRCT2 Duncan Frost 2014-05-07 19:58:20 +01:00
  • 15c1213fb5 Identified WWT_6, added some strings ddevrien 2014-05-07 20:53:33 +02:00
  • bfd4dbcbe9 Changed litter var_24 to unsigned Duncan Frost 2014-05-07 19:46:30 +01:00
  • 4e4fa93e14 Fixed litter bug. Removed debug notes. Made rides code more readable Duncan Frost 2014-05-07 19:44:13 +01:00
  • 8ddfc136f6 Fixed bug in second ride related equations Duncan Frost 2014-05-07 18:57:50 +01:00
  • 840c76b68e Fix month not changing bug and wage cost bug. lnz 2014-05-07 16:28:42 +02:00
  • 169a3b6b72 Implement Peep problem warnings update. lnz 2014-05-07 16:24:36 +02:00
  • e7baa73b2c Merge branch 'MaciekBaron-master' IntelOrca 2014-05-07 00:41:31 +01:00
  • 18d95968f2 Merge branch 'master' of https://github.com/MaciekBaron/OpenRCT2 into MaciekBaron-master IntelOrca 2014-05-07 00:37:13 +01:00
  • aef83362bc Cleaning up small shared functions Maciek Baron 2014-05-06 22:04:09 +01:00
  • b52c5c0b2d Peeps part now working Duncan Frost 2014-05-06 21:54:42 +01:00
  • 513108cd50 Merge branch 'duncanspumpkin-master' IntelOrca 2014-05-06 21:45:01 +01:00
  • 3629247056 Merge branch 'master' of https://github.com/duncanspumpkin/OpenRCT2 into fix_park_rating Duncan Frost 2014-05-06 21:18:17 +01:00
  • eb828c0041 Merge branch 'master' of https://github.com/IntelOrca/OpenRCT2 Duncan Frost 2014-05-06 21:14:02 +01:00
  • c26b944b6e Now uses string references Duncan Frost 2014-05-06 21:13:38 +01:00
  • da0236ef84 Labeled init values for Shearwood Forest Duncan Frost 2014-05-06 21:09:08 +01:00
  • 05f7853f00 Merge branch 'MaciekBaron-master' IntelOrca 2014-05-05 23:31:21 +01:00
  • d74bae8023 Merge branch 'master' of https://github.com/MaciekBaron/OpenRCT2 into MaciekBaron-master IntelOrca 2014-05-05 23:30:04 +01:00
  • e56875256b Merge branch 'lnz-scenario_update' IntelOrca 2014-05-05 23:26:20 +01:00
  • 1f00ad9110 Implemented a few functions in editor.c Maciek Baron 2014-05-05 23:10:28 +01:00
  • 9de233e34b Actually add finance code. lnz 2014-05-05 22:16:34 +02:00
  • 589118d66d Implement some finance functions and added a few addresses & tables lnz 2014-05-05 21:59:59 +02:00
  • 48caec8b58 Label unimplemented functions in scenario_update lnz 2014-05-04 20:13:05 +02:00
  • 2b900bebb3 Merge branch 'master' of https://github.com/IntelOrca/OpenRCT2 Duncan Frost 2014-05-05 20:27:40 +01:00
  • 5ca2b1a7fd Added more strings Duncan Frost 2014-05-05 20:27:06 +01:00
  • 726c1a2312 fix peep structure IntelOrca 2014-05-05 20:16:27 +01:00
  • 076b68996f Merge branch 'duncanspumpkin-master' IntelOrca 2014-05-05 20:15:10 +01:00
  • 73d9be16ab Merge branch 'master' of https://github.com/duncanspumpkin/OpenRCT2 into duncanspumpkin-master IntelOrca 2014-05-05 20:14:53 +01:00
  • 7adc464df9 Merge branch 'ZedThree-ride_vars' IntelOrca 2014-05-05 20:09:28 +01:00
  • 720261f0ba Merge branch 'ride_vars' of https://github.com/ZedThree/OpenRCT2 into ZedThree-ride_vars IntelOrca 2014-05-05 20:08:27 +01:00
  • cab7f4d31e Merge branch 'MaciekBaron-master' IntelOrca 2014-05-05 20:07:23 +01:00
  • 46bcefc1fb Merge branch 'master' of https://github.com/MaciekBaron/OpenRCT2 into MaciekBaron-master IntelOrca 2014-05-05 20:06:22 +01:00
  • 3a177fbb45 add grouping to guest list window IntelOrca 2014-05-05 20:04:17 +01:00
  • 290255a32d Fix bug: rides not sorted correctly ZedThree 2014-05-05 20:55:25 +02:00
  • ce14d72d16 Labeled ride photo 1-4 and time in park offsets. Duncan Frost 2014-05-05 19:35:47 +01:00
  • d0d51e477b Add ride mode enum and name some ride variables ZedThree 2014-05-05 19:34:24 +02:00
  • f20311ec6c Fixing typo Maciek Baron 2014-05-05 18:26:55 +01:00
  • 1c51c81622 Reverting struct changes Maciek Baron 2014-05-05 16:52:19 +01:00
  • 29459fb9bb Adding item flags, time in thought struct Maciek Baron 2014-05-05 16:38:49 +01:00
  • a35a9f29a4 add guest list window IntelOrca 2014-05-05 03:27:17 +01:00
  • a1a53c4c61 Merge pull request #62 from duncanspumpkin/master Ted John 2014-05-04 21:26:56 +01:00
  • b63c7c41f0 Merge branch 'master' of https://github.com/IntelOrca/OpenRCT2 Duncan Frost 2014-05-04 21:18:41 +01:00
  • c4b7dd8a5a Added PEEP_NAUSEA_TOLERANCE enum Duncan Frost 2014-05-04 21:14:30 +01:00
  • eedab37993 Merge pull request #61 from MakaHost/master Ted John 2014-05-04 20:52:21 +01:00
  • 3c55f9aaaa Merge pull request #60 from duncanspumpkin/master Ted John 2014-05-04 20:51:49 +01:00
  • d0203aaeda Labelled more peep offsets Duncan Frost 2014-05-04 20:48:47 +01:00
  • bab2790027 Fixed spelling in peep thought types MakaHost 2014-05-04 21:45:40 +02:00
  • c062992e78 add play intro config setting IntelOrca 2014-05-04 19:59:24 +01:00
  • ff992e1fc0 Merge branch 'MaciekBaron-master' IntelOrca 2014-05-04 19:04:20 +01:00
  • da7563c7c9 add unknown map element function IntelOrca 2014-05-04 18:51:36 +01:00
  • d18ff2bb1b Adding peep thought types Maciek Baron 2014-05-04 18:49:06 +01:00
  • 160c388739 name more functions in editor.c IntelOrca 2014-05-04 18:02:28 +01:00
  • 9b6873f09e add checksum validation for load sc6 and sv6 IntelOrca 2014-05-04 17:34:13 +01:00
  • e2414bf9f7 Merge branch 'MaciekBaron-master' IntelOrca 2014-05-04 17:09:44 +01:00
  • cde954ba63 Removing leftover debug code Maciek Baron 2014-05-04 16:34:35 +01:00