mirrors/OpenRCT2
2
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2.git synced 2024-08-28 05:01:33 +02:00
Code Issues Projects Releases Wiki Activity
7375 commits 9 branches 41 tags 334 MiB
Commit graph

727 commits

Author SHA1 Message Date
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
Ted John
3a8dd25020 Merge Localisation/master into OpenRCT2/develop. 2015-08-18 04:00:15 +01:00
Ted John
e46cc379ab Merge pull request #1803 from medsouz/handymenmowdefault 
Add option for handymen to mow grass by default
 2015-08-17 08:05:18 +01:00
Ted John
00ab8be6af Merge Localisation/master into OpenRCT2/develop. 2015-08-17 04:00:16 +01:00
medsouz
3b845a67ed Add option for handymen to mow grass by default 2015-08-16 19:26:42 -04:00
xperia64
a629de4666 Correct String IDs 2015-08-16 16:03:23 -04:00
xperia64
4733ea28c0 Add a cheat so guests ignore intensity and nausea ratings 2015-08-16 16:02:41 -04:00
IntelOrca
094cc19411 allow joining of servers in server list window 2015-08-16 16:37:08 +01:00
Gymnasiast
c00e044b6c Multiplayer interface improvements, cleanup 2015-08-16 13:14:04 +02:00
Ted John
905efcd412 Merge Localisation/master into OpenRCT2/develop. 2015-08-16 04:00:15 +01:00
IntelOrca
f072440d18 add server list window (WIP) 2015-08-16 03:07:00 +01:00
IntelOrca
3f31221973 fix network merge issues, fix #1785 2015-08-14 22:06:15 +01:00
zsilencer
d772f8b5fb measure and display ping 2015-08-14 09:13:39 -06:00
zsilencer
7ccb0eb655 basic player list 2015-08-14 09:13:38 -06:00
IntelOrca
99f2b87043 add chat feature 2015-08-14 09:13:29 -06:00
Ted John
80281e82ea Merge pull request #1778 from Gymnasiast/patch-2 
Mark former tutorial strings as unused
 2015-08-14 13:57:15 +01:00
Ted John
e9c8d03bd9 Merge Localisation/master into OpenRCT2/develop. 2015-08-14 04:00:15 +01:00
Michael Steenbeek
5ee6d563d0 Mark former tutorial strings as unused 2015-08-13 10:40:37 +02:00
Ted John
76df9b156a Merge Localisation/master into OpenRCT2/develop. 2015-08-13 04:00:15 +01:00
Gymnasiast
d01a53bd16 Add Inventions List and Scenario Options to the Debug menu 2015-08-12 15:31:52 +02:00
Ted John
16653b6f9f Merge Localisation/master into OpenRCT2/develop. 2015-08-12 04:00:14 +01:00
medsouz
e0e9dedb8b Moved strings to english_uk.txt 2015-08-11 07:30:29 -04:00
medsouz
db9ea4cdf3 Added toggle for audio disable on focus lost 
This closes #1758
 2015-08-11 07:06:00 -04:00
LRFLEW
d10f5c8f06 Added tracked guests filter 2015-08-09 22:58:15 -05:00
Ted John
7395752ddf Merge Localisation/master into OpenRCT2/develop. 2015-08-10 04:00:15 +01:00
Ted John
5ae099c062 Merge Localisation/master into OpenRCT2/develop. 2015-08-08 04:00:15 +01:00
Ted John
2a9698c7c2 Merge Localisation/master into OpenRCT2/develop. 2015-08-07 04:00:14 +01:00