mirrors
/
OpenRCT2
mirror of https://github.com/OpenRCT2/OpenRCT2.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity
739 Commits 8 Branches 40 Tags 362 MiB
Commit Graph

739 Commits

Author SHA1 Message Date
Kevin Burke 7483ac2307 refactor, fix tabbing 2014-05-22 09:02:55 +09:00
Kevin Burke 2c03908700 revert change in config.c 2014-05-22 08:59:58 +09:00
Kevin Burke cd414e98f6 minor changes to get it to compile 2014-05-21 09:06:38 -07:00
Kevin Burke c374536cbb more work on crooked house 2014-05-22 01:00:58 +09:00
Kevin Burke 5fbe85aded WIP: add ratings for crooked house 2014-05-21 23:27:31 +09:00
lnz 1dc5b65767 Initial implementation of ride reachability checks 2014-05-21 14:04:08 +02:00
Kevin Burke 2d08752a04 comment ride status 2014-05-21 11:59:05 +09:00
anyc e6c90c6ebb fixed static enums; added missing headers 2014-05-20 17:55:39 +02:00
anyc 82fa4439bf renamed strings.[ch] to string_ids.[ch] due to name collision 2014-05-20 17:55:39 +02:00
IntelOrca 0821e5547b Merge branch 'ZedThree-fill_rect_inset' into gfx_unstable 2014-05-20 03:20:34 +01:00
IntelOrca bab6e9a290 Merge branch 'duncanspumpkin-c_based_window_event_handlers' 2014-05-20 03:18:50 +01:00
IntelOrca 5823e9dac1 Merge branch 'c_based_window_event_handlers' of https://github.com/duncanspumpkin/OpenRCT2 into duncanspumpkin-c_based_window_event_handlers 2014-05-20 03:18:18 +01:00
IntelOrca e13f0e0ed3 Merge branch 'MaciekBaron-master' 2014-05-20 03:17:39 +01:00
IntelOrca 827537945b Merge branch 'master' of https://github.com/MaciekBaron/OpenRCT2 into MaciekBaron-master 2014-05-20 03:17:10 +01:00
IntelOrca 7304a96d63 Merge branch 'ddevrien-map-window' 2014-05-20 03:16:18 +01:00
IntelOrca 508527775f Merge branch 'map-window' of https://github.com/ddevrien/OpenRCT2 into ddevrien-map-window 2014-05-20 03:15:44 +01:00
Duncan Frost 87d855b95d Fixed bug due to options window calling update on WM_INVALIDATE 2014-05-19 19:14:29 +01:00
Duncan Frost d077beea20 Changed window_update to use cdecl where possible 2014-05-19 18:47:14 +01:00
Duncan Frost aaca1d2ece Started switch over to c based window event handlers with backwards compatibility 2014-05-18 20:32:50 +01:00
Maciek Baron d5d352cd41 Implementing small loan & cheat detection related routine 2014-05-17 16:04:19 +01:00
Maciek Baron 9e0c310320 Labelling path construction related addresses 2014-05-17 15:21:34 +01:00
ZedThree e209e370be Tidy up gfx_fill_rect_inset 
Give names to flags and different tones
 2014-05-16 19:53:12 +02:00
ZedThree 4fae966855 Bug fix: pressed buttons not the right colour 2014-05-16 19:53:11 +02:00
ZedThree 67980e2f5f Fix bug with transparency 2014-05-16 19:53:11 +02:00
ZedThree 088ac32da3 Add gfx_fill_rect 
Still a little buggy for transparent colours
 2014-05-16 19:53:11 +02:00
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