1
0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-06 06:32:56 +01:00
Commit Graph

367 Commits

Author SHA1 Message Date
Ted John
ea130a6126 Merge pull request #1694 from Gymnasiast/remove-six-flags-branding-and-limitations-2
Remove Six Flags branding and limitations, mark the lifecycle flag as deprecated, rename previously unidentified flag
2015-07-28 12:08:47 +01:00
Gymnasiast
9976b9673a Remove rest of Six Flags branding. 2015-07-28 10:13:16 +02:00
Ted John
c35d1ce65f Merge Localisation/master into OpenRCT2/develop. 2015-07-28 04:00:14 +01:00
Gymnasiast
5ed8948e4f Remove Six Flags branding and limitations, mark the lifecycle flag as deprecated, rename previously unidentified flag 2015-07-27 21:47:55 +02:00
Gymnasiast
65900982c4 Fix '1 weeks remaining' 2015-07-27 17:33:22 +02:00
Duncan
cfb8f3ae0a Merge pull request #1691 from Gymnasiast/more-obsolete-strings
Mark more obsolete strings
2015-07-27 12:23:30 +01:00
Gymnasiast
38f031655c Fix display of remaining marketing campaign weeks 2015-07-27 10:34:19 +02:00
Gymnasiast
c2fe82dcb7 Mark more obsolete strings 2015-07-27 10:16:08 +02:00
Ted John
0ef9627058 Merge Localisation/master into OpenRCT2/develop. 2015-07-27 04:00:15 +01:00
Ted John
30ee1096b7 Merge pull request #1684 from Gymnasiast/longer-marketing-campaigns-squash
Allow running marketing campaigns for up to 12 weeks
2015-07-26 21:48:39 +01:00
Gymnasiast
777065e6a6 Allow running marketing campaigns for up to 12 weeks 2015-07-26 22:36:12 +02:00
Ted John
8bfdbdec65 Merge pull request #1687 from Gymnasiast/fix-intro-option
Remove Infogrames disclaimer from intro and fix config option
2015-07-26 21:33:26 +01:00
Matt Layher
06f2adb9d6 Properly merge #1672: incorrect plural form for last inspection time, fixes #1513, closes #1672 2015-07-26 21:30:29 +01:00
Gymnasiast
ce7a0ac27b Remove Infogrames disclaimer from intro and fix config option 2015-07-26 16:07:58 +02:00
Gymnasiast
bcdfdcb7a0 Reorder Options window 2015-07-26 14:37:27 +02:00
Ted John
0d8d797f15 Merge Localisation/master into OpenRCT2/develop. 2015-07-26 04:00:14 +01:00
Ted John
f4216227f4 Merge pull request #1682 from Gymnasiast/upper-case-banners
Add feature to make banners display text in all caps
2015-07-25 20:50:02 +01:00
Gymnasiast
ae32b463c0 Add feature to make banners display text in all caps 2015-07-25 21:38:23 +02:00
Michael Steenbeek
290fbfb6e4 Fix typo 2015-07-25 18:09:30 +02:00
Michael Steenbeek
e3c275644b Update and mark obsolete strings 2015-07-25 18:07:38 +02:00
IntelOrca
5f69e6f37a add cycle day / night 2015-07-24 22:58:41 +01:00
IntelOrca
b12b1b5faf support map scroll keyboard shortcuts, e.g. WASD. Closes #757 2015-07-24 19:20:24 +01:00
IntelOrca
1f2502c8c2 add recent messages to toolbar, closes #1423 2015-07-22 18:13:35 +01:00
Ted John
18e492b898 Merge Localisation/master into OpenRCT2/develop. 2015-07-22 04:00:14 +01:00
Ted John
6d6ceccc97 Merge Localisation/master into OpenRCT2/develop. 2015-07-18 04:00:13 +01:00
Michael Steenbeek
57818c3835 Use standard spelling of 'tigre', closes #1637 2015-07-17 10:21:18 +02:00
IntelOrca
48028fcfc4 fix #1631, fix #1632 2015-07-16 16:42:46 +01:00
Ted John
f180ceb71c Merge Localisation/master into OpenRCT2/develop. 2015-07-15 04:00:16 +01:00
Michael Steenbeek
f7dd9859e4 Fix merge error in englush_uk.txt 2015-07-14 10:16:16 +02:00
Ted John
b04ba50400 Merge Localisation/master into OpenRCT2/develop. 2015-07-14 04:00:24 +01:00
Ted John
a1e67fd106 Merge Localisation/master into OpenRCT2/develop. 2015-07-11 04:00:40 +01:00
IntelOrca
c80475f7db allow disable clearance checks for footpaths 2015-07-10 21:38:05 +01:00
IntelOrca
9c8be6a483 allow disable clearance checks for footpaths 2015-07-10 21:33:32 +01:00
IntelOrca
d5ffaefdf0 add better disable clearance cheat 2015-07-10 21:32:11 +01:00
Gymnasiast
be635030bd Reorder cheats window, use actual currency, add cheats to give guests money and to set goal to have fun 2015-07-09 16:36:45 +02:00
IntelOrca
6527bc6ac2 add shortcut versions and rotate clockwise/anticlockwise shortcut 2015-07-09 13:50:33 +01:00
Runelaenen
8ec0024a4d Changed strings for #1495 2015-07-09 14:22:24 +02:00
Runelaenen
5109224ba0 Add submenu and anti-clockwise rotation 2015-07-09 14:22:22 +02:00
Ted John
ef7603013e Merge Localisation/master into OpenRCT2/develop. 2015-07-07 04:00:22 +01:00
Ted John
294456daa1 Merge Localisation/master into OpenRCT2/develop. 2015-07-06 04:00:17 +01:00
Michael Steenbeek
2c64609903 Properly differentiate between the Twister RC track and the Twister RC vehicle.
Stops two different rides from showing up as 'Twister RC'.
2015-07-05 11:01:20 +02:00
Ted John
8fe245721b Merge Localisation/master into OpenRCT2/develop. 2015-07-05 04:00:14 +01:00
zsilencer
76b231c150 add option to uncap fps, and fix #1470 2015-07-04 13:14:14 -06:00
Ted John
392c302d96 Merge Localisation/master into OpenRCT2/develop. 2015-07-04 04:00:14 +01:00
Duncan
e54e74257d Merge pull request #1515 from MaikelS11/build-ride-improvement
Back button on "Select Design" list #1346
2015-07-02 12:45:45 +01:00
Ted John
cbbf127185 Merge Localisation/master into OpenRCT2/develop. 2015-07-02 04:00:20 +01:00
Ted John
c0b45d8651 Merge Localisation/master into OpenRCT2/develop. 2015-07-01 04:00:15 +01:00
Ted John
ea88ae41a6 Merge Localisation/master into OpenRCT2/develop. 2015-06-30 04:00:16 +01:00
Maikel Stuivenberg
05e9cdd339 Tab to spaces (txt) and move item to end of list (strings_id) 2015-06-29 22:44:15 +02:00
Ted John
380d459dfb Merge Localisation/master into OpenRCT2/develop. 2015-06-29 04:00:15 +01:00