Commit Graph

2313 Commits

Author SHA1 Message Date
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
Ted John
d145711d37 Merge Localisation/master into OpenRCT2/develop. 2015-05-23 04:00:13 +01:00
Gymnasiast
0a093be3b1 Resolve merge conflict 2015-05-23 02:24:07 +02:00
Gymnasiast
7868d19522 Add option to exit Openrct2 2015-05-23 02:21:05 +02:00
Robert Jordan
37221f0aae Testing Improvements
Added test_unfinished_tracks and no_test_crashes
Both are enablable through the console and test_unfinished_tracks is
also an option.
Increased options window height.
Made it so "out" ride window is opened after a crash instead of RCT2's
ride window.
ride_is_valid_for_open has a counterpart: ride_is_valid_for_test
2015-05-22 14:18:48 -04:00
Gymnasiast
121052b807 Add cheat to unlock both entry and ride prices, reordered misc tab on cheats window 2015-05-22 12:41:22 +02:00
Ted John
05d709143c Merge Localisation/master into OpenRCT2/develop. 2015-05-22 04:00:13 +01:00
IntelOrca
0013310f0d add hardware display 2015-05-22 03:17:46 +01:00
Gymnasiast
36ccfe77e0 Add GUI option for switching to the RCT1 colour scheme, along with proper invalidation of the affected windows 2015-05-21 12:28:51 +02:00
Ted John
66b47d3339 Merge Localisation/master into OpenRCT2/develop. 2015-05-21 04:00:13 +01:00
IntelOrca
bdd712bc4b fix config parsing bug 2015-05-21 02:52:32 +01:00
Ted John
a27a516e30 Merge pull request #1112 from trigger-death/sprite-build-command
Sprite build command
2015-05-21 01:45:30 +01:00
IntelOrca
776c85db74 allow localisation of digit seperator and decimal point 2015-05-20 20:11:50 +01:00