Commit Graph

2260 Commits

Author SHA1 Message Date
LRFLEW
b588e519c4 Some Cleanup of Past PRs 2015-06-14 16:36:17 -05:00
Robert Jordan
06525fc83b Removed duplicate strings 2015-06-14 14:51:24 -04:00
Robert Jordan
9ae22b5938 Fixed merge conflicts 2015-06-14 12:21:13 -04:00
Robert Jordan
cbf27687cb Added ride filters in object selection 2015-06-14 12:19:54 -04:00
Ted John
ba36150d1b Merge Localisation/master into OpenRCT2/develop. 2015-06-14 04:00:14 +01:00
rd3k
6f28010e87 Add cheat window per-tab titles 2015-06-13 18:59:38 +01:00
IntelOrca
b69487cbba add changelog window 2015-06-13 13:30:50 +01:00
Ted John
b84322ad62 Merge Localisation/master into OpenRCT2/develop. 2015-06-13 04:00:13 +01:00
Ted John
e9d5489758 Merge Localisation/master into OpenRCT2/develop. 2015-06-12 04:00:14 +01:00
LRFLEW
09d6d9be1c Automatic staff placement
This will automatically place hired staff near a random guest (with
fallbacks if no guests are in the park). The setting can be toggled in
the options or by holding SHIFT when hiring.
2015-06-11 15:39:47 -05:00
rd3k
fb59dab59e Add debug toolbar menu, start tile inspector 2015-06-11 20:51:39 +01:00
IntelOrca
9dec3b09f4 reserve string IDs for new title sequence 2015-06-11 12:41:01 +01:00
Ted John
b10dffeac8 Merge Localisation/master into OpenRCT2/develop. 2015-06-11 04:00:15 +01:00
IntelOrca
125c01a147 Merge branch 'build-in-pause-mode-3' of https://github.com/Gymnasiast/OpenRCT2 into Gymnasiast-build-in-pause-mode-3
Conflicts:
	data/language/english_uk.txt
2015-06-10 18:44:38 +01:00
Ted John
f65ceff1d3 Merge pull request #1301 from runelaenen/develop
Fixed Clear Loan cheat
2015-06-10 18:39:19 +01:00
Gymnasiast
732319514f Allow building in pause mode via a cheat 2015-06-10 19:35:53 +02:00
Runelaenen
829e0712e4 Fixed Clear Loan cheat
The function already existed in the codebase. I've fixed it and added a
button.
2015-06-10 19:23:10 +02:00
Ted John
8a71ade8c6 Merge pull request #1300 from duncanspumpkin/fix_profit
Fix profit
2015-06-10 18:11:28 +01:00
Duncan Frost
792e70d00c Round the currency away from zero.
Change the profit per hour to use 2dp currency. Fixes #1227
2015-06-10 17:53:57 +01:00
Robert Jordan
f16c120200 Quick fire staff button 2015-06-10 12:17:42 -04:00
Robert Jordan
fb828afa1a Added RCT1 light tooltips 2015-06-10 11:47:54 -04:00
Ted John
472d546542 Merge pull request #1288 from trigger-death/force-ride-breakdown
Force ride breakdown and fix ride options
2015-06-10 10:34:59 +01:00
Ted John
90d5c07b88 Merge Localisation/master into OpenRCT2/develop. 2015-06-10 04:00:14 +01:00
Robert Jordan
10c1c29c11 Can now force ride breakdowns 2015-06-09 20:18:04 -04:00
LRFLEW
816944f78b EXPLODE!!!
Because why not
2015-06-09 18:14:28 -05:00