mirrors/OpenRCT2
2
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2.git synced 2024-08-28 13:11:32 +02:00
Code Issues Projects Releases Wiki Activity
1931 commits 9 branches 41 tags 334 MiB
Commit graph

1931 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
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