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

494 Commits

Author SHA1 Message Date
anyc d34e2db9e1 added GCC/MinGW-compatible assembler 2014-05-22 23:47:18 +02:00
anyc 872f4521a0 fixed strcat and rct2_startup_checks() 2014-05-22 20:18:42 +02:00
anyc e95e6310dc use SDL_HasMMX() do detect MMX capability 2014-05-22 20:17:13 +02: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 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
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
ddevrien 0dac34dd2a map window paint method 2014-05-14 19:07:21 +02: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
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
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