Commit Graph

2260 Commits

Author SHA1 Message Date
duncanspumpkin
45c4dfe12d Merge branch 'develop' into pre-release-0.0.3 2015-11-13 23:30:13 +00:00
Duncan
bc9a28d7ae Merge pull request #2261 from osconnoisseur/fix_2233
Add buttons for Up and New File in the load/save dialog and fix #2233
2015-11-13 22:50:46 +00:00
U-HP-Pavilion-PC\Cameron
e2545599ed Converted to sentence case and removed brackets from STR_2718 and 2719 in english_uk.txt 2015-11-13 16:25:52 -06:00
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
8bcf2e1b8c Merge Localisation/master into OpenRCT2/develop. 2015-11-13 04:00:17 +00:00
Michał Janiszewski
80510c91bd Add ui option to change scale in run-time
Doesn't let user go lower than 0.5f
2015-11-12 01:18:42 +01: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