Commit graph

853 commits

Author SHA1 Message Date
OpenRCT2 git bot
da631e9009 Merge Localisation/master into OpenRCT2/develop. 2016-03-03 04:00:16 +00:00
IntelOrca
c60e05fc99 add default ride inspection interval option, closes #1455 2016-03-02 19:27:54 +00:00
OpenRCT2 git bot
9cc930ebac Merge Localisation/master into OpenRCT2/develop. 2016-03-02 04:00:17 +00:00
IntelOrca
dcf09c5d4b show total number of players online on server list 2016-03-01 18:45:30 +00:00
OpenRCT2 git bot
e94d2a9d8b Merge Localisation/master into OpenRCT2/develop. 2016-03-01 04:00:23 +00:00
IntelOrca
e57f27e1a1 improve group renaming 2016-02-29 22:34:37 +00:00
IntelOrca
a634aacfab show information about locked scenarios, closes #2660 2016-02-29 21:28:01 +00:00
Michael Steenbeek
ad37bd0496 UK: Typo 2016-02-29 11:11:51 +01:00
IntelOrca
5ee023c86e reinstate string id: 5664 2016-02-28 10:37:44 +00:00
OpenRCT2 git bot
9e732095ec Merge Localisation/master into OpenRCT2/develop. 2016-02-28 04:00:13 +00:00
OpenRCT2 git bot
af72a537af Merge Localisation/master into OpenRCT2/develop. 2016-02-27 04:00:19 +00:00
Michał Janiszewski
e232358608 Display message with chat shortcut keys upon connection
Works for server as well.
2016-02-26 10:26:30 +01:00
OpenRCT2 git bot
adde88ca92 Merge Localisation/master into OpenRCT2/develop. 2016-02-26 04:00:23 +00:00
IntelOrca
1dde20a8f5 remove unused string ID 2016-02-25 20:21:22 +00:00
IntelOrca
6484326892 use built ago label for ride list instead of age 2016-02-25 17:59:32 +00:00
Jacob Wallraff
eb706fbdf5 Adding string ids 2016-02-25 17:59:31 +00:00
Ted John
74973a4a97 Merge pull request #2950 from janisozaur/ride-names
Rename ride_entry functions and provide better logging
2016-02-25 12:43:19 +00:00
OpenRCT2 git bot
10dbcfe447 Merge Localisation/master into OpenRCT2/develop. 2016-02-25 04:00:14 +00:00
IntelOrca
b0887f174b split sound and music mixing correctly, closes #1270 2016-02-24 22:42:50 +00:00
Michał Janiszewski
d19fe0e334 Make sure null ride type gets handled properly 2016-02-24 23:16:25 +01:00
OpenRCT2 git bot
2e81dfa29e Merge Localisation/master into OpenRCT2/develop. 2016-02-24 04:00:13 +00:00
OpenRCT2 git bot
fe7c99e256 Merge Localisation/master into OpenRCT2/develop. 2016-02-23 04:00:20 +00:00
OpenRCT2 git bot
196d3d8dcc Merge Localisation/master into OpenRCT2/develop. 2016-02-22 04:00:14 +00:00
Gymnasiast
21cb7a948b Make 'All files' translatable 2016-02-21 18:42:55 +01:00
OpenRCT2 git bot
9c08d03b0d Merge Localisation/master into OpenRCT2/develop. 2016-02-21 04:00:14 +00:00
Gymnasiast
d32b7286f5 Adjust string ids 2016-02-21 00:21:14 +01:00
Ted John
5182441768 Merge pull request #2968 from octaroot/add_multiplayer_strings
Fix #2802 - extract hardcoded network-related strings
2016-02-20 15:07:53 +00:00
OpenRCT2 git bot
05d66fac25 Merge Localisation/master into OpenRCT2/develop. 2016-02-20 04:00:14 +00:00
Martin Černáč
830b897dc6 Refactor conditional buffers and string_ids 2016-02-19 17:17:10 +01:00
Martin Černáč
62672af35e Refactor sprintf and string_formater usages 2016-02-18 17:43:47 +01:00
Martin Černáč
361d30c6f5 Fix #2802 - extract hardcoded network-related strings
I extracted all of the hardcoded network-related strings. In addition to that, I also refactored the way last_disconnect_reason was being accessed/modified.
2016-02-18 14:52:02 +01:00
OpenRCT2 git bot
b13af3c8f5 Merge Localisation/master into OpenRCT2/develop. 2016-02-18 04:00:15 +00:00
Martin Černáč
fdfb4f7bd3 Add "neverending marketing" cheat
This cheat allows the player to have never-ending marketing campaigns
2016-02-17 09:35:56 +01:00
OpenRCT2 git bot
ab04ece601 Merge Localisation/master into OpenRCT2/develop. 2016-02-14 04:00:17 +00:00
Ted John
6d384fa2e5 Merge pull request #2911 from Overv/show-peeps-in-closed-ride
Show amount of peeps still on ride in tooltip when ride is closed (resolves #2708)
2016-02-13 11:19:40 +00:00
Alexander Overvoorde
d07b7159c8 Add amount of customers currently on ride to customers tab 2016-02-13 04:23:59 +01:00
OpenRCT2 git bot
6d47bf19d3 Merge Localisation/master into OpenRCT2/develop. 2016-02-12 04:00:14 +00:00
OpenRCT2 git bot
d87bb01801 Merge Localisation/master into OpenRCT2/develop. 2016-02-11 04:00:17 +00:00
Alexander Overvoorde
5ee7d1bbae Show amount of peeps still on ride in tooltip when ride is closed (resolves #2708) 2016-02-10 22:29:19 +01:00
OpenRCT2 git bot
629bb93e3e Merge Localisation/master into OpenRCT2/develop. 2016-02-10 04:00:14 +00:00
OpenRCT2 git bot
03b34459dd Merge Localisation/master into OpenRCT2/develop. 2016-02-09 04:00:15 +00:00
OpenRCT2 git bot
4ae8d450e0 Merge Localisation/master into OpenRCT2/develop. 2016-02-07 04:00:12 +00:00
OpenRCT2 git bot
3a3b731db6 Merge Localisation/master into OpenRCT2/develop. 2016-02-05 04:00:11 +00:00
OpenRCT2 git bot
45cf56167b Merge Localisation/master into OpenRCT2/develop. 2016-02-04 04:00:15 +00:00
IntelOrca
72bed4f677 fix theme window strings 2016-02-03 18:28:25 +00:00
IntelOrca
c99ec93295 add theme entries for new windows 2016-02-03 18:23:47 +00:00
OpenRCT2 git bot
a2c607682c Merge Localisation/master into OpenRCT2/develop. 2016-02-03 04:00:11 +00:00
zsilencer
b2083deed0 implement cheats over multiplayer 2016-02-02 14:08:59 -07:00
OpenRCT2 git bot
7e21ef7ca4 Merge Localisation/master into OpenRCT2/develop. 2016-02-02 04:00:12 +00:00
Michał Janiszewski
f352fb7d47 Better options window design for scaling 2016-02-01 21:23:20 +01:00
Michał Janiszewski
b3ed293bb3 Add another page to options
All 32 available widgets on "Display" page were taken, this adds another
page, "Rendering", to the options window, so it can hold remaining widgets.
2016-02-01 21:19:28 +01:00
Michał Janiszewski
80ad302087 Allow user to use NN scaling at integer scales
While linear/anisotropic filtering introduces in previous commit looks
good at non-integer scales, using it at integer scales may make screen
look unnecessarily blurry. This commit introduces an option to use NN
scaling at integer values of scale.
2016-02-01 21:19:26 +01:00
Michał Janiszewski
18ec2238a2 Allow runtime selection of render quality hint
This change allows to pass render quality hint to SDL in runtime. While
using hardware display, SDL can hint the renderer to use linear or
anisotropic filtering, which can deliver a better experience when using
non-integer scale value.
2016-02-01 21:18:15 +01:00
Martin Černáč
85b6effd0f Refactor the weather cheat UI
I removed the two buttons that were used previously to change the park's weather with a proper dropdown, which allows the player to select any of the available weather, not being limited to just two options. This change is (currently) listed on the project's wiki page 'Features to implement'.
2016-02-01 18:46:19 +01:00
OpenRCT2 git bot
4019dee3ca Merge Localisation/master into OpenRCT2/develop. 2016-02-01 04:00:15 +00:00
Ted John
d299dca475 Merge pull request #2844 from janisozaur/network-version
Decouple network version from OpenRCT2 version
2016-01-30 22:37:30 +00:00
Michał Janiszewski
e814cdd271 Decouple network version from OpenRCT2 version
This allows to present a different version of network stream than just
OpenRCT2 version, as we can possibly have breaking changes to network in
one release cycle.

This commit also adds easy way of identification which hosts are running
which versions, by showing a tooltip when hovering mouse cursor over the
network compatibility icon. Client's own version is displayed as well.
2016-01-30 22:44:43 +01:00
OpenRCT2 git bot
083ec35362 Merge Localisation/master into OpenRCT2/develop. 2016-01-30 04:00:12 +00:00
OpenRCT2 git bot
b23c27c6e9 Merge Localisation/master into OpenRCT2/develop. 2016-01-29 04:00:13 +00:00
OpenRCT2 git bot
7a6cdbcfed Merge Localisation/master into OpenRCT2/develop. 2016-01-28 04:00:13 +00:00
OpenRCT2 git bot
cc40a8292c Merge Localisation/master into OpenRCT2/develop. 2016-01-27 04:00:12 +00:00
OpenRCT2 git bot
c79541a3a7 Merge Localisation/master into OpenRCT2/develop. 2016-01-26 04:00:13 +00:00
Michał Janiszewski
dd37ca05c3 Disable opening cheats window in MP
When connecting to a server, also reset cheats.

This should fix #2811
2016-01-25 21:44:09 +01:00
Chad Anderson
bc92446d32 New Game Option
I added a menu option to bring up the Scenario Selector from within
game, so that you can easily choose a new level without needing to load
the Title Screen.
2016-01-25 13:15:26 -07:00
OpenRCT2 git bot
233e3ff058 Merge Localisation/master into OpenRCT2/develop. 2016-01-25 04:00:13 +00:00
Aaron van Geffen
2d90bc8354 Allow assigning a shortcut to the options window. 2016-01-25 00:45:24 +09:00
Ted John
6eaa93c9bc Merge pull request #2783 from zsilencer/multiplayer
MP groups and permissions
2016-01-24 12:29:27 +00:00
zsilencer
85d77bb838 show last action in player window 2016-01-23 16:46:52 -07:00
zsilencer
db90477cae add locate player's most recent action button 2016-01-23 14:16:26 -07:00
zsilencer
5a43e313b5 add can't kick host error 2016-01-23 13:29:17 -07:00
zsilencer
5f7c81083e add separate Clear Landscape action and fix a bug 2016-01-23 13:19:17 -07:00
zsilencer
de1fa24e7b add last player action to player list 2016-01-23 12:32:02 -07:00
zsilencer
ef4fc84634 consolidate actions list 2016-01-23 11:34:05 -07:00
OpenRCT2 git bot
1b2edef980 Merge Localisation/master into OpenRCT2/develop. 2016-01-23 04:00:13 +00:00
zsilencer
c557f02f4b fix issue with incorrect game_command_playerid 2016-01-22 16:57:00 -07:00
zsilencer
1277c1a0d2 MP permissions update 2 2016-01-22 11:12:35 -07:00
zsilencer
7a249c6457 Add ability to toggle individual action permissions 2016-01-21 20:32:51 -07:00
zsilencer
6e3068cd0a MP groups and permissions 2016-01-20 21:42:31 -07:00
OpenRCT2 git bot
d4864108a6 Merge Localisation/master into OpenRCT2/develop. 2016-01-20 04:00:14 +00:00
Ted John
cee61f8929 Merge Localisation/master into OpenRCT2/develop. 2016-01-18 04:00:18 +00:00
Ted John
805b0dbb05 Merge Localisation/master into OpenRCT2/develop. 2016-01-17 04:00:18 +00:00
Ted John
57420cbc66 Merge Localisation/master into OpenRCT2/develop. 2016-01-15 04:00:19 +00:00
Ted John
0450aa0057 Merge Localisation/master into OpenRCT2/develop. 2016-01-14 04:00:19 +00:00
Marijn van der Werf
a85b2d3982 Show ALT as OPTION in keyboard shortcut list 2016-01-12 23:05:03 +01:00
Marijn van der Werf
dd8239f684 Add space after 'CMD + ' 2016-01-12 22:52:34 +01:00
Marijn van der Werf
72739e8cd8 Allow setting CMD as shortcut key 2016-01-12 22:29:36 +01:00
Ted John
16537ada4a Merge Localisation/master into OpenRCT2/develop. 2016-01-11 04:00:17 +00:00
Gymnasiast
24448f2734 Show names of missing expansion packs and use localised names; cleanup 2016-01-09 22:55:10 +01:00
Ted John
73b0e403c4 Merge Localisation/master into OpenRCT2/develop. 2016-01-07 04:00:19 +00:00
Ted John
de99a6c3dc Merge Localisation/master into OpenRCT2/develop. 2016-01-06 04:00:20 +00:00
Ted John
79b7913b78 Merge Localisation/master into OpenRCT2/develop. 2016-01-05 04:00:19 +00:00
Ted John
e4052b332f Merge Localisation/master into OpenRCT2/develop. 2016-01-04 04:00:18 +00:00
IntelOrca
ededc82cba add DLC and Build your own scenario classification 2016-01-02 21:06:46 +00:00
Gymnasiast
4c6dbd0702 Add entries for RCT1/AA/LL scenarios 2016-01-02 21:05:58 +00:00
IntelOrca
82b05950ff add RCT1 title sequence 2016-01-02 21:05:33 +00:00
Aaron van Geffen
f7d33f3cab Rename constants et al per code reviewer's request. 2016-01-02 21:03:38 +00:00
Aaron van Geffen
15782b88c4 Experimental: optional unlocking of scenarios ("campaign mode") in scenario select screen. 2016-01-02 21:01:53 +00:00
Aaron van Geffen
448d4fb657 New string ids for scenario select screen. 2016-01-02 21:00:02 +00:00
Ted John
c1d33e7308 Merge Localisation/master into OpenRCT2/develop. 2016-01-02 04:00:17 +00:00
Hielke Morsink
829c3a3339 Added correct tooltips for moving up/down buttons. 2016-01-01 21:29:09 +01:00
Hielke Morsink
ae4ff5fc6c Redesigned UI to be more consistent with the ride/staff windows. 2016-01-01 21:29:07 +01:00
Hielke Morsink
389249abfd Better UI spacing. 2016-01-01 21:29:03 +01:00
Hielke Morsink
64312957a0 Added column headers instead of labels, and added columns for the flags. 2016-01-01 21:28:59 +01:00
Hielke Morsink
d68ed36147 Recreated UI for tile inspector. Added swap functionality. 2016-01-01 21:28:55 +01:00
Ted John
928db1bf18 Merge Localisation/master into OpenRCT2/develop. 2016-01-01 04:00:18 +00:00
Ted John
47ca70b513 Merge Localisation/master into OpenRCT2/develop. 2015-12-31 04:00:17 +00:00
Ted John
4e465edeea Merge Localisation/master into OpenRCT2/develop. 2015-12-29 04:00:18 +00:00
Ted John
38edde37c0 Merge Localisation/master into OpenRCT2/develop. 2015-12-28 04:00:18 +00:00
Ted John
5cf31b8de4 Merge Localisation/master into OpenRCT2/develop. 2015-12-27 04:00:16 +00:00
IntelOrca
cd99b87de6 add UI for notification settings 2015-12-26 17:30:13 +00:00
IntelOrca
4eb8192549 replace tutorial button with new multiplayer button
tutorial button and multiplayer button can be enabled / disabled easily, window auto resizes etc.
2015-12-26 17:09:37 +00:00
Ted John
799d377d90 Merge Localisation/master into OpenRCT2/develop. 2015-12-26 04:00:18 +00:00
Ted John
570c732355 Merge Localisation/master into OpenRCT2/develop. 2015-12-25 04:00:18 +00:00
Ian Spence
434b62436c Addresses code review comments 2015-12-24 08:44:12 -08:00
Ian Spence
ba038c10ab Automatically open shops & stalls
- Added a new option under misc to automatically open shops and stalls
 - Option is disabled by default
 - When enabled, shops & stalls are automatically opened right after being placed on the map
2015-12-24 00:00:41 -08:00
Ted John
652031e0fe Merge Localisation/master into OpenRCT2/develop. 2015-12-24 04:00:18 +00:00
Ted John
578bf2e175 Merge Localisation/master into OpenRCT2/develop. 2015-12-23 04:00:18 +00:00
Ted John
8b9c4d1824 Merge Localisation/master into OpenRCT2/develop. 2015-12-22 04:00:19 +00:00
Ted John
b6b18c812f Merge Localisation/master into OpenRCT2/develop. 2015-12-21 04:00:18 +00:00
Gymnasiast
dd460300ca Extend fast lift hill cheat and update description 2015-12-20 21:12:24 +01:00
Jonathan Haas
bf536ce7b7 Add one decimal place to SI velocities 2015-12-20 11:27:03 +01:00
Ted John
229abec6bf Merge Localisation/master into OpenRCT2/develop. 2015-12-20 04:00:17 +00:00
IntelOrca
22b4df1a99 implement SI units for distance / speed measurement, closes #2496 2015-12-18 21:12:30 +00:00
Rune Laenen
1a4ebcc0f7 Add option to trap mouse cursor 2015-12-18 09:13:26 +01:00
Ted John
ed8e6afb6f Merge Localisation/master into OpenRCT2/develop. 2015-12-18 04:00:17 +00:00
Michael Steenbeek
7701dd600c UK: Change 'peep' to 'guest' for consistency 2015-12-17 19:38:42 +01:00
Ted John
59a1701ccc Merge Localisation/master into OpenRCT2/develop. 2015-12-15 04:00:17 +00:00
Ted John
a423c6c458 Merge Localisation/master into OpenRCT2/develop. 2015-12-14 04:00:17 +00:00
Ted John
32a794731c Merge Localisation/master into OpenRCT2/develop. 2015-12-13 04:00:17 +00:00
Ted John
3ed756d98c Merge Localisation/master into OpenRCT2/develop. 2015-12-12 04:00:17 +00:00
Ted John
5cacb8d0ec Merge Localisation/master into OpenRCT2/develop. 2015-12-11 04:00:17 +00:00
IntelOrca
ca01e55fa8 add show fps, #2223 2015-12-09 21:42:46 +00:00
Ted John
8d971d3e0e Merge Localisation/master into OpenRCT2/develop. 2015-12-03 04:00:17 +00:00
Ted John
abfc025c5a Merge Localisation/master into OpenRCT2/develop. 2015-12-02 04:00:19 +00:00
IntelOrca
42f5004406 Merge Localisation/master into OpenRCT2/pre-release-0.0.3. 2015-11-30 18:50:39 +00:00
duncanspumpkin
89f5f53324 Merge branch 'changelog_additions' of https://github.com/e-foley/OpenRCT2 into pre-release-0.0.3 2015-11-30 17:09:35 +00:00
Ted John
9f61ade4d1 Merge Localisation/master into OpenRCT2/develop. 2015-11-30 04:00:18 +00:00
Gymnasiast
d985e1d3d7 Update title sequence for 0.0.3
Add three parks, increase some intervals

Adjust one interval

Update title sequence for 0.0.3
2015-11-29 19:10:54 +01:00
IntelOrca
c6056cbb6c Merge branch 'pre-release-0.0.3' into develop
Conflicts:
	src/audio/audio.c
2015-11-27 22:05:40 +00:00
Ted John
c63eef9a21 Merge pull request #2378 from IntelOrca/support-unicode-currencies
support unicode currencies with ascii fallback
2015-11-27 17:56:44 +00:00
Ted John
9b1e1249c3 Merge Localisation/master into OpenRCT2/develop. 2015-11-27 04:00:18 +00:00
Michael Steenbeek
ceeedc50cd UK: Missed occurrence of the Fahrenreit symbol
Thanks to @e-foley for pointing it out.
2015-11-26 23:38:24 +01:00
IntelOrca
7ea0e2d6a3 improve language load fail behaviour
improve currencies
fix bug in supported glyph check
2015-11-26 18:28:52 +00:00
Michael Steenbeek
99a91b11c5 UK: Fahrenheit degree symbol 2015-11-26 16:36:36 +01:00
IntelOrca
46924bc9eb support unicode currencies with ascii fallback 2015-11-25 22:31:00 +00:00
Ted John
e7655b059a Merge Localisation/master into OpenRCT2/develop. 2015-11-22 04:00:18 +00:00
Ted John
7474515e5c Merge Localisation/master into OpenRCT2/develop. 2015-11-21 04:00:17 +00:00
Ted John
562c9cb68e Merge Localisation/master into OpenRCT2/develop. 2015-11-20 04:00:18 +00:00
Ted John
e9deafa5df Merge Localisation/master into OpenRCT2/develop. 2015-11-19 04:00:17 +00:00
Ted John
64159d83d0 Merge Localisation/master into OpenRCT2/develop. 2015-11-18 04:00:17 +00:00
Ted John
50edff6158 Merge pull request #2314 from Gymnasiast/obsolete-tooltip
Remote obsolete date tooltip
2015-11-17 18:21:29 +00:00
Ted John
9300c7d372 Merge Localisation/master into OpenRCT2/develop. 2015-11-17 04:00:18 +00:00
Gymnasiast
2afed6a4de Remote obsolete date tooltip 2015-11-16 11:04:00 +01:00
Ted John
9cbc1afbe2 Merge Localisation/master into OpenRCT2/develop. 2015-11-16 04:00:17 +00:00
Gymnasiast
8953357f85 Add Czech and fix some typos 2015-11-15 12:30:13 +01:00
Ted John
bcd14ad586 Merge Localisation/master into OpenRCT2/develop. 2015-11-15 04:00:16 +00:00
Ted John
32b1171b2f Merge Localisation/master into OpenRCT2/develop. 2015-11-14 04:00:26 +00:00
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
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
Alexander Overvoorde
377650d9f5 Change autosave system to use wall-clock time based frequencies
The autosave system will now use frequencies based on wall-clock
time rather than in-game time, for example every 15 minutes. This
frequency is not affected by pausing the game or changing the game
speed. The default frequency is every 5 minutes.
2015-10-03 14:25:59 +02:00
Ted John
494869b22e Merge Localisation/master into OpenRCT2/develop. 2015-10-03 04:00:16 +01:00
Ted John
d6631e182b Merge Localisation/master into OpenRCT2/develop. 2015-09-29 04:00:16 +01:00
Ted John
adebebe2d4 Merge Localisation/master into OpenRCT2/develop. 2015-09-28 04:00:17 +01:00
Ted John
4643881389 Merge Localisation/master into OpenRCT2/develop. 2015-09-27 04:00:16 +01:00
IntelOrca
a04663368e add two new date formats, y/m/d and y/d/m, closes #1900 2015-09-26 14:35:26 +01:00
Ted John
0bef4f3467 Merge Localisation/master into OpenRCT2/develop. 2015-09-20 04:00:15 +01:00
Ted John
e4b7785bdd Merge Localisation/master into OpenRCT2/develop. 2015-09-19 04:00:15 +01:00
Gymnasiast
4909272a44 Add cheat option to show all operating modes; cleanup 2015-09-18 10:54:48 +02:00
Ted John
338855ba50 Merge Localisation/master into OpenRCT2/develop. 2015-09-15 04:00:15 +01:00
Ted John
597c9e19de Merge Localisation/master into OpenRCT2/develop. 2015-09-13 04:00:15 +01:00
Ted John
f081f8430a Merge Localisation/master into OpenRCT2/develop. 2015-09-12 13:59:21 +01:00
Ted John
408665e4a4 Merge Localisation/master into OpenRCT2/develop. 2015-09-11 04:00:15 +01:00
Michael Steenbeek
2c71e8c419 Fix Condor Ride description, fixes #1021 2015-09-10 14:39:49 +02:00
Ted John
85bbdde056 Merge Localisation/master into OpenRCT2/develop. 2015-09-10 04:00:15 +01:00
Ted John
d7a7a81cd0 Merge Localisation/master into OpenRCT2/develop. 2015-09-09 04:00:15 +01:00
Ted John
a0d684a07d Merge Localisation/master into OpenRCT2/develop. 2015-09-07 04:00:15 +01:00
Ted John
54b08da98e Merge Localisation/master into OpenRCT2/develop. 2015-09-05 04:00:15 +01:00
Ted John
4c60112bd5 Merge Localisation/master into OpenRCT2/develop. 2015-09-04 04:00:15 +01:00
Ted John
8c2d0b3730 Merge Localisation/master into OpenRCT2/develop. 2015-09-03 04:00:15 +01:00
Ted John
a8fbc479d0 Merge pull request #1869 from LRFLEW/color_labels
Added tooltip to colour selector
2015-09-02 17:49:33 +01:00
Ted John
f16b740dca Merge Localisation/master into OpenRCT2/develop. 2015-09-02 04:00:15 +01:00
Michael Steenbeek
46dd7e0620 Add actual colours to colour tooltips 2015-09-01 14:06:24 +02:00
LRFLEW
7ef15a4326 Added tooltip to colour selector 2015-09-01 00:08:28 -06:00
Ted John
5abb923525 Merge Localisation/master into OpenRCT2/develop. 2015-09-01 04:00:16 +01:00
Gymnasiast
2ff3e33e3e Add cheat to disable vandalism 2015-08-31 11:13:19 +02:00
Ted John
580a6c7388 Merge Localisation/master into OpenRCT2/develop. 2015-08-25 04:00:15 +01:00
Ted John
2afd9b8a61 Merge Localisation/master into OpenRCT2/develop. 2015-08-24 04:00:17 +01:00
Ted John
972ae72d87 Merge Localisation/master into OpenRCT2/develop. 2015-08-23 04:00:15 +01:00
Ted John
3bfeddbee7 Merge Localisation/master into OpenRCT2/develop. 2015-08-21 04:00:16 +01:00
Gymnasiast
93d49e314e Fix file menu for editor, restore menu order, add shortcut for quick saving 2015-08-20 12:13:08 +02:00
Ted John
2500ee452e Merge Localisation/master into OpenRCT2/develop. 2015-08-20 04:00:15 +01:00
Runelaenen
2830cdd3a3 Capitalisation of 5512 2015-08-19 23:16:07 +02:00
Runelaenen
6ec01c6d65 Changed localisation strings 2015-08-19 22:35:20 +02:00
Runelaenen
d34a446d61 Easier saving
Replace Save game functionality and add 'save game as' function
2015-08-19 22:02:06 +02:00
Ted John
f836590a18 Merge Localisation/master into OpenRCT2/develop. 2015-08-19 04:00:15 +01:00
Gymnasiast
59202f97f8 Make the string for 'Default audio device' translatable, fix comment 2015-08-18 21:55:04 +02:00
Gymnasiast
4fa571a041 Add option to allow loading scenarios with an incorrect checksum 2015-08-18 10:47:31 +02:00