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

853 commits

Author SHA1 Message Date
Ted John
b68da1189b Merge pull request #3776 from IntelOrca/feature/chatlogs 
Save chat logs
 2016-05-31 11:39:00 +01:00
OpenRCT2 git bot
649ea9c705 Merge Localisation/master into OpenRCT2/develop. 2016-05-31 04:00:17 +00:00
Ted John
feb65ea93c add option to log chat history 2016-05-30 18:01:17 +01:00
OpenRCT2 git bot
b624d284aa Merge Localisation/master into OpenRCT2/develop. 2016-05-30 04:00:21 +00:00
OpenRCT2 git bot
f257c81e99 Merge Localisation/master into OpenRCT2/develop. 2016-05-29 04:00:20 +00:00
OpenRCT2 git bot
23d856162e Merge Localisation/master into OpenRCT2/develop. 2016-05-28 04:00:22 +00:00
Ted John
62636f39b6 move allow known keys option to new tab... 
on multiplayer window
 2016-05-27 20:28:34 +02:00
Michał Janiszewski
80a90624b9 Add option to only allow known keys to login 2016-05-27 20:28:34 +02:00
Michał Janiszewski
165ec06690 Passwordless login permission 2016-05-27 20:28:34 +02:00
Michał Janiszewski
553e1bdf0f Minor fixes to authorisation system 2016-05-27 20:28:33 +02:00
CraigCraig
3f9afb9744 Various Spellchecks (#3741) 2016-05-26 09:49:19 +02:00
OpenRCT2 git bot
95249cf1df Merge Localisation/master into OpenRCT2/develop. 2016-05-26 04:00:47 +00:00
Michael Steenbeek
712d97da79 Remove Intamin and Phoenix easter eggs (#3732) 2016-05-25 20:01:24 +01:00
Ted John
714baf2979 Merge pull request #3723 from Gymnasiast/remove-bmp-screenshots 
Remove support for BMP screenshots
 2016-05-25 08:01:23 +01:00
OpenRCT2 git bot
f04fa3ca4f Merge Localisation/master into OpenRCT2/develop. 2016-05-25 04:00:21 +00:00
Marijn van der Werf
a96ccbf21c Add shortcut for switching between paint modes (#3714) 2016-05-24 19:59:37 +01:00
Gymnasiast
476cebca53 Removed support for BMP screenshots 2016-05-24 20:05:12 +02:00
OpenRCT2 git bot
2130bf0126 Merge Localisation/master into OpenRCT2/develop. 2016-05-24 04:00:19 +00:00
OpenRCT2 git bot
be26ed4281 Merge Localisation/master into OpenRCT2/develop. 2016-05-23 04:00:18 +00:00
Matte A
e7510262ac Add clarifications to <not used anymore> (#3693) 2016-05-22 15:31:41 +02:00
OpenRCT2 git bot
804568f3c8 Merge Localisation/master into OpenRCT2/develop. 2016-05-22 04:00:20 +00:00
OpenRCT2 git bot
2eeb20cb83 Merge Localisation/master into OpenRCT2/develop. 2016-05-21 04:00:20 +00:00
OpenRCT2 git bot
02152ae70e Merge Localisation/master into OpenRCT2/develop. 2016-05-20 04:00:17 +00:00
Matte A
c96bd533ff Change en-GB screen language (#3668) 2016-05-19 17:04:57 +02:00
OpenRCT2 git bot
9e6df440b5 Merge Localisation/master into OpenRCT2/develop. 2016-05-19 04:00:20 +00:00
Martin Černáč
feed51de27 Add correct tooltip entry for the no. circuits (#3650) 2016-05-18 12:56:30 +01:00
OpenRCT2 git bot
1fd2c1d000 Merge Localisation/master into OpenRCT2/develop. 2016-05-18 04:00:21 +00:00
OpenRCT2 git bot
f1c5d47705 Merge Localisation/master into OpenRCT2/develop. 2016-05-17 04:00:20 +00:00
OpenRCT2 git bot
193ae36cb4 Merge Localisation/master into OpenRCT2/develop. 2016-05-16 04:00:19 +00:00
OpenRCT2 git bot
800dc83951 Merge Localisation/master into OpenRCT2/develop. 2016-05-15 04:00:23 +00:00
OpenRCT2 git bot
f62932a5d3 Merge Localisation/master into OpenRCT2/develop. 2016-05-14 04:00:20 +00:00
OpenRCT2 git bot
a675192bdf Merge Localisation/master into OpenRCT2/develop. 2016-05-13 04:00:19 +00:00
Harry Lam
755485f9b8 Fix inconsistency, US usage and confusion in en-GB (#3570) 
[ci skip]
- I changed 5829 because there are actually rough exchange rate (1:10/100) in the currency.c/h.
- In my opinion, 5853/54 require discussion.
 2016-05-12 07:25:59 +02:00
OpenRCT2 git bot
7c7dea8f00 Merge Localisation/master into OpenRCT2/develop. 2016-05-12 04:00:21 +00:00
OpenRCT2 git bot
5636e6a130 Merge Localisation/master into OpenRCT2/develop. 2016-05-10 04:00:18 +00:00
OpenRCT2 git bot
05384db02a Merge Localisation/master into OpenRCT2/develop. 2016-05-09 04:00:20 +00:00
Matte A
c7c3923556 Fix conflicting strings (#3534) 2016-05-08 21:55:04 +01:00
Steven Vascellaro
dbb64f8ea3 Added additional tooltips for options menu (#3394) 
Added tooltips for every selectable item in the options menu, as well as some minor variable renaming and vertical alignment
 2016-05-08 17:22:48 +01:00
Ted John
feb34660e3 fix up track manage window 2016-05-08 14:03:54 +01:00
Ted John
b2cc98da91 change track list window to use new index 2016-05-08 14:02:47 +01:00
OpenRCT2 git bot
95a1f0a0fd Merge Localisation/master into OpenRCT2/develop. 2016-05-08 04:00:24 +00:00
OpenRCT2 git bot
0d4fefeecd Merge Localisation/master into OpenRCT2/develop. 2016-05-07 04:00:18 +00:00
Matte A
9421cc0bd4 Add shortcut for the Multiplayer window (#3509) 2016-05-06 21:14:49 +01:00
OpenRCT2 git bot
a58ef72eb9 Merge Localisation/master into OpenRCT2/develop. 2016-05-06 04:00:29 +00:00
OpenRCT2 git bot
0a710d3a01 Merge Localisation/master into OpenRCT2/develop. 2016-05-05 04:00:20 +00:00
OpenRCT2 git bot
a8aff1679e Merge Localisation/master into OpenRCT2/develop. 2016-05-04 04:00:18 +00:00
Patrick de Wit
13701660c9 Implement customizable toggle windowed mode shortcut (#3462) 
Implement customizable toggle windowed mode shortcut
 2016-05-03 20:07:33 +01:00
Matte A
45234d1afb Add description for Disable train length limit and align the button (#3480) 2016-05-03 10:16:38 +02:00
OpenRCT2 git bot
2854973c09 Merge Localisation/master into OpenRCT2/develop. 2016-05-03 04:00:19 +00:00
X7123M3-256
8f6089818f Added "Disable train length limits" string 2016-05-02 21:37:05 +02:00
OpenRCT2 git bot
4c9cc4f9f8 Merge Localisation/master into OpenRCT2/develop. 2016-05-02 04:00:18 +00:00
Patrick de Wit
7656cfdcbe Add rides amount to ride_list window. (#3461) 2016-04-30 17:12:12 +01:00
OpenRCT2 git bot
c2344d3373 Merge Localisation/master into OpenRCT2/develop. 2016-04-29 04:00:19 +00:00
OpenRCT2 git bot
2ae18e4014 Merge Localisation/master into OpenRCT2/develop. 2016-04-28 04:00:15 +00:00
OpenRCT2 git bot
8e59a6c102 Merge Localisation/master into OpenRCT2/develop. 2016-04-27 04:00:16 +00:00
Ted John
1729061df8 use ISO 639-1 for language filenames, closes #2420 (#3431) 2016-04-26 19:52:42 +01:00
OpenRCT2 git bot
80dc44836a Merge Localisation/master into OpenRCT2/develop. 2016-04-26 04:00:17 +00:00
OpenRCT2 git bot
9b5d706bab Merge Localisation/master into OpenRCT2/develop. 2016-04-25 04:00:15 +00:00
Nubbie
44a92e3f6b Explain what 'Advertise' means, fixes #3382 2016-04-24 21:24:28 +02:00
OpenRCT2 git bot
b0da767747 Merge Localisation/master into OpenRCT2/develop. 2016-04-23 04:00:19 +00:00
OpenRCT2 git bot
9561e76c39 Merge Localisation/master into OpenRCT2/develop. 2016-04-22 04:00:17 +00:00
OpenRCT2 git bot
f6bfbb0186 Merge Localisation/master into OpenRCT2/develop. 2016-04-21 04:00:15 +00:00
Rune Laenen
e0c103031e Add shortcut to mute sound 2016-04-20 19:56:57 +02:00
OpenRCT2 git bot
11bf9111c3 Merge Localisation/master into OpenRCT2/develop. 2016-04-20 04:00:15 +00:00
Michał Janiszewski
b2a3b82d08 Show network version to client if mismatched 
This will let players know which version should they be using to connect
to server. Also prevents users from even trying to join servers running
versions we already know are incompatible.
 2016-04-19 21:15:23 +02:00
Hielke Morsink
048b7ff30c Added button to reotate map elements in tile inspector - closes #3106 2016-04-19 19:25:24 +02:00
Derek Lee
c4226235e3 Add cheat to disable littering 
Add cheat and increment NETWORK_STREAM_VERSION
 2016-04-18 23:34:10 -07:00
OpenRCT2 git bot
6c505025f5 Merge Localisation/master into OpenRCT2/develop. 2016-04-19 04:00:18 +00:00
janisozaur
24eaa0a56d Show units used when streaming the map over network. Fix #3328 (#3331) 2016-04-17 21:27:23 +01:00
OpenRCT2 git bot
ea19684d94 Merge Localisation/master into OpenRCT2/develop. 2016-04-16 04:00:14 +00:00
Ted John
964ffdb0be add late localisation changes 2016-04-15 22:25:43 +01:00
Michael Steenbeek
7aaa7bb0ca New title sequence (#3310) 2016-04-15 21:29:53 +01:00
OpenRCT2 git bot
a4283cff03 Merge Localisation/master into OpenRCT2/develop. 2016-04-12 19:25:41 +00:00
OpenRCT2 git bot
8e247c3b06 Merge Localisation/master into OpenRCT2/develop. 2016-04-12 04:00:29 +00:00
OpenRCT2 git bot
2090c4aad2 Merge Localisation/master into OpenRCT2/develop. 2016-04-11 04:00:17 +00:00
wolfreak99
1947b1dd30 require special permission for cluster building, closes #3045 2016-04-10 11:52:34 +01:00
OpenRCT2 git bot
343ee0ea94 Merge Localisation/master into OpenRCT2/develop. 2016-04-09 04:00:18 +00:00
OpenRCT2 git bot
5d04ab3b82 Merge Localisation/master into OpenRCT2/develop. 2016-04-08 04:00:18 +00:00
OpenRCT2 git bot
6de15f2367 Merge Localisation/master into OpenRCT2/develop. 2016-04-07 04:00:17 +00:00
Matte A
e934d56a89 Fix colliding strings 2016-04-06 21:04:32 +02:00
Michael Steenbeek
164d782bc2 UK: Rephrase land paint tool description, fixes #3131 2016-04-06 20:57:25 +02:00
Nubbie
3017607521 Add 3 MORE descriptions for cheats 2016-04-06 18:08:14 +01:00
OpenRCT2 git bot
f50191cee9 Merge Localisation/master into OpenRCT2/develop. 2016-04-06 04:00:18 +00:00
Nubbie
68d21e22a1 Improve descriptions for cheats 
Note: Language IDs have changed slightly
 2016-04-04 17:35:05 +01:00
OpenRCT2 git bot
842ae98f76 Merge Localisation/master into OpenRCT2/develop. 2016-04-03 04:00:13 +00:00
OpenRCT2 git bot
4d8e8efa0e Merge Localisation/master into OpenRCT2/develop. 2016-04-01 04:00:19 +00:00
OpenRCT2 git bot
d07e471796 Merge Localisation/master into OpenRCT2/develop. 2016-03-30 04:00:26 +00:00
OpenRCT2 git bot
90e4b69de7 Merge Localisation/master into OpenRCT2/develop. 2016-03-26 04:00:14 +00:00
OpenRCT2 git bot
c7220f6b3f Merge Localisation/master into OpenRCT2/develop. 2016-03-24 04:00:15 +00:00
OpenRCT2 git bot
e87876c570 Merge Localisation/master into OpenRCT2/develop. 2016-03-21 04:00:16 +00:00
OpenRCT2 git bot
fdead70403 Merge Localisation/master into OpenRCT2/develop. 2016-03-17 04:00:21 +00:00
OpenRCT2 git bot
52d0fb1b2a Merge Localisation/master into OpenRCT2/develop. 2016-03-16 04:00:18 +00:00
Michael Steenbeek
2503be8f49 UK: Use clearer screen mode terminology, closes #3128, closes #3129 2016-03-14 20:55:59 +01:00
OpenRCT2 git bot
3305bbd168 Merge Localisation/master into OpenRCT2/develop. 2016-03-11 04:00:16 +00:00
OpenRCT2 git bot
50ef184772 Merge Localisation/master into OpenRCT2/develop. 2016-03-08 04:00:15 +00:00
OpenRCT2 git bot
b6c8917b3a Merge Localisation/master into OpenRCT2/develop. 2016-03-07 04:00:18 +00:00
OpenRCT2 git bot
25e536bb1c Merge Localisation/master into OpenRCT2/develop. 2016-03-06 04:00:13 +00:00
OpenRCT2 git bot
dcf248a1d4 Merge Localisation/master into OpenRCT2/develop. 2016-03-05 04:00:14 +00:00
danidoedel
57b7934b83 Add ability to disable lightning effect, resolves #1299 2016-03-04 23:13:20 +01:00
OpenRCT2 git bot
9ef4af548b Merge Localisation/master into OpenRCT2/develop. 2016-03-04 04:00:15 +00:00
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