mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-18 12:33:17 +01:00
Code Issues Releases Wiki Activity
460 Commits 8 Branches 59 Tags
ecbba8f70a15fa27f55c2d794e05f2999430ebde
Commit Graph

460 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
IntelOrca
ecbba8f70a Merge branch 'ddevrien-options-window' 2014-05-14 02:57:58 +01:00
IntelOrca
b2c983713d Merge branch 'options-window' of https://github.com/ddevrien/OpenRCT2 into ddevrien-options-window 2014-05-14 02:57:20 +01:00
ddevrien
92a803075c implemented options window update method 2014-05-14 00:59:34 +02:00
IntelOrca
86746b7632 Merge branch 'adrian17-master' 2014-05-13 23:51:22 +01:00
adrian17
31424b6a06 Use macros defined in addresses.h where possible. Removed one doubled macro. 2014-05-13 23:37:45 +02:00
IntelOrca
180500e866 Merge branch 'ddevrien-options-window' 2014-05-13 01:23:54 +01:00
IntelOrca
3b6069fab6 Merge branch 'options-window' of https://github.com/ddevrien/OpenRCT2 into ddevrien-options-window 2014-05-13 01:23:36 +01:00
IntelOrca
8a506fc263 Merge branch 'ddevrien-options-window' 2014-05-12 23:19:47 +01:00
IntelOrca
98ab959ef9 fix warnings in options window 2014-05-12 23:19:36 +01:00
IntelOrca
d2b8446e15 Merge branch 'options-window' of https://github.com/ddevrien/OpenRCT2 into ddevrien-options-window 2014-05-12 23:17:56 +01:00
ddevrien
e71170334f options window mouseup code 2014-05-13 00:13:23 +02:00
IntelOrca
458f9e3871 Merge branch 'adrian17-master' 2014-05-12 22:01:35 +01:00
IntelOrca
4a85a8b738 Merge branch 'master' of https://github.com/adrian17/OpenRCT2 into adrian17-master 2014-05-12 22:00:23 +01:00
IntelOrca
3e7603c52b Merge branch 'duncanspumpkin-master' 2014-05-12 21:54:46 +01:00
adrian17
62c9069c9f Increase the warning_throttle array size to hold all 7 values 2014-05-12 22:22:20 +02:00
Duncan Frost
72d9d17bf7 Added some more sprites and changed get_guest_face to use them 2014-05-12 21:06:02 +01:00
adrian17
0e02787bf3 Prefer the RCT2_GLOBAL macro 2014-05-12 22:03:24 +02:00
ddevrien
4550a1de68 More work on options window 
dropdown function
 2014-05-12 21:18:27 +02:00
IntelOrca
9dd5e59f55 Merge branch 'ddevrien-master' 2014-05-12 18:54:32 +01:00
ddevrien
942b722b28 some work on options window 2014-05-12 16:59:20 +02:00
ddevrien
df97c22dae some strings added 2014-05-12 16:56:28 +02:00
ddevrien
c6fc8c634b celsius fix 2014-05-12 16:51:40 +02:00
ddevrien
85a1e4aa6d config addresses 
test
 2014-05-12 16:50:13 +02:00
IntelOrca
7c6a193b42 remove all remaining warnings 2014-05-12 02:18:08 +01:00
IntelOrca
8dcca91092 mass clean up and reduce warnings 2014-05-12 01:45:45 +01:00
IntelOrca
8f1bde0f7f Merge branch 'lnz-scenario_stuff' 2014-05-12 00:30:36 +01:00
lnz
bb12fc1a42 Implement update for ride favourited numbers 2014-05-11 23:21:26 +02:00
lnz
19a475f05a Implement ride upkeep payments 2014-05-11 23:17:20 +02:00
IntelOrca
b2a7d55bcd Merge branch 'duncanspumpkin-gfx_draw_line' 2014-05-11 21:27:53 +01:00
IntelOrca
e4aaeded5f Merge branch 'gfx_draw_line' of https://github.com/duncanspumpkin/OpenRCT2 into duncanspumpkin-gfx_draw_line 2014-05-11 21:27:27 +01:00
Duncan Frost
84342b07d2 Replaced decompiled code with bresenhams algorithm. Gfx_draw_line finished. 2014-05-11 21:25:18 +01:00
Duncan Frost
45532da9c6 Rewrote gfx_draw_line_on_buffer after realising how it works 2014-05-11 20:10:32 +01:00
IntelOrca
9eb48ecc84 Merge branch 'ddevrien-window_options' 2014-05-11 19:25:27 +01:00
IntelOrca
01fb20e397 Merge branch 'window_options' of https://github.com/ddevrien/OpenRCT2 into ddevrien-window_options 2014-05-11 19:23:57 +01:00
IntelOrca
bf8a032553 fix dropdown argument arrays 2014-05-11 16:50:29 +01:00
ddevrien
0ba23fe886 Some work on options window 2014-05-11 17:24:52 +02:00
Duncan Frost
cd8587243c Initial rewrite of gfx_draw_line 2014-05-11 13:14:43 +01:00
IntelOrca
0fb43244d1 Merge branch 'ddevrien-window_options' 2014-05-11 11:57:11 +01:00
IntelOrca
8a6ad40c5d Merge branch 'window_options' of https://github.com/ddevrien/OpenRCT2 into ddevrien-window_options 2014-05-11 11:56:35 +01:00
IntelOrca
6440302617 Merge branch 'ddevrien-window_options' 2014-05-11 11:44:51 +01:00
IntelOrca
081a88d069 Merge branch 'window_options' of https://github.com/ddevrien/OpenRCT2 into ddevrien-window_options 2014-05-11 11:40:46 +01:00
Duncan Frost
a70de652ec Merge branch 'master' of https://github.com/IntelOrca/OpenRCT2 2014-05-11 10:19:38 +01:00
ddevrien
52c95e4154 little addition to checkbox widget 2014-05-11 10:57:56 +02:00
ddevrien
5c5c5373cd Implemented checkbox widget draw function 2014-05-11 10:51:05 +02:00
ddevrien
580035fdef Fix groupbox widget draw issue (issue #91) 2014-05-11 09:45:03 +02:00
ddevrien
977fe5f485 forgot debug code 2014-05-11 09:04:25 +02:00
ddevrien
b39cf4d1af Started work on options window 2014-05-11 09:01:01 +02:00
IntelOrca
70e7660d0b add park_reset_awards_and_history 2014-05-11 01:18:56 +01:00
IntelOrca
f8363e098b add park_init 2014-05-11 00:35:45 +01:00
ddevrien
5f690ac134 Added basic code for banner window 2014-05-10 09:27:19 +02:00