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 78aa9c706b Merge branch 'zsilencer-master' 2014-09-19 19:58:24 +01:00
IntelOrca f78b7a4c74 Merge branch 'master' of https://github.com/zsilencer/OpenRCT2 into zsilencer-master 
Conflicts:
	projects/openrct2.vcxproj.filters
 2014-09-19 19:58:09 +01:00
zsilencer a71fdf34b3 Merge branch 'master' of https://github.com/IntelOrca/OpenRCT2 
Conflicts:
	projects/openrct2.vcxproj.filters
 2014-09-18 21:46:46 -06:00
zsilencer 961e151232 0x0069A5A0, 0x006AC988, couple fixes 2014-09-18 20:48:04 -06:00
Ted John 4acb3c3a2c Merge pull request #462 from duncanspumpkin/fix_pickup 
Fixed dropdown location after pickup.
 2014-09-18 17:35:12 +01:00
Duncan Frost f25b6e2ba2 Fixed incorrectly assuming peep was underground if on water 2014-09-18 17:18:39 +01:00
Duncan Frost b40ebfe7a2 Fixed dropdown location after pickup. Labbeld variables to make it easier to read 2014-09-18 16:52:56 +01:00
IntelOrca fef1427271 implement most of vehicle tab for ride window 2014-09-18 02:48:51 +01:00
IntelOrca ccdc383a92 finish colour tab for ride window 2014-09-18 00:31:20 +01:00
IntelOrca 403d52b5e6 Merge branch 'master' into ride-window 2014-09-17 23:47:10 +01:00
IntelOrca 7002720f24 add and fix terrain get/set functions 2014-09-17 23:42:18 +01:00
IntelOrca c9e5765340 Merge branch 'master' of https://github.com/IntelOrca/OpenRCT2 2014-09-17 23:22:02 +01:00
IntelOrca 3430e4da6f add swedish.txt to VS filters 2014-09-17 23:21:51 +01:00
Ted John e37ffacd39 Merge pull request #461 from adrian17/footpath-construction-arrow 
Fix footpath construction arrow not showing up
 2014-09-17 23:18:19 +01:00
Adrian Wielgosik eded73c5fb Fix footpath construction arrow not showing up 2014-09-18 00:05:28 +02:00
zsilencer d276e40b7f 0x00401AF3, 0x006BC6D8, corrections 2014-09-17 13:44:29 -06:00
Ted John b559d79c5a Merge pull request #458 from duncanspumpkin/fix_405 
Fixes half drawn doors in scenery window
 2014-09-16 22:34:57 +01:00
Duncan Frost bcfe502647 Fixes half drawn doors in scenery window 2014-09-16 22:10:16 +01:00
Ted John f20763f080 Merge pull request #456 from duncanspumpkin/fix_455 
Fix #455.
 2014-09-16 21:12:20 +01:00
Duncan Frost f37928c06a Fix #455. Since there is no reason to show both quit windows may as well just close the previous one. 2014-09-16 21:06:47 +01:00
Ted John 4a77bec8fa Merge pull request #454 from duncanspumpkin/fix_432_and_peep 
Fix #432 and a few more peep variables named
 2014-09-16 18:58:28 +01:00
Duncan Frost f2f69bb788 Switched to no_of_rides instead of staff_type 2014-09-16 18:16:32 +01:00
Duncan Frost 722eac949a Labelled a few peep variables. Added voucher type enum 2014-09-16 18:13:18 +01:00
Duncan Frost 3afafe4f6b Fix #432. Mistake was caused by oppacity bit in colour 2014-09-16 17:59:22 +01:00
Ted John bbd1ead111 Merge pull request #429 from KingHual/master 
Added rct_peep struct union (staff_id and guest_peep_varC5)
 2014-09-16 16:51:13 +01:00
Ted John bfbe8215c2 Merge pull request #453 from adrian17/widget-click-fix 
Fix disabled widgets being clickable and reenable third tab of Cheats
 2014-09-16 16:14:14 +01:00
Adrian Wielgosik d17091f16b Fix disabled widgets being clickable and reenable third tab of Cheats 2014-09-16 16:33:45 +02:00
zsilencer d87ede04a4 gcc fix? 2014-09-15 15:19:12 -06:00
zsilencer 33ae29b11f hook 2014-09-15 15:14:06 -06:00
zsilencer 44683a9246 Merge branch 'master' of https://github.com/IntelOrca/OpenRCT2 2014-09-15 15:12:48 -06:00
zsilencer 298de189f5 0x006BBC6B, hook 2014-09-15 15:12:25 -06:00
Ted John bcaa8159f9 Merge pull request #439 from duncanspumpkin/fix_431 
Fixes unselectable fifth row. Fix #431.
 2014-09-15 21:54:40 +01:00
Duncan Frost 5b02d5b1f7 Fixes unselectable fifth row. Fix #431. 2014-09-15 21:42:49 +01:00
IntelOrca bd2ff2db05 Merge branch 'master' into ride-window 
Conflicts:
	src/peep.c
	src/peep.h
 2014-09-15 21:40:14 +01:00
Ted John 830f511a72 Merge pull request #430 from duncanspumpkin/window_peep_events 
Window peep events
 2014-09-15 21:36:15 +01:00
King_Hual 1c1db75c28 Added rct_peep struct union (staff_id and guest_peep_varC5) 2014-09-15 22:50:34 +03:00
Duncan Frost 7c6a35af7a Fix graphical bug when drawing inline sprites caused by using strlen instead of get_string_length 2014-09-15 20:49:18 +01:00
Duncan Frost 9aee80e5a6 Added enum name to window flag 2014-09-15 20:49:17 +01:00
Duncan Frost 7127140f16 Added window_peep_inventory events. All events finished. 2014-09-15 20:49:17 +01:00
Duncan Frost a730c4d106 Added window_peep_thoughts events. 2014-09-15 20:49:16 +01:00
Duncan Frost a309fa3e30 Finished window_peep_finance events. Added note to peep.h 2014-09-15 20:49:15 +01:00
Duncan Frost b34a65cafa Added window_peep_rides_scroll_paint. Peep rides finished 2014-09-15 20:49:14 +01:00
Duncan Frost ce1a4fe473 Added window_peep_rides_invalidate and paint 2014-09-15 20:49:13 +01:00
Duncan Frost 5498e3cb90 Added window_peep_rides_scroll_mouse_down and over 2014-09-15 20:49:13 +01:00
Duncan Frost 809a21f003 Added window_peep_rides_scroll_get_size and tooltip 2014-09-15 20:49:12 +01:00
Duncan Frost 9cfd0fba19 Added window_peep_rides_resize and update. Added not on use of peep rides been on 2014-09-15 20:49:11 +01:00
Duncan Frost a320e17a26 Finished window_peep_stats_paint. Fixed issue with trailing colon. Fixed incorrect peep.h mapping for time in park. 2014-09-15 20:49:11 +01:00
Duncan Frost b6e4d13139 Started adding peep_stats_paint. 2014-09-15 20:49:10 +01:00
Duncan Frost e23d52b456 Added window_peep_stats_invalidate and resize 2014-09-15 20:49:09 +01:00
Duncan Frost ef73084153 Added window_peep_unknown_05 and stats_resize. Added note about unknown 05 2014-09-15 20:49:09 +01:00