Commit Graph

  • a104b4dd55 Merge remote-tracking branch 'upstream/master' Jørn Lomax 2014-05-14 12:19:39 +02:00
  • cc850159e4 Merge branch 'duncanspumpkin-gfx_draw_sprite' into gfx_unstable IntelOrca 2014-05-14 11:02:16 +01:00
  • 9257cd1e3c Merge branch 'gfx_draw_sprite' of https://github.com/duncanspumpkin/OpenRCT2 into duncanspumpkin-gfx_draw_sprite IntelOrca 2014-05-14 11:00:00 +01:00
  • d1cec342f8 intermidiate commit Jørn Lomax 2014-05-14 11:54:56 +02:00
  • ecbba8f70a Merge branch 'ddevrien-options-window' IntelOrca 2014-05-14 02:57:58 +01:00
  • b2c983713d Merge branch 'options-window' of https://github.com/ddevrien/OpenRCT2 into ddevrien-options-window IntelOrca 2014-05-14 02:57:20 +01:00
  • 92a803075c implemented options window update method ddevrien 2014-05-14 00:59:34 +02:00
  • 86746b7632 Merge branch 'adrian17-master' IntelOrca 2014-05-13 23:51:22 +01:00
  • 31424b6a06 Use macros defined in addresses.h where possible. Removed one doubled macro. adrian17 2014-05-13 23:37:45 +02:00
  • 8ecde8f07a Moved around logic so it runs correctly Duncan Frost 2014-05-13 20:10:49 +01:00
  • 92386e5758 Fix sketchy line bug that i introduced Duncan Frost 2014-05-13 19:12:18 +01:00
  • 20c7b98c88 merge Duncan Frost 2014-05-13 19:06:15 +01:00
  • eb2682fbd4 Fix merge error Duncan Frost 2014-05-13 19:03:23 +01:00
  • ba16b197e3 Bug found in the first test doh. Duncan Frost 2014-05-13 19:01:59 +01:00
  • 1d754dc390 Still searching for bug Duncan Frost 2014-05-13 18:32:57 +01:00
  • 180500e866 Merge branch 'ddevrien-options-window' IntelOrca 2014-05-13 01:23:54 +01:00
  • 3b6069fab6 Merge branch 'options-window' of https://github.com/ddevrien/OpenRCT2 into ddevrien-options-window IntelOrca 2014-05-13 01:23:36 +01:00
  • 8a506fc263 Merge branch 'ddevrien-options-window' IntelOrca 2014-05-12 23:19:47 +01:00
  • 98ab959ef9 fix warnings in options window IntelOrca 2014-05-12 23:19:36 +01:00
  • d2b8446e15 Merge branch 'options-window' of https://github.com/ddevrien/OpenRCT2 into ddevrien-options-window IntelOrca 2014-05-12 23:17:56 +01:00
  • e71170334f options window mouseup code ddevrien 2014-05-13 00:13:23 +02:00
  • 756f21b427 Trying to understand how the drawing function works Duncan Frost 2014-05-12 22:04:07 +01:00
  • 458f9e3871 Merge branch 'adrian17-master' IntelOrca 2014-05-12 22:01:35 +01:00
  • 4a85a8b738 Merge branch 'master' of https://github.com/adrian17/OpenRCT2 into adrian17-master IntelOrca 2014-05-12 22:00:23 +01:00
  • 3e7603c52b Merge branch 'duncanspumpkin-master' IntelOrca 2014-05-12 21:54:46 +01:00
  • 62c9069c9f Increase the warning_throttle array size to hold all 7 values adrian17 2014-05-12 22:22:20 +02:00
  • 72d9d17bf7 Added some more sprites and changed get_guest_face to use them Duncan Frost 2014-05-12 21:06:02 +01:00
  • 0e02787bf3 Prefer the RCT2_GLOBAL macro adrian17 2014-05-12 22:03:24 +02:00
  • 4550a1de68 More work on options window ddevrien 2014-05-12 21:18:27 +02:00
  • 9dd5e59f55 Merge branch 'ddevrien-master' IntelOrca 2014-05-12 18:54:32 +01:00
  • 6b7cdf539b added missing file from commit Jørn Lomax 2014-05-12 17:31:57 +02:00
  • fcfe5f271d Merge remote-tracking branch 'upstream/master' Jørn Lomax 2014-05-12 17:31:25 +02:00
  • 3382be1430 intermidiate comit Jørn Lomax 2014-05-12 17:29:16 +02:00
  • 942b722b28 some work on options window ddevrien 2014-05-12 16:59:20 +02:00
  • df97c22dae some strings added ddevrien 2014-05-12 16:56:28 +02:00
  • c6fc8c634b celsius fix ddevrien 2014-05-12 16:51:40 +02:00
  • 85a1e4aa6d config addresses ddevrien 2014-05-12 16:50:13 +02:00
  • 7c6a193b42 remove all remaining warnings IntelOrca 2014-05-12 02:18:08 +01:00
  • 8dcca91092 mass clean up and reduce warnings IntelOrca 2014-05-12 01:45:45 +01:00
  • 8f1bde0f7f Merge branch 'lnz-scenario_stuff' IntelOrca 2014-05-12 00:30:36 +01:00
  • bb12fc1a42 Implement update for ride favourited numbers lnz 2014-05-11 23:21:26 +02:00
  • 19a475f05a Implement ride upkeep payments lnz 2014-05-11 23:17:20 +02:00
  • 1cead7ad38 Merge branch 'master' into gfx_unstable IntelOrca 2014-05-11 21:29:07 +01:00
  • b2a7d55bcd Merge branch 'duncanspumpkin-gfx_draw_line' IntelOrca 2014-05-11 21:27:53 +01:00
  • e4aaeded5f Merge branch 'gfx_draw_line' of https://github.com/duncanspumpkin/OpenRCT2 into duncanspumpkin-gfx_draw_line IntelOrca 2014-05-11 21:27:27 +01:00
  • 84342b07d2 Replaced decompiled code with bresenhams algorithm. Gfx_draw_line finished. Duncan Frost 2014-05-11 21:25:18 +01:00
  • 5b77247226 Merge branch 'ZedThree-gfx_fill_rect' into gfx_unstable IntelOrca 2014-05-11 21:24:57 +01:00
  • ea83381e4c Add author ZedThree 2014-05-11 22:19:01 +02:00
  • 7f4e21f334 Bug fix: cross-hatch loop was wrong ZedThree 2014-05-11 21:31:31 +02:00
  • 45532da9c6 Rewrote gfx_draw_line_on_buffer after realising how it works Duncan Frost 2014-05-11 20:10:32 +01:00
  • 9eb48ecc84 Merge branch 'ddevrien-window_options' IntelOrca 2014-05-11 19:25:27 +01:00
  • 01fb20e397 Merge branch 'window_options' of https://github.com/ddevrien/OpenRCT2 into ddevrien-window_options IntelOrca 2014-05-11 19:23:57 +01:00
  • 1e8f80fa5c Bug fix - memset doesn't increase pointer ZedThree 2014-05-11 18:41:18 +02:00
  • ba6263d2bd Cross-hatching branch ZedThree 2014-05-11 17:49:13 +02:00
  • ce0df83298 Formatting ZedThree 2014-05-11 17:48:33 +02:00
  • 6f1421117b Some tidying up. Scrollbars don't work ZedThree 2014-05-11 15:56:59 +02:00
  • 705af9377b Start decompiling gfx_fill_rect ZedThree 2014-05-11 13:06:28 +02:00
  • 81f2bfed35 Implemented checkbox widget draw function ddevrien 2014-05-11 10:51:05 +02:00
  • bf8a032553 fix dropdown argument arrays IntelOrca 2014-05-11 16:50:29 +01:00
  • 0ba23fe886 Some work on options window ddevrien 2014-05-11 17:24:52 +02:00
  • cd8587243c Initial rewrite of gfx_draw_line Duncan Frost 2014-05-11 13:14:43 +01:00
  • 0fb43244d1 Merge branch 'ddevrien-window_options' IntelOrca 2014-05-11 11:57:11 +01:00
  • 8a6ad40c5d Merge branch 'window_options' of https://github.com/ddevrien/OpenRCT2 into ddevrien-window_options IntelOrca 2014-05-11 11:56:35 +01:00
  • 7a3e151b86 Merge branch 'duncanspumpkin-gfx_draw_sprite' into gfx_unstable IntelOrca 2014-05-11 11:51:19 +01:00
  • 5a26d064d6 Merge branch 'gfx_draw_sprite' of https://github.com/duncanspumpkin/OpenRCT2 into duncanspumpkin-gfx_draw_sprite IntelOrca 2014-05-11 11:49:21 +01:00
  • 6440302617 Merge branch 'ddevrien-window_options' IntelOrca 2014-05-11 11:44:51 +01:00
  • 081a88d069 Merge branch 'window_options' of https://github.com/ddevrien/OpenRCT2 into ddevrien-window_options IntelOrca 2014-05-11 11:40:46 +01:00
  • a70de652ec Merge branch 'master' of https://github.com/IntelOrca/OpenRCT2 Duncan Frost 2014-05-11 10:19:38 +01:00
  • 6d97593093 Bug in main draw_sprite func for now skipping code Duncan Frost 2014-05-11 10:14:38 +01:00
  • 52c95e4154 little addition to checkbox widget ddevrien 2014-05-11 10:57:56 +02:00
  • 5c5c5373cd Implemented checkbox widget draw function ddevrien 2014-05-11 10:51:05 +02:00
  • 580035fdef Fix groupbox widget draw issue (issue #91) ddevrien 2014-05-11 09:45:03 +02:00
  • 977fe5f485 forgot debug code ddevrien 2014-05-11 09:04:25 +02:00
  • b39cf4d1af Started work on options window ddevrien 2014-05-11 09:01:01 +02:00
  • 70e7660d0b add park_reset_awards_and_history IntelOrca 2014-05-11 01:18:56 +01:00
  • f8363e098b add park_init IntelOrca 2014-05-11 00:35:45 +01:00
  • 26f4b35e61 Cleaned up code so that it makes more sense. Duncan Frost 2014-05-10 12:26:19 +01:00
  • 16ed98348a Found bug due to signness on global var Duncan Frost 2014-05-10 10:16:23 +01:00
  • 601305a4e3 Still searching for bug. Must be some external memory not set Duncan Frost 2014-05-10 10:12:48 +01:00
  • 5f690ac134 Added basic code for banner window ddevrien 2014-05-09 10:04:40 +02:00
  • 45bd2d789c Merge branch 'master' of https://github.com/IntelOrca/OpenRCT2 Duncan Frost 2014-05-10 07:14:44 +01:00
  • 1086c4e524 added notes to help find bug Duncan Frost 2014-05-10 07:14:12 +01:00
  • 61ceee26a7 remove extra scenario name address macro IntelOrca 2014-05-10 00:40:47 +01:00
  • bfbb5b810b Merge branch 'MaciekBaron-master' IntelOrca 2014-05-10 00:38:42 +01:00
  • d3382e3a38 Renaming ride construction content Maciek Baron 2014-05-09 23:11:51 +01:00
  • 73d06418b6 Adding ride build date, reset function Maciek Baron 2014-05-09 23:06:53 +01:00
  • 3b8f0d685b convert handling shortcut keys to switch IntelOrca 2014-05-09 23:05:50 +01:00
  • 9d07c4a508 Merge branch 'ZedThree-shortcuts' IntelOrca 2014-05-09 22:28:53 +01:00
  • 10b4c3cfab Merge branch 'shortcuts' of https://github.com/ZedThree/OpenRCT2 into ZedThree-shortcuts IntelOrca 2014-05-09 22:28:26 +01:00
  • 4e50980b61 Merge branch 'ddevrien-window_banner' IntelOrca 2014-05-09 22:26:59 +01:00
  • b8dd77c1d7 Merge branch 'window_banner' of https://github.com/ddevrien/OpenRCT2 into ddevrien-window_banner IntelOrca 2014-05-09 22:25:10 +01:00
  • 2523b1f328 Fix a couple of window bugs ZedThree 2014-05-09 22:44:55 +02:00
  • 93d062704d Add code to handle shortcuts ZedThree 2014-05-09 09:47:20 +02:00
  • bc413fede9 Add helper function for calling widget events ZedThree 2014-05-09 18:27:59 +02:00
  • b2d1f0dfd6 Add functions for closing top/all window(s) ZedThree 2014-05-09 12:54:11 +02:00
  • b280675ab5 cleanup ddevrien 2014-05-09 21:03:00 +02:00
  • 6ddeb610f0 Some additions to window_banner ddevrien 2014-05-09 20:59:41 +02:00
  • 0ea838358b Merge branch 'master' of https://github.com/IntelOrca/OpenRCT2 Duncan Frost 2014-05-09 19:47:54 +01:00
  • 1bedba626d Merge branch 'atmaxinger-os-specific' IntelOrca 2014-05-09 14:41:02 +01:00
  • f813a70cd6 Merge branch 'os-specific' of https://github.com/atmaxinger/OpenRCT2 into atmaxinger-os-specific IntelOrca 2014-05-09 14:39:27 +01:00