Commit Graph

2313 Commits

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