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

1957 Commits

Author SHA1 Message Date
IntelOrca 64898b2858 Merge branch 'track-list-window' 2014-09-28 17:58:40 +01:00
IntelOrca 4aff83e508 implement sub_67726A, track loading function 2014-09-28 17:57:25 +01:00
IntelOrca b7162b6979 implement track_get_info 2014-09-28 00:58:05 +01:00
IntelOrca f246b97c69 implement window_track_list_select 2014-09-27 23:48:42 +01:00
IntelOrca a0bdde2525 implement track list window paint 2014-09-27 20:26:04 +01:00
IntelOrca 70ebc89c37 implement scrollmouseover and scrollpaint for track list window 2014-09-27 01:49:47 +01:00
IntelOrca f026f92d1e start implementation of track list window 2014-09-27 00:41:24 +01:00
Ted John b65554e669 Merge pull request #489 from hexdec/window_publisher_credits 
Decompiled publisher credits window.
 2014-09-26 21:22:04 +01:00
hexdec 6973b6586b Decompiled published credits window. 
Renamed window_credits to window_music_credits.
Added draw_string_centred_underline to gfx.c.
 2014-09-26 22:19:48 +02:00
Ted John 733c74a389 Merge pull request #486 from duncanspumpkin/fix_482 
Fix #482
 2014-09-24 19:18:48 +01:00
Duncan Frost ddc047241e Added some checks on object loading to eventualy fix #225 2014-09-24 17:47:19 +01:00
Duncan Frost 4d41118be7 Fixes #482 caused by not passing the widgetIndex and x and y coordinates. 2014-09-24 17:12:07 +01:00
Marco Costa 9d2ceec196 Basic analysis of window_map_mousedown 
* This function doesn't appear to relevant for the normal map window, as
it doesn't have the required widgets. Considering that the Scenario
Editor has a more complex map window, I assume that this function does
processing referred to that instance instead.
 2014-09-23 21:52:50 -04:00
IntelOrca 91bfc392c9 implement window_dropdown_show_colour 2014-09-23 21:22:14 +01:00
Ted John 912c80f867 Merge pull request #477 from zsilencer/master 
window_scroll_to_location
 2014-09-23 12:57:14 +01:00
Ted John 9124549b65 Merge pull request #480 from duncanspumpkin/fix_window_ride 
Fix window ride
 2014-09-23 12:57:07 +01:00
Ted John 2ff6d533e8 Merge pull request #481 from marcotc/work 
Fix errors/warnings in VS build
 2014-09-23 12:52:38 +01:00
Marco Costa 58cea29223 Fix errors/warnings in VS build 
* Added libspeex to 'Debug' target, previously only 'Release' had it.
* Initialize some pointers with NULL when an uninitialized code path is
unlikely, but possible.
 2014-09-22 20:37:35 -04:00
zsilencer 10f60d205d #479 2014-09-22 12:35:47 -06:00
Duncan Frost 69e13758d0 Move cursor location fix #476 2014-09-22 17:57:46 +01:00
Duncan Frost e0a7d4533d Use new ride window when clicking on ride 2014-09-22 17:46:14 +01:00
Duncan Frost b1886a53e4 Finished viewport_create for window_ride 2014-09-22 17:39:24 +01:00
zsilencer d4734c9ac2 Merge branch 'master' of https://github.com/IntelOrca/OpenRCT2 2014-09-22 02:15:47 -06:00
zsilencer f7cc9e4501 window_scroll_to_location 2014-09-22 02:04:10 -06:00
Duncan Frost 63280b200c Fix compile error 2014-09-21 17:44:22 +01:00
Duncan Frost 0f7ca91caf Started adding init_viewport 2014-09-21 17:44:22 +01:00
Duncan Frost 3c1a18e506 Fixes issues with colour drop down. 2014-09-21 17:44:21 +01:00
IntelOrca 8017bc8d27 fixes #472, invalid vehicle status' 2014-09-21 17:42:00 +01:00
IntelOrca 0164a1822a implement ride_get_measurement 2014-09-21 17:26:20 +01:00
IntelOrca fa8fca8dff remove warnings from audio.c 2014-09-21 15:40:39 +01:00
IntelOrca 2f8402e461 refactor peep easter egg names 2014-09-21 15:38:55 +01:00
IntelOrca 42ef09253e implement ride measurement update 2014-09-21 13:50:35 +01:00
IntelOrca f60b4d8f62 fix scroll flags not reset bug 2014-09-21 11:31:13 +01:00
Ted John 456e3983ce Merge pull request #469 from IntelOrca/ride-window 
Ride window
 2014-09-21 11:14:00 +01:00
Ted John 0e7037ee90 Merge pull request #471 from duncanspumpkin/fix_ride_window 
Fix small issues with ride_window.
 2014-09-21 11:03:47 +01:00
Duncan Frost fa2a5cfa2c Fix pressed widgets 2014-09-21 10:42:13 +01:00
Duncan Frost f2fe4df1ed Fix small issues with ride_window. 2014-09-21 09:21:36 +01:00
zsilencer 1856cedaa6 Merge remote-tracking branch 'remotes/remote/ride-window' 2014-09-20 20:11:51 -06:00
IntelOrca 012ffcd8b2 finish graph tab on ride window 2014-09-21 00:01:17 +01:00
IntelOrca 409ee7a3da implement most of graphs tab on ride window except drawing 2014-09-20 19:41:03 +01:00
IntelOrca 8f134f7278 fix viewport on ride window 2014-09-20 17:32:11 +01:00
IntelOrca 73b9e2127a Merge branch 'master' into ride-window 2014-09-20 17:20:18 +01:00
IntelOrca 30067346ae finish vehicle tab for ride window 2014-09-20 17:19:58 +01:00
IntelOrca ac5985eaa0 refactor ride entries for ride window 2014-09-20 16:02:21 +01:00
Ted John 6242019ab0 Merge pull request #466 from adrian17/window_peep_stats_bars_paint 
Decompile window_peep_stats_bars_paint
 2014-09-20 14:18:54 +01:00
Adrian Wielgosik f6c43e0b7d Decompile window_peep_stats_bars_paint 2014-09-20 12:19:06 +02:00
zsilencer 018762ed17 Merge branch 'master' of https://github.com/IntelOrca/OpenRCT2 2014-09-19 16:58:53 -06:00
IntelOrca 8355bf6a61 add drawing of vehicles on ride window vehicle page 2014-09-19 23:43:35 +01:00
IntelOrca 2d2face52a fix merge problems 2014-09-19 22:17:14 +01:00
IntelOrca 828dabc9be Merge branch 'master' into ride-window 
Conflicts:
	src/peep.c
	src/peep.h
	src/ride.c
	src/ride.h
	src/vehicle.h
 2014-09-19 22:11:20 +01:00