27657 Commits

Author SHA1 Message Date
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