mirrors
/
OpenRCT2
mirror of https://github.com/OpenRCT2/OpenRCT2.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity
8,473 Commits 7 Branches 39 Tags 358 MiB
Commit Graph

817 Commits

Author SHA1 Message Date
OpenRCT2 git bot 89db25eea0 Merge Localisation/master into OpenRCT2/develop. 2016-06-26 04:00:32 +00:00
gsp8181 1c8e402aed Fixed translation from en-US 'bathroom' to en-GB 'toilet' (#3914) 2016-06-20 08:47:30 +02:00
wolfreak99 e2ba6aa6ed Text capitalization adjustments for consistancy 2016-06-18 20:52:38 -04:00
OpenRCT2 git bot 5b1fbd9007 Merge Localisation/master into OpenRCT2/develop. 2016-06-18 04:00:20 +00:00
wolfreak99 b66129db7b Filter Object Selection by "Selected only" and "Non-selected only" 2016-06-17 04:46:30 -04:00
OpenRCT2 git bot 7c9f59f1c5 Merge Localisation/master into OpenRCT2/develop. 2016-06-16 04:00:17 +00:00
OpenRCT2 git bot a9f950c6c8 Merge Localisation/master into OpenRCT2/develop. 2016-06-15 04:00:19 +00:00
LucaRed fc789011f0 "Hide" instead of "Remove" in view options (#3876) 
Use "hide" instead of "remove" for view options, given it's not actually editing the map. See OpenRCT2/Localisation#748
 2016-06-14 11:15:36 +02:00
OpenRCT2 git bot bd038c63b2 Merge Localisation/master into OpenRCT2/develop. 2016-06-14 04:00:17 +00:00
OpenRCT2 git bot a91f12dd6b Merge Localisation/master into OpenRCT2/develop. 2016-06-13 04:00:17 +00:00
OpenRCT2 git bot 3266867171 Merge Localisation/master into OpenRCT2/develop. 2016-06-12 04:00:21 +00:00
OpenRCT2 git bot 304d7970ac Merge Localisation/master into OpenRCT2/develop. 2016-06-11 04:00:16 +00:00
OpenRCT2 git bot af0f77e857 Merge Localisation/master into OpenRCT2/develop. 2016-06-10 04:00:20 +00:00
OpenRCT2 git bot b511eb0a2e Merge Localisation/master into OpenRCT2/develop. 2016-06-09 04:00:18 +00:00
Ted John 504e5e0720 Merge pull request #3803 from IntelOrca/refactor/drawing 
Refactor drawing and add initial infrastructure for OpenGL rendering.
 2016-06-08 21:21:39 +01:00
OpenRCT2 git bot 426e106111 Merge Localisation/master into OpenRCT2/develop. 2016-06-08 04:00:22 +00:00
Ted John 3b627651aa add drawing engine config 2016-06-07 22:47:31 +01:00
X123M3-256 706b3db99e Chain lift cheat (#3818) 
* Fix conflict with disable plant aging cheat

* Allow chain lift on any piece

* Keep chain toggled while building

* Ignore current chain lift state when cheat enabled

* Update string ids to one not already used

* Implement command for toggling cheat

* Allow chain on steep tracks when cheat is enabled

* Add checkbox for chain cheat

* Fix spacing

* Send cheat over network

* Change label for checkbox

* Replaced tabs with spaces
 2016-06-07 22:08:38 +01:00
Michael Steenbeek 0a4fa02a3e en-GB: drop full stop in option for consistency 2016-06-07 20:01:56 +02:00
OpenRCT2 git bot 84334c1485 Merge Localisation/master into OpenRCT2/develop. 2016-06-07 04:00:18 +00:00
OpenRCT2 git bot 3dc4b601b8 Merge Localisation/master into OpenRCT2/develop. 2016-06-06 04:00:21 +00:00
OpenRCT2 git bot 4f6929edf6 Merge Localisation/master into OpenRCT2/develop. 2016-06-04 04:00:21 +00:00
Ted John 82dd7601eb Merge pull request #3782 from janisozaur/desyncs 
synchronise reset_0x69EBE4 over network
 2016-06-03 10:47:01 +01:00
OpenRCT2 git bot 7e291c32bc Merge Localisation/master into OpenRCT2/develop. 2016-06-03 04:00:19 +00:00
Goddesen c004b986ae Moved new strings to uphold string ID order 2016-06-03 00:33:15 +02:00
Goddesen 809e459495 Added cheat to disable plant aging 2016-06-03 00:33:15 +02:00
OpenRCT2 git bot 99a7346c3f Merge Localisation/master into OpenRCT2/develop. 2016-06-02 04:00:26 +00:00
OpenRCT2 git bot 67f11318cd Merge Localisation/master into OpenRCT2/develop. 2016-06-01 04:00:20 +00:00
Ted John 7157199b45 add information tab to multiplayer 2016-05-31 17:16:08 +01:00
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
OpenRCT2 git bot 1237bcab26 Merge Localisation/master into OpenRCT2/develop. 2016-04-14 04:00:18 +00:00