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

1174 Commits

Author SHA1 Message Date
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