U-HP-Pavilion-PC\Cameron
557a89928c
Revert "Converted to sentence case and removed brackets from STR_2718 and STR_2719"
...
This reverts commit 7aa8e6040e
2015-11-13 16:23:16 -06:00
U-HP-Pavilion-PC\Cameron
7aa8e6040e
Converted to sentence case and removed brackets from STR_2718 and STR_2719
2015-11-13 16:08:33 -06:00
Ted John
207e8e8008
Merge Localisation/master into OpenRCT2/develop.
2015-11-10 04:00:19 +00:00
Ted John
03cbb37d8a
Merge Localisation/master into OpenRCT2/develop.
2015-11-09 04:00:16 +00:00
Ted John
40268878a0
Merge pull request #2245 from Gymnasiast/american-spelling
...
Correct two instances of American spelling
2015-11-08 12:49:49 +00:00
Michael Steenbeek
4855a53c22
Correct two instances of American spelling
2015-11-08 13:11:36 +01:00
Ted John
91edd322ae
Merge pull request #2242 from Gymnasiast/more-currencies
...
Add South Korean Won and Russian Rouble as currencies, closes #2222 , also fix #2232
2015-11-08 11:58:41 +00:00
Gymnasiast
4e5b8a1a19
Add South Korean Won and Russian Rouble as currencies, closes #2222 , also fix #2232
2015-11-08 11:46:11 +01:00
Michael Steenbeek
a1aa08b209
Fix #2231
2015-11-08 10:06:20 +01:00
IntelOrca
15f6f9b66a
remove git merge seperator
2015-11-08 04:10:40 +00:00
IntelOrca
40a885f2c4
Merge branch 'zsilencer-network' into develop
2015-11-08 04:08:53 +00:00
Ted John
301c7f53c1
Merge Localisation/master into OpenRCT2/develop.
2015-11-08 04:00:17 +00:00
zsilencer
1e9381ef97
master server list
2015-11-07 22:27:51 +00:00
zsilencer
9acfd27735
password prompt for client
2015-11-07 22:26:46 +00:00
zsilencer
3b639ced47
allow host to specify password #2072
2015-11-07 22:25:47 +00:00
Michael Steenbeek
c9808823a2
Add notice that 'No entrance' only works in OpenRCT2
2015-11-07 15:48:46 +01:00
Ted John
5d0e88afa0
Merge pull request #2218 from duncanspumpkin/corrupt
...
Corrupt Element Inserter
2015-11-07 11:44:25 +00:00
duncanspumpkin
983436d425
Implemented a insert corrupt element button on the tile inspector
2015-11-07 10:04:57 +00:00
Ted John
10674fe439
Merge Localisation/master into OpenRCT2/develop.
2015-11-07 04:00:18 +00:00
IntelOrca
daf95940ac
add warning message for two unstable cheats
2015-11-06 18:46:18 +00:00
Ted John
f68e307c06
Merge pull request #2211 from Gymnasiast/open-new-window
...
Correct 'Open new window'
2015-11-06 18:35:30 +00:00
Michał Janiszewski
2d62c356c3
Early out and report error if langauge files are missing
...
This is a common problem if you don't set up your paths properly on
Linux, so be nice and try to provide helpful message why we failed to
load instead of crashing on user a moment later.
2015-11-05 22:41:20 +01:00
Michael Steenbeek
68aea9740d
Update english_uk.txt
2015-11-05 14:43:06 +01:00
Michael Steenbeek
b3c8a1d2b7
Correct 'Open new window'
2015-11-05 10:08:08 +01:00
Ted John
273293456c
Merge Localisation/master into OpenRCT2/develop.
2015-11-03 04:00:16 +00:00
Ted John
1f9c02fc5f
Merge Localisation/master into OpenRCT2/develop.
2015-10-30 04:00:17 +00:00
Ted John
0b66558852
Merge Localisation/master into OpenRCT2/develop.
2015-10-29 04:00:17 +00:00
Ted John
7ac22b3be5
Merge Localisation/master into OpenRCT2/develop.
2015-10-28 04:00:16 +00:00
Ted John
4865cedc59
Merge Localisation/master into OpenRCT2/develop.
2015-10-27 04:00:18 +00:00
Ted John
04eacc8904
Merge Localisation/master into OpenRCT2/develop.
2015-10-26 04:00:17 +00:00
Hielke Morsink
dc8e197799
Added 10-minute inspections cheat.
2015-10-24 17:10:33 +02:00
Ted John
5e9912e880
Merge pull request #2038 from HaasJona/restart_required
...
Require a restart after changing hardware rendering
2015-10-24 14:44:01 +01:00
Jonathan Haas
475466dcd9
Require a restart after changing hardware rendering setting, decouple setting from active status
2015-10-24 12:50:28 +02:00
Ted John
ad7d2b3c00
Merge Localisation/master into OpenRCT2/develop.
2015-10-20 04:00:17 +01:00
Ted John
516cb1f7c9
Merge Localisation/master into OpenRCT2/develop.
2015-10-18 04:00:17 +01:00
IntelOrca
341b658ed0
add gui option for stay_connected
2015-10-16 22:45:17 +01:00
IntelOrca
6c6fa1d444
add ability for server to kick player, closes #2071
2015-10-16 22:20:16 +01:00
Ted John
6068b361bc
Merge Localisation/master into OpenRCT2/develop.
2015-10-16 04:00:16 +01:00
Ted John
fdfe52fc19
Merge pull request #2057 from Gymnasiast/show-vehicles-from-other-track-types
...
Show vehicles from other track types
2015-10-15 12:57:57 +01:00
Ted John
e6359f486b
Merge Localisation/master into OpenRCT2/develop.
2015-10-14 04:00:16 +01:00
Ted John
2db3f4ee23
Merge Localisation/master into OpenRCT2/develop.
2015-10-13 04:00:16 +01:00
Gymnasiast
105280a082
Introduce cheat option to show vehicles from other track types
2015-10-12 15:58:15 +02:00
Ted John
66dd53dd36
Merge pull request #2050 from OpenRCT2/game-command-land-smooth
...
Implement mountain tool + enhanced functionality.
2015-10-11 18:11:18 +01:00
IntelOrca
d5ae4a55ff
allow 1 to 64 mountain tool size
2015-10-11 12:26:33 +01:00
Ted John
fbd2598ac3
Merge Localisation/master into OpenRCT2/develop.
2015-10-11 04:00:16 +01:00
Ted John
06c33dfd8a
Merge Localisation/master into OpenRCT2/develop.
2015-10-06 04:00:17 +01:00
Ted John
21c84375f4
Merge Localisation/master into OpenRCT2/develop.
2015-10-05 04:00:16 +01:00
Ted John
5405cf7efd
Merge pull request #2012 from Overv/develop
...
Add Steam overlay detection that pauses the game (#1903 )
2015-10-05 00:07:10 +01:00
Ted John
928ef24684
Merge Localisation/master into OpenRCT2/develop.
2015-10-04 04:00:17 +01:00
Alexander Overvoorde
51377fc960
Add setting for Steam overlay pausing and add extra check
2015-10-03 23:10:56 +02:00
