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

1366 Commits

Author SHA1 Message Date
OpenRCT2 git bot 1464909fc7 Merge Localisation/master into OpenRCT2/develop. 2018-06-12 04:00:48 +00:00
Ted John d1d9f0a86a Add debug drawing option for blocked tiles 
Replace old unused original drawing code toggle options with new option to show which tiles are blocked by vehicles.
 2018-06-10 22:59:58 +01:00
OpenRCT2 git bot 5c7d477199 Merge Localisation/master into OpenRCT2/develop. 2018-06-05 04:00:36 +00:00
OpenRCT2 git bot d09fc19361 Merge Localisation/master into OpenRCT2/develop. 2018-06-02 04:00:26 +00:00
Aaron van Geffen 2181e35b95 Replace spinner widgets with horizontal +/- buttons. 
Limited to Options and Ride windows so far.
 2018-06-01 15:20:13 +02:00
OpenRCT2 git bot e60b7b3716 Merge Localisation/master into OpenRCT2/develop. 2018-06-01 04:00:58 +00:00
OpenRCT2 git bot 06e043b887 Merge Localisation/master into OpenRCT2/develop. 2018-05-31 04:02:29 +00:00
Aaron van Geffen bf44007197 Allow fine-tuning the virtual floor style (#7577) 
The virtual floor by @JeroenDStout, introduced in the v0.1.2 release, has generally been well-received. However, some players find it too intrusive in its current appearance (cf. #7221). This PR gives them the option of a toned-down version, rather than having to turn it off completely.

![screenshot_20180528_221350](https://user-images.githubusercontent.com/604665/40628292-6e71358e-62c4-11e8-9293-e166e75d0da6.png)

The clear/transparent style, introduced by this PR, looks like the virtual floor as originally introduced in #6338:
![](https://user-images.githubusercontent.com/14242454/31050274-e3f0e62e-a645-11e7-9b10-ec26b733d631.gif)

The glassy/translucent style is the virtual floor as we've come to know it since the v0.1.2 release, and remains the default setting.
 2018-05-30 13:09:50 +02:00
OpenRCT2 git bot fb61b8ee08 Merge Localisation/master into OpenRCT2/develop. 2018-05-30 04:01:22 +00:00
Michael Steenbeek 633b3e5b92
Rephrase Twitch integration strings [ci skip] 
Thanks to @Umdlye for providing most of the rephrasings (and reporting the errors)
 2018-05-29 15:56:22 +02:00
OpenRCT2 git bot 60c438d9e9 Merge Localisation/master into OpenRCT2/develop. 2018-05-29 04:00:29 +00:00
Park Joon-Kyu 30fa405eb3 Make Twitch integration API URL configurable. (#7555) 2018-05-28 22:01:37 +02:00
Aaron van Geffen 1a2958df84 Make text painting adapt to scrollview width as well. 2018-05-27 00:45:50 +02:00
OpenRCT2 git bot 06105c3155 Merge Localisation/master into OpenRCT2/develop. 2018-05-25 04:01:49 +00:00
Umdlye 86b9546005 Use default colour for currency in demolish/refurbish prompts [ci skip] 2018-05-24 21:32:45 +02:00
jensj12 23dc6bb9d3 Add button to refurbish ride 
Add a button to refurbish the selected ride. The cost for this is 35% of the
build price and may only be done if the ride is closed and empty.
 2018-05-23 16:33:37 +02:00
OpenRCT2 git bot 6e6dc3e7ff Merge Localisation/master into OpenRCT2/develop. 2018-05-23 04:00:34 +00:00
OpenRCT2 git bot db4ddecdee Merge Localisation/master into OpenRCT2/develop. 2018-05-18 04:01:45 +00:00
OpenRCT2 git bot 4cb4c0bbef Merge Localisation/master into OpenRCT2/develop. 2018-05-17 04:01:32 +00:00
Umdlye 94f005a839 Update cut-away view tooltip to reflect horizontal clipping feature (#7525) 2018-05-16 15:04:32 +02:00
OpenRCT2 git bot 1ec9ef5edd Merge Localisation/master into OpenRCT2/develop. 2018-05-16 04:00:40 +00:00
Aaron van Geffen 19442eb6c2
Merge pull request #7510 from Broxzier/feature/horizontal-clipping 
Horizontal Clipping
 2018-05-15 14:55:05 +02:00
OpenRCT2 git bot bd5b1376cb Merge Localisation/master into OpenRCT2/develop. 2018-05-14 04:00:31 +00:00
OpenRCT2 git bot 8787cb4d07 Merge Localisation/master into OpenRCT2/develop. 2018-05-13 04:00:28 +00:00
Hielke Morsink 1324b6ae8f Add group boxes and clear button 2018-05-12 14:26:03 +02:00
OpenRCT2 git bot c89e321f35 Merge Localisation/master into OpenRCT2/develop. 2018-05-12 04:00:50 +00:00
Aaron van Geffen 56b9f5ff16 Removed unused string from audio options. 2018-05-11 19:39:47 +02:00
OpenRCT2 git bot 881f54b653 Merge Localisation/master into OpenRCT2/develop. 2018-05-07 04:00:43 +00:00
OpenRCT2 git bot e2212444d6 Merge Localisation/master into OpenRCT2/develop. 2018-05-02 04:01:34 +00:00
OpenRCT2 git bot 84568a2c0a Merge Localisation/master into OpenRCT2/develop. 2018-04-23 04:01:43 +00:00
OpenRCT2 git bot 396a234c8a Merge Localisation/master into OpenRCT2/develop. 2018-04-09 04:00:27 +00:00
Duncan 0ab3d0955c
Merge pull request #7310 from OpenRCT2/json-objects 
Add support for new JSON object format
 2018-04-08 10:45:55 +01:00
OpenRCT2 git bot 57b8ea4a89 Merge Localisation/master into OpenRCT2/develop. 2018-04-05 04:00:41 +00:00
OpenRCT2 git bot 7d16d65283 Merge Localisation/master into OpenRCT2/develop. 2018-04-02 04:00:41 +00:00
OpenRCT2 git bot 738b256895 Merge Localisation/master into OpenRCT2/develop. 2018-04-01 04:00:34 +00:00
Fusxfaranto 74361dcf87 Add different titles for multiplayer window tabs (#2989) 2018-03-31 10:54:41 +02:00
Michael Steenbeek 68545e22da Remove en-GB overrides for vanilla objects 2018-03-29 13:11:20 +02:00
Michael Steenbeek cfb5a6b39d Correct spelling of 'sujonkwa' 2018-03-29 13:00:01 +02:00
OpenRCT2 git bot 2c7e7123f7 Merge Localisation/master into OpenRCT2/develop. 2018-03-24 04:00:48 +00:00
xp4xbox 674e094b3a Add shortcut definition for 'View Path Issues' and 'Cutaway View' 2018-03-23 10:37:13 +01:00
OpenRCT2 git bot 13f7d3b6de Merge Localisation/master into OpenRCT2/develop. 2018-03-23 04:00:46 +00:00
Michael Steenbeek 61ddbd918b Add option to freeze all staff to Cheats window 2018-03-22 09:32:20 +01:00
OpenRCT2 git bot d4b1b4eead Merge Localisation/master into OpenRCT2/develop. 2018-03-22 04:01:53 +00:00
Michael Steenbeek 919533d7c2 Show ride and vehicle names in research list 2018-03-21 22:04:10 +01:00
OpenRCT2 git bot 2ea62fe6cf Merge Localisation/master into OpenRCT2/develop. 2018-03-21 04:01:14 +00:00
thyeggman ccb1b330a5 Option for early scenario completion (#7187) 2018-03-20 12:58:59 +01:00
Aaron van Geffen 7bc63dc30a Themes window: use header widgets; minor code clean up. 2018-03-19 10:36:39 +01:00
Aaron van Geffen 8ab568a6a9 Multiplayer: use table header widgets for column headers. 2018-03-19 10:36:39 +01:00
Michael Steenbeek f01d851c67
Manually update pt-BR for the 0.1.2 release 2018-03-18 19:50:20 +01:00
OpenRCT2 git bot e70d2016df Merge Localisation/master into OpenRCT2/develop. 2018-03-18 04:01:53 +00:00