OpenRCT2 git bot
787ddf811f
Merge Localisation/master into OpenRCT2/develop.
2017-05-09 04:00:21 +00:00
OpenRCT2 git bot
4ab1289c83
Merge Localisation/master into OpenRCT2/develop.
2017-05-08 04:00:23 +00:00
OpenRCT2 git bot
1dffe4ea3f
Merge Localisation/master into OpenRCT2/develop.
2017-05-06 04:00:22 +00:00
OpenRCT2 git bot
6e7ce919f7
Merge Localisation/master into OpenRCT2/develop.
2017-05-05 04:00:22 +00:00
OpenRCT2 git bot
f8cb551721
Merge Localisation/master into OpenRCT2/develop.
2017-05-04 04:00:18 +00:00
OpenRCT2 git bot
e4de788baf
Merge Localisation/master into OpenRCT2/develop.
2017-05-03 04:00:18 +00:00
OpenRCT2 git bot
5d4d3c6394
Merge Localisation/master into OpenRCT2/develop.
2017-05-01 04:00:22 +00:00
Pulkit
dff1d724a0
Updated the location of the mute button
2017-04-30 17:33:26 +01:00
Pulkit
f7d01e3983
Modified the Mute button Like the Cheat
...
I implemented the Mute button but for some reason I am unable to enable
the checkbox. Could someone kindly look into it
2017-04-30 17:33:26 +01:00
Pulkit
ffa3896b24
Mute Button Implemented like in RCT1
...
Added the Mute button, like requested in the Issue #1421 .
2017-04-30 17:33:21 +01:00
OpenRCT2 git bot
b45d4f328b
Merge Localisation/master into OpenRCT2/develop.
2017-04-30 04:00:18 +00:00
Harry Lam
ce5e6b7df4
en-GB: "harbor" -> "harbour" ( #5412 )
...
[ci skip]
2017-04-29 21:18:38 +02:00
OpenRCT2 git bot
ee4e863dc6
Merge Localisation/master into OpenRCT2/develop.
2017-04-29 04:00:21 +00:00
OpenRCT2 git bot
18ada57bab
Merge Localisation/master into OpenRCT2/develop.
2017-04-28 04:00:25 +00:00
Michael Steenbeek
92e110195e
Define native file dialog strings when loading heightmap, to avoid crashes
...
Thanks to @wolfreak99 for the fix.
2017-04-27 16:02:35 +02:00
OpenRCT2 git bot
20f36ec1ee
Merge Localisation/master into OpenRCT2/develop.
2017-04-27 04:00:21 +00:00
OpenRCT2 git bot
f26380c5b7
Merge Localisation/master into OpenRCT2/develop.
2017-04-26 04:00:22 +00:00
Michael Steenbeek
e8b5d418cd
en-GB: Change another occurrence of 'normalize'
...
[ci skip]
2017-04-25 15:26:37 +02:00
Michael Steenbeek
4942b6a2df
en-GB: Change 'normalize' to 'normalise'
...
[ci skip]
2017-04-25 15:23:52 +02:00
OpenRCT2 git bot
5b16e0587f
Merge Localisation/master into OpenRCT2/develop.
2017-04-25 04:00:23 +00:00
Broxzier
d8253ef849
Add error for loading non 24-bit bitmaps
2017-04-24 23:19:51 +02:00
Broxzier
2cd4a686f6
Disable page widgets until a map is loaded
...
A few strings have their {WINDOW_COLOUR_2} setting removed, since this
prevented strings from being market as inset. All uses of these strings
have been checked.
2017-04-24 23:19:51 +02:00
Broxzier
702d99e1e3
Initial prototype of loading heightmaps
...
Adds new strings and string ids for some future commits too.
2017-04-24 23:19:51 +02:00
Michael Steenbeek
a4b5b32839
Fix typo in ride description
2017-04-24 16:02:53 +02:00
OpenRCT2 git bot
a16220ef82
Merge Localisation/master into OpenRCT2/develop.
2017-04-24 04:00:21 +00:00
Hugo Wallenburg
6e41508bad
Make paths in STR_2743 consistent with STR_5836
2017-04-23 16:21:08 +02:00
OpenRCT2 git bot
bea17e1aa0
Merge Localisation/master into OpenRCT2/develop.
2017-04-23 04:00:17 +00:00
OpenRCT2 git bot
9bb0aab7e7
Merge Localisation/master into OpenRCT2/develop.
2017-04-22 04:00:22 +00:00
OpenRCT2 git bot
e72542be68
Merge Localisation/master into OpenRCT2/develop.
2017-04-21 04:00:19 +00:00
siomy11
7cf64d0bfe
Display "No mechanics are hired!" instead of "Calling mechanic..." when no mechanics are hired ( #5368 )
2017-04-16 22:38:02 +02:00
OpenRCT2 git bot
4a97d53c0a
Merge Localisation/master into OpenRCT2/develop.
2017-04-15 04:00:17 +00:00
OpenRCT2 git bot
f07fb2dfe1
Merge Localisation/master into OpenRCT2/develop.
2017-04-14 04:00:29 +00:00
OpenRCT2 git bot
8198254b72
Merge Localisation/master into OpenRCT2/develop.
2017-04-12 04:00:20 +00:00
wolfreak99
28c61e7068
Prepare scenario options sync
2017-04-11 14:26:25 +02:00
wolfreak99
fb62ed8ae2
Add "Quick demolish mode" to the Rides List
...
Taken from the "Quick fire mode" on the Staff List
2017-04-11 10:16:44 +02:00
OpenRCT2 git bot
998a05d217
Merge Localisation/master into OpenRCT2/develop.
2017-04-11 04:00:23 +00:00
Martin Müller
ae0c85f009
Add tooltip to the label and warn that restart is required
2017-04-10 14:10:54 +02:00
Martin Müller
b1bd899fb8
Add menu option for path to RCT 1
2017-04-10 14:08:58 +02:00
OpenRCT2 git bot
ae2e94ce54
Merge Localisation/master into OpenRCT2/develop.
2017-04-10 04:00:23 +00:00
OpenRCT2 git bot
d55258608b
Merge Localisation/master into OpenRCT2/develop.
2017-04-09 04:00:24 +00:00
OpenRCT2 git bot
1639f614f1
Merge Localisation/master into OpenRCT2/develop.
2017-04-08 04:00:16 +00:00
Michael Steenbeek
08ccdd6bf0
Fix Top Spin description typo from #5345
...
[ci skip]
2017-04-07 08:42:11 +02:00
Tom Delebo
e9c4365aa2
Add description and greeting textbox to server start menu
2017-04-06 14:31:36 +02:00
OpenRCT2 git bot
1659a93552
Merge Localisation/master into OpenRCT2/develop.
2017-04-06 04:00:18 +00:00
OpenRCT2 git bot
447153ccfb
Merge Localisation/master into OpenRCT2/develop.
2017-04-04 04:00:19 +00:00
Michael Steenbeek
c9c3025e2e
Merge pull request #5305 from IntelOrca/feature/scenery-eyedropper-tool
...
Add scenery eyedropper tool
2017-04-02 22:45:28 +02:00
Richard Jenkins
4da7e203ca
Improve clarity of scenario difficulty option text
2017-03-28 21:42:18 +02:00
OpenRCT2 git bot
44db9ce80c
Merge Localisation/master into OpenRCT2/develop.
2017-03-26 04:00:27 +00:00
OpenRCT2 git bot
78ff61ce31
Merge Localisation/master into OpenRCT2/develop.
2017-03-23 04:00:20 +00:00
OpenRCT2 git bot
468f369907
Merge Localisation/master into OpenRCT2/develop.
2017-03-17 04:00:28 +00:00
OpenRCT2 git bot
18767850bd
Merge Localisation/master into OpenRCT2/develop.
2017-03-16 04:00:18 +00:00
Ted John
6e7c5b7031
Add scenery eyedropper button
2017-03-13 18:05:13 +00:00
OpenRCT2 git bot
6880490c66
Merge Localisation/master into OpenRCT2/develop.
2017-03-12 04:00:17 +00:00
wolfreak99
2fe134fd5f
Make shortcut keys window bigger and resizable
2017-03-11 22:09:24 +01:00
OpenRCT2 git bot
2e37d6e427
Merge Localisation/master into OpenRCT2/develop.
2017-03-08 04:00:25 +00:00
OpenRCT2 git bot
38bc6f82e3
Merge Localisation/master into OpenRCT2/develop.
2017-03-07 04:00:24 +00:00
OpenRCT2 git bot
8bd10df859
Merge Localisation/master into OpenRCT2/develop.
2017-03-05 04:00:20 +00:00
OpenRCT2 git bot
a33752e1e3
Merge Localisation/master into OpenRCT2/develop.
2017-03-04 04:00:21 +00:00
Joël Troch
8167ff9678
Fix #1730 : Add keyboard shortcuts for track construction ( #5200 )
2017-03-03 09:35:42 +01:00
OpenRCT2 git bot
4aa44e15c6
Merge Localisation/master into OpenRCT2/develop.
2017-03-03 04:00:22 +00:00
OpenRCT2 git bot
2da540ba5c
Merge Localisation/master into OpenRCT2/develop.
2017-03-02 04:00:23 +00:00
OpenRCT2 git bot
6b3b4949fe
Merge Localisation/master into OpenRCT2/develop.
2017-03-01 04:00:17 +00:00
Michael Steenbeek
8e1794b032
en-GB: Fix americanism
2017-02-28 17:07:26 +01:00
Michael Steenbeek
ae978575f9
Fix spelling of 'Conger Eel', fixes #5252
2017-02-28 09:40:12 +01:00
wolfreak99
c6b5053261
Add cooldowns to help prevent mass demolishing
2017-02-28 09:31:26 +01:00
Duncan
1654ba4fe4
Merge pull request #5236 from duncanspumpkin/refactor
...
Refactor fence to wall
2017-02-28 06:56:06 +00:00
OpenRCT2 git bot
3a0318ff04
Merge Localisation/master into OpenRCT2/develop.
2017-02-26 04:00:16 +00:00
OpenRCT2 git bot
e8a7f9a065
Merge Localisation/master into OpenRCT2/develop.
2017-02-25 04:00:17 +00:00
OpenRCT2 git bot
9ee910c4db
Merge Localisation/master into OpenRCT2/develop.
2017-02-24 04:00:16 +00:00
OpenRCT2 git bot
7005d5dca1
Merge Localisation/master into OpenRCT2/develop.
2017-02-22 04:00:19 +00:00
duncanspumpkin
69af723972
Remove more fences
2017-02-21 20:22:03 +00:00
OpenRCT2 git bot
ba8f2ef103
Merge Localisation/master into OpenRCT2/develop.
2017-02-21 04:00:18 +00:00
OpenRCT2 git bot
a10173b928
Merge Localisation/master into OpenRCT2/develop.
2017-02-19 04:00:18 +00:00
OpenRCT2 git bot
9abff205c3
Merge Localisation/master into OpenRCT2/develop.
2017-02-18 04:00:20 +00:00
OpenRCT2 git bot
cfab71a076
Merge Localisation/master into OpenRCT2/develop.
2017-02-17 04:00:20 +00:00
Michał Janiszewski
6f7d869639
Merge pull request #5110 from Broxzier/tileinspector_multiplayer
...
Multiplayer support for the tile inspector
2017-02-15 13:20:35 +01:00
OpenRCT2 git bot
bea5a4316f
Merge Localisation/master into OpenRCT2/develop.
2017-02-15 04:00:24 +00:00
OpenRCT2 git bot
13df54c9d0
Merge Localisation/master into OpenRCT2/develop.
2017-02-13 04:00:19 +00:00
wolfreak99
5bdf2cac75
Add permissions for MODIFY_TILE command
2017-02-12 23:02:59 +01:00
Broxzier
06b73d03ab
Add missing string
...
[ci skip]
2017-02-12 23:02:16 +01:00
OpenRCT2 git bot
bf0be4ca98
Merge Localisation/master into OpenRCT2/develop.
2017-02-12 04:00:23 +00:00
Ted John
3a1331190b
Merge pull request #5203 from oli414/price-tooltips
...
Add tooltip for ride and entrance price when price is disabled for clarification
2017-02-11 11:57:05 +00:00
OpenRCT2 git bot
5f3fc807af
Merge Localisation/master into OpenRCT2/develop.
2017-02-11 04:00:24 +00:00
Olivier Wervers
dcf0702f3c
Fix #4493 : - Fix tooltip order.\n - Add tooltip to price label.
2017-02-10 19:30:57 +01:00
Olivier Wervers
9c8232e735
Added tooltip to ride and entrance price when price is disabled
2017-02-10 15:03:32 +01:00
OpenRCT2 git bot
0b4aa0d771
Merge Localisation/master into OpenRCT2/develop.
2017-02-05 04:00:18 +00:00
OpenRCT2 git bot
ae2e0faad0
Merge Localisation/master into OpenRCT2/develop.
2017-02-02 04:00:23 +00:00
OpenRCT2 git bot
457d3db612
Merge Localisation/master into OpenRCT2/develop.
2017-02-01 04:00:20 +00:00
OpenRCT2 git bot
a52339b13e
Merge Localisation/master into OpenRCT2/develop.
2017-01-29 04:00:21 +00:00
OpenRCT2 git bot
661ebbd997
Merge Localisation/master into OpenRCT2/develop.
2017-01-28 04:00:23 +00:00
OpenRCT2 git bot
8d56821f56
Merge Localisation/master into OpenRCT2/develop.
2017-01-27 04:00:18 +00:00
OpenRCT2 git bot
a72cf41fcf
Merge Localisation/master into OpenRCT2/develop.
2017-01-26 04:00:18 +00:00
zaxcav
5424e7774c
Display cut height in Units when Height Label: Units is selected in the options. ( #5115 )
2017-01-25 00:53:25 +01:00
OpenRCT2 git bot
89b7a173a4
Merge Localisation/master into OpenRCT2/develop.
2017-01-24 04:00:24 +00:00
zaxcav
80b0df3b74
Add formatting to tooltip texts; Fix printing of raw clip height value.
2017-01-22 21:21:00 +01:00
zaxcav
0d81835224
Correct mistakes during rebase.
2017-01-22 21:17:08 +01:00
zaxcav
e8f97da2c6
Implement further changes as requested by reviewer.
...
Add toggling displayed clip height value between the raw value and value in units.
2017-01-22 21:11:42 +01:00
zaxcav
25e57ca50d
Updated code as requested by reviewer.
...
Removed display of raw cut height value.
Changed display of cut height in METRIC/SI from 1DP to 2DP to display odd raw heights with accurate value.
Changed display of cut height in IMPERIAL to 1DP to display odd raw heights with accurate value.
2017-01-22 21:02:19 +01:00
zaxcav
a008dcb186
Display clip height in METRIC/SI units with 1DP.
2017-01-22 20:57:17 +01:00
zaxcav
0620321fb2
Re-added initialisation of scrollbar.
...
Added window theme, so window displays correctly everytime.
Changed strings.
Other minor tweaks to window.
2017-01-22 20:50:39 +01:00
zaxcav
e8d6cba5be
Initial attempt at paintClip UI
...
Compiles but untested.
NOT INTENDED FOR MERGING
2017-01-22 20:45:21 +01:00
Ted John
ed940ab41c
Merge pull request #5098 from IntelOrca/enable-lightfx
...
Resolve #5048 : Enable light FX
2017-01-22 01:31:56 +00:00
Ted John
fc66f42c31
Add config option to enable / disable light FX
2017-01-21 12:01:01 +00:00
OpenRCT2 git bot
4b0f45a740
Merge Localisation/master into OpenRCT2/develop.
2017-01-21 04:00:20 +00:00
OpenRCT2 git bot
8c9b57915c
Merge Localisation/master into OpenRCT2/develop.
2017-01-20 04:00:20 +00:00
OpenRCT2 git bot
cadb451806
Merge Localisation/master into OpenRCT2/develop.
2017-01-16 04:00:17 +00:00
OpenRCT2 git bot
ebf479d5bf
Merge Localisation/master into OpenRCT2/develop.
2017-01-12 04:00:17 +00:00
OpenRCT2 git bot
ea25a022ee
Merge Localisation/master into OpenRCT2/develop.
2017-01-11 04:00:17 +00:00
wolfreak99
8932f61a67
Add cheats to set/add money by custom amounts
2017-01-10 23:43:42 +01:00
OpenRCT2 git bot
e537a378dd
Merge Localisation/master into OpenRCT2/develop.
2017-01-08 04:00:21 +00:00
OpenRCT2 git bot
2d47ddb1b3
Merge Localisation/master into OpenRCT2/develop.
2017-01-06 04:00:15 +00:00
OpenRCT2 git bot
397806af19
Merge Localisation/master into OpenRCT2/develop.
2017-01-05 04:00:15 +00:00
OpenRCT2 git bot
b1b73a7745
Merge Localisation/master into OpenRCT2/develop.
2017-01-04 04:00:15 +00:00
Gymnasiast
5a82b2e0d1
Add booster elements to build window, fix implementation
2017-01-01 17:17:11 +01:00
OpenRCT2 git bot
68ed96194f
Merge Localisation/master into OpenRCT2/develop.
2017-01-01 04:00:23 +00:00
OpenRCT2 git bot
6080a159de
Merge Localisation/master into OpenRCT2/develop.
2016-12-29 04:00:21 +00:00
OpenRCT2 git bot
519903d657
Merge Localisation/master into OpenRCT2/develop.
2016-12-24 04:00:22 +00:00
Ted John
f57d69eeb9
Remove title sequences
2016-12-16 17:21:16 +00:00
OpenRCT2 git bot
fc9d3a2869
Merge Localisation/master into OpenRCT2/develop.
2016-12-14 04:00:20 +00:00
OpenRCT2 git bot
fe9dd6b7a8
Merge Localisation/master into OpenRCT2/develop.
2016-12-13 04:00:17 +00:00
OpenRCT2 git bot
1dd2751f4a
Merge Localisation/master into OpenRCT2/develop.
2016-12-07 04:00:19 +00:00
OpenRCT2 git bot
c462a6dd23
Merge Localisation/master into OpenRCT2/develop.
2016-12-06 04:00:17 +00:00
OpenRCT2 git bot
a5de893439
Merge Localisation/master into OpenRCT2/develop.
2016-12-04 04:00:22 +00:00
OpenRCT2 git bot
fc666e707a
Merge Localisation/master into OpenRCT2/develop.
2016-11-28 04:00:23 +00:00
OpenRCT2 git bot
039d64e256
Merge Localisation/master into OpenRCT2/develop.
2016-11-26 04:00:22 +00:00
OpenRCT2 git bot
f03f718dd1
Merge Localisation/master into OpenRCT2/develop.
2016-11-24 04:00:18 +00:00
OpenRCT2 git bot
0e37aa918c
Merge Localisation/master into OpenRCT2/develop.
2016-11-23 04:00:19 +00:00
OpenRCT2 git bot
349ca774ca
Merge Localisation/master into OpenRCT2/develop.
2016-11-22 04:00:15 +00:00
Michael Steenbeek
09d2f9417e
Label OpenGL experimental, fixes #4716
2016-11-21 09:49:07 +01:00
OpenRCT2 git bot
118ac9b062
Merge Localisation/master into OpenRCT2/develop.
2016-11-20 04:00:26 +00:00
OpenRCT2 git bot
516b4c645b
Merge Localisation/master into OpenRCT2/develop.
2016-11-16 04:00:18 +00:00
Ted John
4d7f52960d
Merge pull request #4737 from Broxzier/copy_element
...
Copy/paste single elements
2016-11-14 21:24:40 +00:00
OpenRCT2 git bot
4226f39a70
Merge Localisation/master into OpenRCT2/develop.
2016-11-14 04:00:23 +00:00
OpenRCT2 git bot
a327fe46a2
Merge Localisation/master into OpenRCT2/develop.
2016-11-11 04:00:21 +00:00
Broxzier
9c1998320d
Add tooltips to copy and paste buttons
2016-11-09 20:34:35 +01:00
Broxzier
c60463c8a7
Show error message when map element limit is reached
2016-11-09 20:25:40 +01:00
OpenRCT2 git bot
a934590826
Merge Localisation/master into OpenRCT2/develop.
2016-11-08 04:00:14 +00:00
OpenRCT2 git bot
780194d487
Merge Localisation/master into OpenRCT2/develop.
2016-11-07 04:00:18 +00:00
OpenRCT2 git bot
c94a009860
Merge Localisation/master into OpenRCT2/develop.
2016-11-06 04:00:18 +00:00
OpenRCT2 git bot
98981b691d
Merge Localisation/master into OpenRCT2/develop.
2016-11-05 04:00:21 +00:00
Michael Steenbeek
b5630a5a5e
Merge pull request #4701 from Overv/implement-disabled-land-rights
...
Resolves #4559 : Changes land rights buttons to be disabled if no tiles for sale remain
2016-11-03 19:42:08 +01:00
OpenRCT2 git bot
e3f76a1140
Merge Localisation/master into OpenRCT2/develop.
2016-11-03 04:00:20 +00:00
OpenRCT2 git bot
1fa99885d1
Merge Localisation/master into OpenRCT2/develop.
2016-11-02 04:00:24 +00:00
Alexander Overvoorde
bb059a2741
Resolves #4559 : Changes land rights buttons to be disabled if no tiles for sale remain
...
This commit changes the land rights button in the park window to be
disabled if there are no more land rights and construction rights for
sale. It also disables the individual land rights and construction
rights buttons in the land rights window itself if that specific type of
tile is no longer for sale.
This is implemented by introducing two new global variables called
gLandRemainingOwnershipSales and gLandRemainingConstructionSales. These
are updated by map_count_remaining_land_rights() to contain the number
of land rights and construction rights that remain for sale. This
function is called when a scenario is loaded and whenever the game
command to buy land rights or construction rights is invoked.
It also introduces three new tooltip strings that explain why the
buttons are disabled.
2016-10-31 20:21:10 +01:00
OpenRCT2 git bot
0f8cec0df8
Merge Localisation/master into OpenRCT2/develop.
2016-10-31 04:00:34 +00:00
OpenRCT2 git bot
6c801cf8c3
Merge Localisation/master into OpenRCT2/develop.
2016-10-29 04:00:22 +00:00
OpenRCT2 git bot
f241ae2181
Merge Localisation/master into OpenRCT2/develop.
2016-10-21 04:00:17 +00:00
OpenRCT2 git bot
04783e8905
Merge Localisation/master into OpenRCT2/develop.
2016-10-20 04:00:17 +00:00
Michael Steenbeek
0abb53f6ae
Merge pull request #4582 from wolfreak99/create_folder
...
"Create folder" button for save dialog
2016-10-19 11:06:45 +02:00
wolfreak99
ca19ececd6
Create folder button
...
Fixed remarks
Update comments to plural usage
2016-10-19 02:48:02 -04:00