Commit graph

1257 commits

Author SHA1 Message Date
OpenRCT2 git bot
6b2a0063ee Merge Localisation/master into OpenRCT2/develop. 2017-12-28 04:00:35 +00:00
OpenRCT2 git bot
1b0d1b9238 Merge Localisation/master into OpenRCT2/develop. 2017-12-26 04:02:04 +00:00
Park Joon-Kyu
bbf5571c17 Allow filtering guests by name (#6633) 2017-12-25 12:17:37 +01:00
OpenRCT2 git bot
bde6ee4694 Merge Localisation/master into OpenRCT2/develop. 2017-12-25 04:01:10 +00:00
OpenRCT2 git bot
676bb47948 Merge Localisation/master into OpenRCT2/develop. 2017-12-24 04:00:25 +00:00
OpenRCT2 git bot
74abb6e919 Merge Localisation/master into OpenRCT2/develop. 2017-12-23 04:00:28 +00:00
Michael Steenbeek
2e79aaf54c Fold vehicle name into regular name 2017-12-22 15:28:41 +01:00
Aaron van Geffen
8fd4f323fd Reposition widgets in Miscellaneous tab; add strings. 2017-12-22 08:03:03 +01:00
OpenRCT2 git bot
001bbf65a9 Merge Localisation/master into OpenRCT2/develop. 2017-12-22 04:00:34 +00:00
OpenRCT2 git bot
12a3550ce9 Merge Localisation/master into OpenRCT2/develop. 2017-12-20 04:00:27 +00:00
OpenRCT2 git bot
aa23370f2d Merge Localisation/master into OpenRCT2/develop. 2017-12-18 04:00:24 +00:00
OpenRCT2 git bot
e9ecd63eae Merge Localisation/master into OpenRCT2/develop. 2017-12-16 04:00:20 +00:00
OpenRCT2 git bot
7816b11d70 Merge Localisation/master into OpenRCT2/develop. 2017-12-15 04:00:28 +00:00
LRFLEW
eed00ea363 Add Vsync Toggle to Options 2017-12-14 11:18:28 +01:00
OpenRCT2 git bot
68fac3b30a Merge Localisation/master into OpenRCT2/develop. 2017-12-11 04:00:33 +00:00
Michael Steenbeek
6c5ff424ae Missed occurrence 2017-12-08 09:29:47 +01:00
Michael Steenbeek
171271215e Change some ride type names for clarity, fix Americanism 2017-12-08 07:59:44 +01:00
OpenRCT2 git bot
25c54165e8 Merge Localisation/master into OpenRCT2/develop. 2017-12-06 04:02:49 +00:00
Michael Steenbeek
4e4a1a9d49 Revert accidental use of {SMALLFONT} after {MOVE_X}
{MOVE_X} is followed by a number. During initial import in 2014, {MOVE_X}{10} was accidentally replaced.
2017-12-05 15:43:27 +01:00
Christian F. Coors
0b45098e05 Fix music acknowledgement 2017-12-05 10:43:17 +01:00
Michael Steenbeek
0ffa2b541a Use more consistent terminology and remove some Americanisms 2017-12-05 10:23:36 +01:00
OpenRCT2 git bot
94a3d88691 Merge Localisation/master into OpenRCT2/develop. 2017-12-05 04:01:28 +00:00
Michael Steenbeek
b9a6382557 Remove unused tutorial and guest number strings 2017-12-04 11:27:37 +01:00
Michael Steenbeek
273edee634 Turn construction marker into a define 2017-12-04 11:26:53 +01:00
Aaron van Geffen
1ef73997b5 Removed interface to window limit setting. 2017-12-04 11:26:53 +01:00
Aaron van Geffen
c000263bbb Remove construction marker colour option. 2017-12-04 11:26:53 +01:00
Aaron van Geffen
38d45a102b Remove interface to option for handymen mowing by default. 2017-12-04 11:26:53 +01:00
Aaron van Geffen
837b177d9d Simplify UI scaling display quality options (#6764)
Simplify UI scaling display quality options.

This removes three options:
* 'Use NN scaling at integer scales', as NN is decidedly preferable at integer scales.
* Anisotropic scaling, as it produces results very similar (if not equal) to linear scaling.
* NN as a selectable option in the dropdown - NN is forced on integer scales and unavailable for non-integer scales.
2017-12-03 22:35:16 +01:00
OpenRCT2 git bot
08893ecff9 Merge Localisation/master into OpenRCT2/develop. 2017-12-03 04:02:57 +00:00
Michael Steenbeek
63f7820b25 Fix #1185: Close button colour of prompt windows does not match 2017-12-01 17:36:30 +01:00
OpenRCT2 git bot
f4b6b728e3 Merge Localisation/master into OpenRCT2/develop. 2017-12-01 04:00:39 +00:00
OpenRCT2 git bot
5d5c64acbf Merge Localisation/master into OpenRCT2/develop. 2017-11-30 04:00:45 +00:00
OpenRCT2 git bot
743c79c169 Merge Localisation/master into OpenRCT2/develop. 2017-11-29 04:00:46 +00:00
OpenRCT2 git bot
66aa25da81 Merge Localisation/master into OpenRCT2/develop. 2017-11-28 04:01:14 +00:00
OpenRCT2 git bot
a3be15c9c9 Merge Localisation/master into OpenRCT2/develop. 2017-11-27 04:01:17 +00:00
OpenRCT2 git bot
94c4c285ee Merge Localisation/master into OpenRCT2/develop. 2017-11-26 04:00:30 +00:00
OpenRCT2 git bot
4b860f5efd Merge Localisation/master into OpenRCT2/develop. 2017-11-25 04:01:15 +00:00
Michael Steenbeek
d88c01de74 Split Steel Wild Mouse and Spinning Wild Mouse when using Ride Groups
Includes a little cleanup for the Ride Groups and a fix in the table with available pieces, which erroneously listed banked pieces as available.
2017-11-23 16:00:58 +01:00
OpenRCT2 git bot
ad8fce4d77 Merge Localisation/master into OpenRCT2/develop. 2017-11-23 04:01:09 +00:00
zyliwax
7bffc4ae33 Adding gridlines display toggle shortcut. (#6313)
This feature existed in the original RCT1/2 games but was not present in
the latest development commit.

The original shortcut for this key was '7', placing it between the
"Invisible people toggle" (6) shortcut and the "Height marks on land
toggle" (8). This commit preserves as much as possible, using
placeholder comments that signify the relevant values which this
feature actually uses where this is not possible.
2017-11-22 12:02:23 +00:00
OpenRCT2 git bot
65ab767597 Merge Localisation/master into OpenRCT2/develop. 2017-11-22 04:00:47 +00:00
Michael Steenbeek
c1400a12eb Allow separate ride and vehicle names per ride entry 2017-11-21 18:55:42 +01:00
OpenRCT2 git bot
28497cae4a Merge Localisation/master into OpenRCT2/develop. 2017-11-21 04:00:34 +00:00
Michael Steenbeek
adae6041f3 Show list of available vehicles in New Ride window 2017-11-20 19:42:29 +01:00
OpenRCT2 git bot
36236d8c97 Merge Localisation/master into OpenRCT2/develop. 2017-11-17 04:00:43 +00:00
OpenRCT2 git bot
891de0ad3e Merge Localisation/master into OpenRCT2/develop. 2017-11-11 04:02:02 +00:00
OpenRCT2 git bot
c56d5b5f81 Merge Localisation/master into OpenRCT2/develop. 2017-11-09 04:00:20 +00:00
OpenRCT2 git bot
0e4d9a2518 Merge Localisation/master into OpenRCT2/develop. 2017-11-08 04:00:35 +00:00
Philip Goto
8be9e156dd Modify explanation tooltip of scaling quality option 2017-11-06 23:05:21 +01:00
Philip Goto
ad3f23162a Add explanation tooltip to scaling quality option 2017-11-06 23:05:21 +01:00
Philip Goto
b66df2d6db Add smooth nearest neighbor scaling
This commit implements smooth nearest neighbor scaling, this scaling method looks sharper than linear scaling and not deformed like NN scaling.
2017-11-06 23:05:21 +01:00
OpenRCT2 git bot
46f898e992 Merge Localisation/master into OpenRCT2/develop. 2017-11-06 04:00:28 +00:00
OpenRCT2 git bot
ce6ae6d07a Merge Localisation/master into OpenRCT2/develop. 2017-11-04 04:00:41 +00:00
OpenRCT2 git bot
a8374af240 Merge Localisation/master into OpenRCT2/develop. 2017-11-03 04:00:32 +00:00
OpenRCT2 git bot
e9c7f6d589 Merge Localisation/master into OpenRCT2/develop. 2017-11-02 04:00:33 +00:00
Michael Steenbeek
3d8ec4e393 Warn when loading incompatible RCTC saves 2017-11-01 20:23:06 +01:00
OpenRCT2 git bot
e656418286 Merge Localisation/master into OpenRCT2/develop. 2017-10-30 04:00:30 +00:00
OpenRCT2 git bot
33dd3b2275 Merge Localisation/master into OpenRCT2/develop. 2017-10-25 04:00:33 +00:00
OpenRCT2 git bot
f938904cfe Merge Localisation/master into OpenRCT2/develop. 2017-10-24 04:00:27 +00:00
OpenRCT2 git bot
47f5423845 Merge Localisation/master into OpenRCT2/develop. 2017-10-23 04:00:25 +00:00
OpenRCT2 git bot
5c98c7ee5e Merge Localisation/master into OpenRCT2/develop. 2017-10-22 04:00:35 +00:00
OpenRCT2 git bot
34fe5ac976 Merge Localisation/master into OpenRCT2/develop. 2017-10-21 04:00:25 +00:00
OpenRCT2 git bot
46961f1813 Merge Localisation/master into OpenRCT2/develop. 2017-10-20 04:00:23 +00:00
Aaron van Geffen
9f67fafc43 Add theme support for console background colour. 2017-10-19 21:26:53 +02:00
OpenRCT2 git bot
814b28c814 Merge Localisation/master into OpenRCT2/develop. 2017-10-19 04:00:26 +00:00
Robert Jordan
ec22d04089 Fix #6470: Title sequence naming issues
Predefined title sequence filenames are now treated as "reserved".
Custom title sequences cannot use reserved names and an error will
appear if the user tries.

Duplicating predefined title sequence now uses default text of
predefined sequence's proper name instead of filename.

Renamed `WIDX_TITLE_EDITOR_RENAME_SAVE_BUTTON` to
`WIDX_TITLE_EDITOR_RENAME_BUTTON` to follow formatting of other preset
button ids.

Added string id 6154, `STR_ERROR_RESERVED_NAME`, "Name is reserved".
2017-10-18 11:18:14 +02:00
OpenRCT2 git bot
a7ff610c4b Merge Localisation/master into OpenRCT2/develop. 2017-10-18 04:00:32 +00:00
OpenRCT2 git bot
2ec1c71c9f Merge Localisation/master into OpenRCT2/develop. 2017-10-17 04:00:34 +00:00
OpenRCT2 git bot
a31add2141 Merge Localisation/master into OpenRCT2/develop. 2017-10-16 04:00:30 +00:00
OpenRCT2 git bot
691fb3ab51 Merge Localisation/master into OpenRCT2/develop. 2017-10-15 04:00:34 +00:00
Krutonium
fd459f0791 Add a visible notification for missing KDialog/Zenity 2017-10-14 22:16:51 +02:00
OpenRCT2 git bot
18d29fdc24 Merge Localisation/master into OpenRCT2/develop. 2017-10-13 04:00:32 +00:00
OpenRCT2 git bot
a27adb5df0 Merge Localisation/master into OpenRCT2/develop. 2017-10-12 06:38:35 +00:00
Michael Steenbeek
17557569d0 Turn 'unlock all prices' into a regular option
This uses a previously unused S6 flag to save this option persistently.
This should not make S6 import much harder, but should reduce the amount of questions about S4 import.

Also refactor the checks whether the user can ask money for rides or entry. This should make it a lot easier
when our own save format comes around.
2017-10-11 08:33:17 +02:00
OpenRCT2 git bot
c724074ff4 Merge Localisation/master into OpenRCT2/develop. 2017-10-09 04:00:26 +00:00
Christian F. Coors
e737b3108c Add status messages to server list window 2017-10-08 11:51:22 +02:00
OpenRCT2 git bot
b56ad772f4 Merge Localisation/master into OpenRCT2/develop. 2017-10-07 04:00:21 +00:00
OpenRCT2 git bot
e5fe681793 Merge Localisation/master into OpenRCT2/develop. 2017-10-06 04:00:24 +00:00
OpenRCT2 git bot
8d2769dbc9 Merge Localisation/master into OpenRCT2/develop. 2017-10-04 04:00:31 +00:00
OpenRCT2 git bot
396793739a Merge Localisation/master into OpenRCT2/develop. 2017-10-03 04:00:38 +00:00
OpenRCT2 git bot
606130c2bb Merge Localisation/master into OpenRCT2/develop. 2017-10-02 04:00:27 +00:00
OpenRCT2 git bot
58b980d6ba Merge Localisation/master into OpenRCT2/develop. 2017-09-30 04:00:30 +00:00
OpenRCT2 git bot
43e1e711b7 Merge Localisation/master into OpenRCT2/develop. 2017-09-29 04:00:29 +00:00
OpenRCT2 git bot
f5cc789978 Merge Localisation/master into OpenRCT2/develop. 2017-09-24 04:00:24 +00:00
OpenRCT2 git bot
e1568aab21 Merge Localisation/master into OpenRCT2/develop. 2017-09-23 04:00:26 +00:00
OpenRCT2 git bot
08eef61eb4 Merge Localisation/master into OpenRCT2/develop. 2017-09-22 04:00:21 +00:00
OpenRCT2 git bot
3818ee5577 Merge Localisation/master into OpenRCT2/develop. 2017-09-21 04:00:25 +00:00
OpenRCT2 git bot
a24f2fba6a Merge Localisation/master into OpenRCT2/develop. 2017-09-20 04:00:24 +00:00
OpenRCT2 git bot
a774ae8bd7 Merge Localisation/master into OpenRCT2/develop. 2017-09-15 04:00:21 +00:00
Michael Steenbeek
d551108f12 en-GB: Fix typo 2017-09-14 13:34:54 +02:00
OpenRCT2 git bot
185ae6ff07 Merge Localisation/master into OpenRCT2/develop. 2017-09-14 04:00:26 +00:00
Michael Steenbeek
d4cc97165c Clean up brake speed in ride construction window, fix #6271 2017-09-13 21:57:36 +02:00
Michael Steenbeek
597d40b25b Add cheat to show all drawable track elements 2017-09-13 19:38:30 +02:00
OpenRCT2 git bot
c6e162e31c Merge Localisation/master into OpenRCT2/develop. 2017-09-13 04:00:20 +00:00
OpenRCT2 git bot
e8d1cdbd99 Merge Localisation/master into OpenRCT2/develop. 2017-09-12 04:00:20 +00:00
OpenRCT2 git bot
2e8d1b5ed7 Merge Localisation/master into OpenRCT2/develop. 2017-09-09 04:00:18 +00:00
OpenRCT2 git bot
0fe18149ee Merge Localisation/master into OpenRCT2/develop. 2017-09-05 04:00:19 +00:00
OpenRCT2 git bot
49066bac4a Merge Localisation/master into OpenRCT2/develop. 2017-09-03 04:00:21 +00:00
OpenRCT2 git bot
4a5e5b6519 Merge Localisation/master into OpenRCT2/develop. 2017-09-02 04:00:17 +00:00
Ted John
3f1991804a Add debug option to show dirty blocks 2017-08-31 22:36:15 +01:00