mirrors
/
OpenRCT2
mirror of https://github.com/OpenRCT2/OpenRCT2.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity
26,414 Commits 7 Branches 39 Tags 344 MiB
Commit Graph

26414 Commits

Author SHA1 Message Date
ddevrien 962ee0f98f fix compile error 2014-05-15 13:13:58 +02:00
ddevrien 134391a120 map window: invalidate method implemented 2014-05-15 12:58:20 +02:00
IntelOrca afeef14feb Merge branch 'ddevrien-map-window' 2014-05-15 00:31:31 +01:00
IntelOrca 19dd6b1bde Merge branch 'duncanspumpkin-gfx_draw_sprite' into gfx_unstable 2014-05-15 00:25:47 +01:00
IntelOrca 12dfd1e644 fix warnings 2014-05-15 00:23:50 +01:00
IntelOrca 5067dc524d Merge branch 'gfx_draw_sprite' of https://github.com/duncanspumpkin/OpenRCT2 into duncanspumpkin-gfx_draw_sprite 2014-05-15 00:20:19 +01:00
Duncan Frost 7f20fa9338 Skipping buggy code for now. Will be looked at some time later 2014-05-14 22:14:46 +01:00
Duncan Frost 84c7f33ba1 Changed to memset to make code look a bit simpler 2014-05-14 22:07:59 +01:00
Duncan Frost ff86f7e9e9 sub0x67a934 turned into almost proper C code 2014-05-14 21:58:35 +01:00
ddevrien 0dac34dd2a map window paint method 2014-05-14 19:07:21 +02:00
Duncan 2c7118c01b Added guess about G1 dpi. 
Warning not tested.
 2014-05-14 17:01:13 +01:00
ddevrien 9fc3756c92 map window work + identified window var 4AC (selected tab idx) 2014-05-14 15:58:14 +02:00
ddevrien a8a0dbc073 sprite id error 2014-05-14 14:07:21 +02:00
ddevrien be52e47040 map widgets + identified spinner widget 2014-05-14 14:06:39 +02:00
IntelOrca 5498172a0c improve config_parse_currency 2014-05-14 12:14:03 +01:00
IntelOrca 9315c7ed26 Merge branch 'jvlomax-master' 2014-05-14 11:57:29 +01:00
ddevrien 90b7174a21 map window basic stuff done 2014-05-14 12:49:40 +02:00
ddevrien c069d0fa50 Started work on map window 2014-05-14 12:43:14 +02:00
Jørn Lomax 3fb61984f2 removed unwanted spaces 2014-05-14 12:28:03 +02:00
Jørn Lomax a682a5e9a5 more configuration moved to new format. Started separating setings into 
categories (general and sound so far)
 2014-05-14 12:25:35 +02:00
Jørn Lomax a104b4dd55 Merge remote-tracking branch 'upstream/master' 
Conflicts:
	src/addresses.h
	src/config.c
 2014-05-14 12:19:39 +02:00
IntelOrca cc850159e4 Merge branch 'duncanspumpkin-gfx_draw_sprite' into gfx_unstable 2014-05-14 11:02:16 +01:00
IntelOrca 9257cd1e3c Merge branch 'gfx_draw_sprite' of https://github.com/duncanspumpkin/OpenRCT2 into duncanspumpkin-gfx_draw_sprite 2014-05-14 11:00:00 +01:00
Jørn Lomax d1cec342f8 intermidiate commit 2014-05-14 11:54:56 +02:00
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
Duncan Frost 8ecde8f07a Moved around logic so it runs correctly 2014-05-13 20:10:49 +01:00
Duncan Frost 92386e5758 Fix sketchy line bug that i introduced 2014-05-13 19:12:18 +01:00
Duncan Frost 20c7b98c88 merge 2014-05-13 19:06:15 +01:00
Duncan Frost eb2682fbd4 Fix merge error 2014-05-13 19:03:23 +01:00
Duncan Frost ba16b197e3 Bug found in the first test doh. 2014-05-13 19:01:59 +01:00
Duncan Frost 1d754dc390 Still searching for bug 2014-05-13 18:32:57 +01: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
Duncan Frost 756f21b427 Trying to understand how the drawing function works 2014-05-12 22:04:07 +01: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