2450 Commits

Author SHA1 Message Date
Ted John
f0c97c0fa8 Merge Localisation/master into OpenRCT2/develop. 2015-06-03 04:00:12 +01:00
IntelOrca
137c8c190d add giant screenshot to file menu 2015-06-02 14:12:36 +01:00
Ted John
bf39fc36b1 Merge Localisation/master into OpenRCT2/develop. 2015-06-02 04:00:13 +01:00
Robert Jordan
80aaae3c8d Changed preset to theme 2015-06-01 11:06:07 -04:00
Robert Jordan
765bf976ee Renamed Colour Schemes to Themes
Themes window now opens to settings/presets tab so it's less confusing
for others.
Can no longer change default presets, you get a warning when you try.
now stores themes in themes folder.
Now clips theme names.
2015-06-01 11:02:09 -04:00
Ted John
0a5236be1c Merge Localisation/master into OpenRCT2/develop. 2015-06-01 04:00:13 +01:00
Ted John
da532dd7f0 Merge Localisation/master into OpenRCT2/develop. 2015-05-31 04:00:13 +01:00
rd3k
395773cdd6 Add cheat to make all guests feel nauseous 2015-05-31 02:04:01 +01:00
Robert Jordan
41171aa304 Resolved Merge Conflicts 2015-05-30 16:00:13 -04:00
Robert Jordan
eb19ae7995 Final changes 2015-05-30 12:43:24 -04:00
Robert Jordan
53a241d197 Finished ini file loading and removed warnings 2015-05-30 11:52:08 -04:00
Michael Steenbeek
b1e94bf110 Consistently use colons after labels that are followed by a dropdown 2015-05-30 14:35:59 +02:00
Ted John
7c29d781dc Merge Localisation/master into OpenRCT2/develop. 2015-05-30 04:00:13 +01:00
rd3k
257d3b8469 proper cheat and Twitch window tooltips, fix #1167 2015-05-30 02:51:20 +01:00
Robert Jordan
dbc1df308f Issues with Dropdown text 2015-05-29 16:42:57 -04:00
rd3k
3a55c060f7 fix #1163 2015-05-29 20:59:16 +01:00
Robert Jordan
dc1e38180e Starting work on colour schemes config settings 2015-05-29 12:04:53 -04:00
Ted John
12d5542861 Merge Localisation/master into OpenRCT2/develop. 2015-05-29 04:00:17 +01:00
Ted John
9dc19c6bc2 Merge Localisation/master into OpenRCT2/develop. 2015-05-28 04:00:22 +01:00
Ted John
6c89274bb1 Merge Localisation/master into OpenRCT2/develop. 2015-05-27 04:00:13 +01:00
Ted John
1fe3bacf43 Merge Localisation/master into OpenRCT2/develop. 2015-05-26 04:00:12 +01:00
Miso Zmiric (Mike Squinter)
c2c9bbf4ef add twitch integration, part 2 2015-05-25 20:38:33 +01:00
Ted John
b26e546171 Merge Localisation/master into OpenRCT2/develop. 2015-05-25 04:00:14 +01:00
Robert Jordan
6bc081edca Added date format to culture options menu 2015-05-24 12:38:07 -04:00
Gymnasiast
81272f5ab7 Resolved merge conflict 2015-05-23 14:22:24 +02:00