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

1620 commits

Author SHA1 Message Date
OpenRCT2 git bot
2e36253074 Merge Localisation/master into OpenRCT2/develop. 2018-06-23 04:01:46 +00:00
OpenRCT2 git bot
0ec3ccdaf4 Merge Localisation/master into OpenRCT2/develop. 2018-06-18 04:00:56 +00:00
OpenRCT2 git bot
05fa04a8d6 Merge Localisation/master into OpenRCT2/develop. 2018-06-17 04:00:26 +00:00
Hielke Morsink
0fda25d365 Add debug option to visualize wide path flags. 
This implements #7694
 2018-06-15 16:08:25 +02:00
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
Michael Steenbeek
ac41121a30
en-GB: Use consistent terminology for 'guest entry point' 2018-03-17 22:17:29 +01:00
OpenRCT2 git bot
8b271f16f5 Merge Localisation/master into OpenRCT2/develop. 2018-03-17 04:04:11 +00:00
Michał Janiszewski
f045370fcf Improve track preview window with OpenGL renderer 
This adds a warning to track preview window explaining it's not
supported with OpenGL renderer. Also fixes the issue whereby no stats
were printed because of early exit.
 2018-03-16 22:41:08 +01:00
Michael Steenbeek
7b913b0007
nl-NL: Apply #1446 2018-03-16 21:16:07 +01:00
OpenRCT2 git bot
147067de60 Merge Localisation/master into OpenRCT2/develop. 2018-03-16 04:00:33 +00:00
OpenRCT2 git bot
328a838678 Merge Localisation/master into OpenRCT2/develop. 2018-03-15 04:01:24 +00:00
OpenRCT2 git bot
72114ec6e8 Merge Localisation/master into OpenRCT2/develop. 2018-03-02 04:03:48 +00:00
OpenRCT2 git bot
269f398dd2 Merge Localisation/master into OpenRCT2/develop. 2018-02-28 04:02:05 +00:00
OpenRCT2 git bot
658d5b1251 Merge Localisation/master into OpenRCT2/develop. 2018-02-27 04:01:17 +00:00
xp4xbox
a0ea0816c0 Add reasoning for not running openrct2 with elevated privileges. 2018-02-26 09:34:25 +01:00
OpenRCT2 git bot
57be3b44c8 Merge Localisation/master into OpenRCT2/develop. 2018-02-25 04:00:38 +00:00
OpenRCT2 git bot
aba97e402a Merge Localisation/master into OpenRCT2/develop. 2018-02-23 04:04:50 +00:00
wolfreak99
2d8c473f75 Sync Peep Spawn over network 2018-02-19 21:11:14 +01:00
OpenRCT2 git bot
d5d9441f52 Merge Localisation/master into OpenRCT2/develop. 2018-02-19 04:00:37 +00:00
OpenRCT2 git bot
33c7b8ee47 Merge Localisation/master into OpenRCT2/develop. 2018-02-17 04:00:42 +00:00
OpenRCT2 git bot
3a72a6f494 Merge Localisation/master into OpenRCT2/develop. 2018-02-16 04:00:34 +00:00
OpenRCT2 git bot
c8c9bf70a7 Merge Localisation/master into OpenRCT2/develop. 2018-02-15 04:00:32 +00:00
OpenRCT2 git bot
a5da22d5c7 Merge Localisation/master into OpenRCT2/develop. 2018-02-13 04:01:17 +00:00
Michael Steenbeek
76a997aa18
Extract scenario descriptions from the STEX .DATs 
This is another step in removing support for STEX .DATs.
 2018-02-12 10:56:05 +01:00
OpenRCT2 git bot
f431ecd37c Merge Localisation/master into OpenRCT2/develop. 2018-02-11 04:01:02 +00:00
OpenRCT2 git bot
00cc6fd7fe Merge Localisation/master into OpenRCT2/develop. 2018-02-08 04:01:27 +00:00
OpenRCT2 git bot
ac8353eef9 Merge Localisation/master into OpenRCT2/develop. 2018-02-07 04:00:58 +00:00
Hielke Morsink
915dbdf869 Add button to tile inspector to make entrances usable 
With this, entrances and exits that have been moved away from its original XY
location can be made usable. Only one entrance or exit will be usable per
station.
 2018-02-06 19:09:51 +01:00
OpenRCT2 git bot
1037eb5dae Merge Localisation/master into OpenRCT2/develop. 2018-02-06 04:01:17 +00:00
OpenRCT2 git bot
04b5fe84b9 Merge Localisation/master into OpenRCT2/develop. 2018-02-05 04:02:18 +00:00
Richard Jenkins
bc5fffd0cc Add changelog entry and tweak menu text 2018-02-05 00:20:12 +00:00
Richard Jenkins
95dfcea6bd Implement #4984: Add option to highlight vomit, litter and handymen 2018-02-05 00:20:12 +00:00
OpenRCT2 git bot
ecb6661370 Merge Localisation/master into OpenRCT2/develop. 2018-02-03 04:03:43 +00:00
OpenRCT2 git bot
58d325968b Merge Localisation/master into OpenRCT2/develop. 2018-02-01 04:01:28 +00:00
Gymnasiast
4f2d49a42c Fix description [ci skip] 2018-01-31 21:18:33 +01:00
Gymnasiast
d6d9627d08 Make official object translations consistent, fix bug 2018-01-31 21:17:27 +01:00
Michael Steenbeek
b4018d398c
Add more object source filters 2018-01-31 13:07:20 +01:00
OpenRCT2 git bot
c404c05fa8 Merge Localisation/master into OpenRCT2/develop. 2018-01-28 04:00:55 +00:00
OpenRCT2 git bot
0e2021f6d9 Merge Localisation/master into OpenRCT2/develop. 2018-01-24 04:00:30 +00:00
Gymnasiast
133a460630 Update vehicle names and descriptions 2018-01-23 18:20:29 +01:00
OpenRCT2 git bot
5df9c90b86 Merge Localisation/master into OpenRCT2/develop. 2018-01-22 04:01:59 +00:00
OpenRCT2 git bot
ec3e34aba7 Merge Localisation/master into OpenRCT2/develop. 2018-01-18 04:01:03 +00:00
OpenRCT2 git bot
5af2b6c214 Merge Localisation/master into OpenRCT2/develop. 2018-01-17 04:00:31 +00:00
Aaron van Geffen
c951c7b539 Ride cheats: reorder and group cheats in boxes by function. 
* Change button order.
* Move checkboxes into a more logical order.
* Add group boxes around checkboxes.
 2018-01-16 23:22:52 +01:00
rwjuk
c0321c3d91 Fix capitalisation of 'Object selection' [ci skip] 2018-01-14 13:37:27 +00:00
OpenRCT2 git bot
6b79ea6515 Merge Localisation/master into OpenRCT2/develop. 2018-01-14 04:02:11 +00:00
Michael Steenbeek
037b236d8f Add the RCT1 edge styles 2018-01-13 15:39:22 +01:00
OpenRCT2 git bot
27b57f8126 Merge Localisation/master into OpenRCT2/develop. 2018-01-13 04:00:43 +00:00
Ted John
354a8edf40 Fix a few mistakes in en-GB strings 2018-01-12 23:46:02 +00:00
OpenRCT2 git bot
bf06948c51 Merge Localisation/master into OpenRCT2/develop. 2018-01-12 04:01:26 +00:00
Aaron van Geffen
1d7bec8a11 Make the virtual floor optional, on by default. 2018-01-11 10:37:40 +01:00
OpenRCT2 git bot
fbb8185284 Merge Localisation/master into OpenRCT2/develop. 2018-01-11 04:00:32 +00:00
OpenRCT2 git bot
0ad6da7359 Merge Localisation/master into OpenRCT2/develop. 2018-01-09 04:00:58 +00:00
OpenRCT2 git bot
f65345a0fb Merge Localisation/master into OpenRCT2/develop. 2018-01-08 04:00:31 +00:00
Harrison Gentry
752d9bc89d Add cheat and console command to set game date. 
Run "date" command on cmdline to set date.

Ex:
$ date 0004 06 13
sets date to June 13th, year 4
 2018-01-07 23:53:47 +01:00
OpenRCT2 git bot
ff7eb93f5f Merge Localisation/master into OpenRCT2/develop. 2018-01-06 04:00:29 +00:00
Michael Steenbeek
61dfb3dac7 Update vehicle descriptions 
These are only displayed in the Vehicle tab, so they have to apply to the vehicle itself.
 2018-01-05 11:14:38 +01:00
Harrison Gentry
5862cd9d40 Fix guest counter to say '1 guest' instead of '1 guests' 2018-01-05 08:58:17 +01:00
OpenRCT2 git bot
56ab7e9c09 Merge Localisation/master into OpenRCT2/develop. 2018-01-04 04:00:39 +00:00
Michael Steenbeek
d25856d59c Make tile element type strings in the Tile Inspector translatable 2018-01-03 10:21:53 +01:00
OpenRCT2 git bot
ef657caed3 Merge Localisation/master into OpenRCT2/develop. 2018-01-03 04:01:00 +00:00
OpenRCT2 git bot
6336e8c719 Merge Localisation/master into OpenRCT2/develop. 2018-01-02 04:00:31 +00:00
OpenRCT2 git bot
60a91910d8 Merge Localisation/master into OpenRCT2/develop. 2018-01-01 04:00:30 +00:00
Aaron van Geffen
e405867dae Add tooltip to explain why sprite selection is disabled. 2017-12-31 20:03:09 +01:00
Robert Jordan
298420fd1e Finalize follow sprite command 
Added new smart follow variable to window to more intuitively follow
sprites that may not be directly followable at all times.
Follow sprite is now canceled when dragging the screen but not
scrolling. This is only relevant when testing title sequences in game.
Select sprite button is now disabled in the title menu.
Sprites are now identified based on their name. Excess identification
information is not given as it'd clutter up the screen and is not
necissary with the viewbox in the command editor.
 2017-12-31 20:03:09 +01:00
Hielke Morsink
943747056e Add window settings and save support for follow sprite command 2017-12-31 20:03:09 +01:00
Robert Jordan
92fc010b9a Feature: "Load Scenario" title sequence command 
New command goes by LOADSC in script files and in the enumeration.
Scenarios are stored using the internal also used for localisation.
Scenarios selected can only be scenarios to originally come with one of
the games or expansions.
Modified Scenario Select window to have a mode just for title editor
scenario selection.
 2017-12-31 12:42:40 +01:00
OpenRCT2 git bot
6b2a0063ee Merge Localisation/master into OpenRCT2/develop. 2017-12-28 04:00:35 +00:00
OpenRCT2 git bot
1b0d1b9238 Merge Localisation/master into OpenRCT2/develop. 2017-12-26 04:02:04 +00:00
Park Joon-Kyu
bbf5571c17 Allow filtering guests by name (#6633) 2017-12-25 12:17:37 +01:00
OpenRCT2 git bot
bde6ee4694 Merge Localisation/master into OpenRCT2/develop. 2017-12-25 04:01:10 +00:00
OpenRCT2 git bot
676bb47948 Merge Localisation/master into OpenRCT2/develop. 2017-12-24 04:00:25 +00:00
OpenRCT2 git bot
74abb6e919 Merge Localisation/master into OpenRCT2/develop. 2017-12-23 04:00:28 +00:00
Michael Steenbeek
2e79aaf54c Fold vehicle name into regular name 2017-12-22 15:28:41 +01:00
Aaron van Geffen
8fd4f323fd Reposition widgets in Miscellaneous tab; add strings. 2017-12-22 08:03:03 +01:00
OpenRCT2 git bot
001bbf65a9 Merge Localisation/master into OpenRCT2/develop. 2017-12-22 04:00:34 +00:00
OpenRCT2 git bot
12a3550ce9 Merge Localisation/master into OpenRCT2/develop. 2017-12-20 04:00:27 +00:00
OpenRCT2 git bot
aa23370f2d Merge Localisation/master into OpenRCT2/develop. 2017-12-18 04:00:24 +00:00
OpenRCT2 git bot
e9ecd63eae Merge Localisation/master into OpenRCT2/develop. 2017-12-16 04:00:20 +00:00
OpenRCT2 git bot
7816b11d70 Merge Localisation/master into OpenRCT2/develop. 2017-12-15 04:00:28 +00:00
LRFLEW
eed00ea363 Add Vsync Toggle to Options 2017-12-14 11:18:28 +01:00
OpenRCT2 git bot
68fac3b30a Merge Localisation/master into OpenRCT2/develop. 2017-12-11 04:00:33 +00:00
Michael Steenbeek
6c5ff424ae Missed occurrence 2017-12-08 09:29:47 +01:00
Michael Steenbeek
171271215e Change some ride type names for clarity, fix Americanism 2017-12-08 07:59:44 +01:00
OpenRCT2 git bot
25c54165e8 Merge Localisation/master into OpenRCT2/develop. 2017-12-06 04:02:49 +00:00
Michael Steenbeek
4e4a1a9d49 Revert accidental use of {SMALLFONT} after {MOVE_X} 
{MOVE_X} is followed by a number. During initial import in 2014, {MOVE_X}{10} was accidentally replaced.
 2017-12-05 15:43:27 +01:00
Christian F. Coors
0b45098e05 Fix music acknowledgement 2017-12-05 10:43:17 +01:00
Michael Steenbeek
0ffa2b541a Use more consistent terminology and remove some Americanisms 2017-12-05 10:23:36 +01:00
OpenRCT2 git bot
94a3d88691 Merge Localisation/master into OpenRCT2/develop. 2017-12-05 04:01:28 +00:00
Michael Steenbeek
b9a6382557 Remove unused tutorial and guest number strings 2017-12-04 11:27:37 +01:00
Michael Steenbeek
273edee634 Turn construction marker into a define 2017-12-04 11:26:53 +01:00
Aaron van Geffen
1ef73997b5 Removed interface to window limit setting. 2017-12-04 11:26:53 +01:00
Aaron van Geffen
c000263bbb Remove construction marker colour option. 2017-12-04 11:26:53 +01:00
Aaron van Geffen
38d45a102b Remove interface to option for handymen mowing by default. 2017-12-04 11:26:53 +01:00
Aaron van Geffen
837b177d9d Simplify UI scaling display quality options (#6764) 
Simplify UI scaling display quality options.

This removes three options:
* 'Use NN scaling at integer scales', as NN is decidedly preferable at integer scales.
* Anisotropic scaling, as it produces results very similar (if not equal) to linear scaling.
* NN as a selectable option in the dropdown - NN is forced on integer scales and unavailable for non-integer scales.
 2017-12-03 22:35:16 +01:00
OpenRCT2 git bot
08893ecff9 Merge Localisation/master into OpenRCT2/develop. 2017-12-03 04:02:57 +00:00
Michael Steenbeek
63f7820b25 Fix #1185: Close button colour of prompt windows does not match 2017-12-01 17:36:30 +01:00
OpenRCT2 git bot
f4b6b728e3 Merge Localisation/master into OpenRCT2/develop. 2017-12-01 04:00:39 +00:00
OpenRCT2 git bot
5d5c64acbf Merge Localisation/master into OpenRCT2/develop. 2017-11-30 04:00:45 +00:00
OpenRCT2 git bot
743c79c169 Merge Localisation/master into OpenRCT2/develop. 2017-11-29 04:00:46 +00:00
OpenRCT2 git bot
66aa25da81 Merge Localisation/master into OpenRCT2/develop. 2017-11-28 04:01:14 +00:00
OpenRCT2 git bot
a3be15c9c9 Merge Localisation/master into OpenRCT2/develop. 2017-11-27 04:01:17 +00:00
OpenRCT2 git bot
94c4c285ee Merge Localisation/master into OpenRCT2/develop. 2017-11-26 04:00:30 +00:00
OpenRCT2 git bot
4b860f5efd Merge Localisation/master into OpenRCT2/develop. 2017-11-25 04:01:15 +00:00
Michael Steenbeek
d88c01de74 Split Steel Wild Mouse and Spinning Wild Mouse when using Ride Groups 
Includes a little cleanup for the Ride Groups and a fix in the table with available pieces, which erroneously listed banked pieces as available.
 2017-11-23 16:00:58 +01:00
OpenRCT2 git bot
ad8fce4d77 Merge Localisation/master into OpenRCT2/develop. 2017-11-23 04:01:09 +00:00
zyliwax
7bffc4ae33 Adding gridlines display toggle shortcut. (#6313) 
This feature existed in the original RCT1/2 games but was not present in
the latest development commit.

The original shortcut for this key was '7', placing it between the
"Invisible people toggle" (6) shortcut and the "Height marks on land
toggle" (8). This commit preserves as much as possible, using
placeholder comments that signify the relevant values which this
feature actually uses where this is not possible.
 2017-11-22 12:02:23 +00:00
OpenRCT2 git bot
65ab767597 Merge Localisation/master into OpenRCT2/develop. 2017-11-22 04:00:47 +00:00
Michael Steenbeek
c1400a12eb Allow separate ride and vehicle names per ride entry 2017-11-21 18:55:42 +01:00
OpenRCT2 git bot
28497cae4a Merge Localisation/master into OpenRCT2/develop. 2017-11-21 04:00:34 +00:00
Michael Steenbeek
adae6041f3 Show list of available vehicles in New Ride window 2017-11-20 19:42:29 +01:00
OpenRCT2 git bot
36236d8c97 Merge Localisation/master into OpenRCT2/develop. 2017-11-17 04:00:43 +00:00
OpenRCT2 git bot
891de0ad3e Merge Localisation/master into OpenRCT2/develop. 2017-11-11 04:02:02 +00:00
OpenRCT2 git bot
c56d5b5f81 Merge Localisation/master into OpenRCT2/develop. 2017-11-09 04:00:20 +00:00
OpenRCT2 git bot
0e4d9a2518 Merge Localisation/master into OpenRCT2/develop. 2017-11-08 04:00:35 +00:00
Philip Goto
8be9e156dd Modify explanation tooltip of scaling quality option 2017-11-06 23:05:21 +01:00
Philip Goto
ad3f23162a Add explanation tooltip to scaling quality option 2017-11-06 23:05:21 +01:00
Philip Goto
b66df2d6db Add smooth nearest neighbor scaling 
This commit implements smooth nearest neighbor scaling, this scaling method looks sharper than linear scaling and not deformed like NN scaling.
 2017-11-06 23:05:21 +01:00
OpenRCT2 git bot
46f898e992 Merge Localisation/master into OpenRCT2/develop. 2017-11-06 04:00:28 +00:00
OpenRCT2 git bot
ce6ae6d07a Merge Localisation/master into OpenRCT2/develop. 2017-11-04 04:00:41 +00:00
OpenRCT2 git bot
a8374af240 Merge Localisation/master into OpenRCT2/develop. 2017-11-03 04:00:32 +00:00
OpenRCT2 git bot
e9c7f6d589 Merge Localisation/master into OpenRCT2/develop. 2017-11-02 04:00:33 +00:00
Michael Steenbeek
3d8ec4e393 Warn when loading incompatible RCTC saves 2017-11-01 20:23:06 +01:00
LRFLEW
778cb9d024 Rename CopyFramebufferShader to ApplyPaletteShader 2017-10-30 16:21:49 +01:00
LRFLEW
aac1c59714 OpenGL: Add multi-pass transparency 2017-10-30 16:21:49 +01:00
LRFLEW
d3d41ea724 OpenGL: Add single-pass transparency 2017-10-30 16:21:49 +01:00
LRFLEW
3d2d99817c OpenGL: Add Depth Buffer and Depth Test 2017-10-30 16:21:49 +01:00
LRFLEW
6bf2e0157b OpenGL: Improve Shaders 2017-10-30 16:21:49 +01:00
LRFLEW
f105237a2e OpenGL: Delay Palette Mapping Until Final Framebuffer Copy to Screen 2017-10-30 16:21:49 +01:00
OpenRCT2 git bot
e656418286 Merge Localisation/master into OpenRCT2/develop. 2017-10-30 04:00:30 +00:00
OpenRCT2 git bot
33dd3b2275 Merge Localisation/master into OpenRCT2/develop. 2017-10-25 04:00:33 +00:00
OpenRCT2 git bot
f938904cfe Merge Localisation/master into OpenRCT2/develop. 2017-10-24 04:00:27 +00:00
OpenRCT2 git bot
47f5423845 Merge Localisation/master into OpenRCT2/develop. 2017-10-23 04:00:25 +00:00
OpenRCT2 git bot
5c98c7ee5e Merge Localisation/master into OpenRCT2/develop. 2017-10-22 04:00:35 +00:00
OpenRCT2 git bot
34fe5ac976 Merge Localisation/master into OpenRCT2/develop. 2017-10-21 04:00:25 +00:00
OpenRCT2 git bot
46961f1813 Merge Localisation/master into OpenRCT2/develop. 2017-10-20 04:00:23 +00:00
Aaron van Geffen
9f67fafc43 Add theme support for console background colour. 2017-10-19 21:26:53 +02:00
OpenRCT2 git bot
814b28c814 Merge Localisation/master into OpenRCT2/develop. 2017-10-19 04:00:26 +00:00
Robert Jordan
ec22d04089 Fix #6470: Title sequence naming issues 
Predefined title sequence filenames are now treated as "reserved".
Custom title sequences cannot use reserved names and an error will
appear if the user tries.

Duplicating predefined title sequence now uses default text of
predefined sequence's proper name instead of filename.

Renamed `WIDX_TITLE_EDITOR_RENAME_SAVE_BUTTON` to
`WIDX_TITLE_EDITOR_RENAME_BUTTON` to follow formatting of other preset
button ids.

Added string id 6154, `STR_ERROR_RESERVED_NAME`, "Name is reserved".
 2017-10-18 11:18:14 +02:00
OpenRCT2 git bot
a7ff610c4b Merge Localisation/master into OpenRCT2/develop. 2017-10-18 04:00:32 +00:00
OpenRCT2 git bot
2ec1c71c9f Merge Localisation/master into OpenRCT2/develop. 2017-10-17 04:00:34 +00:00
OpenRCT2 git bot
a31add2141 Merge Localisation/master into OpenRCT2/develop. 2017-10-16 04:00:30 +00:00
OpenRCT2 git bot
691fb3ab51 Merge Localisation/master into OpenRCT2/develop. 2017-10-15 04:00:34 +00:00
Krutonium
fd459f0791 Add a visible notification for missing KDialog/Zenity 2017-10-14 22:16:51 +02:00
OpenRCT2 git bot
18d29fdc24 Merge Localisation/master into OpenRCT2/develop. 2017-10-13 04:00:32 +00:00
OpenRCT2 git bot
a27adb5df0 Merge Localisation/master into OpenRCT2/develop. 2017-10-12 06:38:35 +00:00
Michael Steenbeek
17557569d0 Turn 'unlock all prices' into a regular option 
This uses a previously unused S6 flag to save this option persistently.
This should not make S6 import much harder, but should reduce the amount of questions about S4 import.

Also refactor the checks whether the user can ask money for rides or entry. This should make it a lot easier
when our own save format comes around.
 2017-10-11 08:33:17 +02:00
OpenRCT2 git bot
c724074ff4 Merge Localisation/master into OpenRCT2/develop. 2017-10-09 04:00:26 +00:00
Christian F. Coors
e737b3108c Add status messages to server list window 2017-10-08 11:51:22 +02:00
OpenRCT2 git bot
b56ad772f4 Merge Localisation/master into OpenRCT2/develop. 2017-10-07 04:00:21 +00:00
OpenRCT2 git bot
e5fe681793 Merge Localisation/master into OpenRCT2/develop. 2017-10-06 04:00:24 +00:00
OpenRCT2 git bot
8d2769dbc9 Merge Localisation/master into OpenRCT2/develop. 2017-10-04 04:00:31 +00:00
OpenRCT2 git bot
396793739a Merge Localisation/master into OpenRCT2/develop. 2017-10-03 04:00:38 +00:00
OpenRCT2 git bot
606130c2bb Merge Localisation/master into OpenRCT2/develop. 2017-10-02 04:00:27 +00:00
OpenRCT2 git bot
58b980d6ba Merge Localisation/master into OpenRCT2/develop. 2017-09-30 04:00:30 +00:00
OpenRCT2 git bot
43e1e711b7 Merge Localisation/master into OpenRCT2/develop. 2017-09-29 04:00:29 +00:00
OpenRCT2 git bot
f5cc789978 Merge Localisation/master into OpenRCT2/develop. 2017-09-24 04:00:24 +00:00
OpenRCT2 git bot
e1568aab21 Merge Localisation/master into OpenRCT2/develop. 2017-09-23 04:00:26 +00:00
OpenRCT2 git bot
08eef61eb4 Merge Localisation/master into OpenRCT2/develop. 2017-09-22 04:00:21 +00:00
OpenRCT2 git bot
3818ee5577 Merge Localisation/master into OpenRCT2/develop. 2017-09-21 04:00:25 +00:00
OpenRCT2 git bot
a24f2fba6a Merge Localisation/master into OpenRCT2/develop. 2017-09-20 04:00:24 +00:00
OpenRCT2 git bot
a774ae8bd7 Merge Localisation/master into OpenRCT2/develop. 2017-09-15 04:00:21 +00:00
Michael Steenbeek
d551108f12 en-GB: Fix typo 2017-09-14 13:34:54 +02:00
OpenRCT2 git bot
185ae6ff07 Merge Localisation/master into OpenRCT2/develop. 2017-09-14 04:00:26 +00:00
Michael Steenbeek
d4cc97165c Clean up brake speed in ride construction window, fix #6271 2017-09-13 21:57:36 +02:00
Michael Steenbeek
597d40b25b Add cheat to show all drawable track elements 2017-09-13 19:38:30 +02:00
OpenRCT2 git bot
c6e162e31c Merge Localisation/master into OpenRCT2/develop. 2017-09-13 04:00:20 +00:00
OpenRCT2 git bot
e8d1cdbd99 Merge Localisation/master into OpenRCT2/develop. 2017-09-12 04:00:20 +00:00
OpenRCT2 git bot
2e8d1b5ed7 Merge Localisation/master into OpenRCT2/develop. 2017-09-09 04:00:18 +00:00
OpenRCT2 git bot
0fe18149ee Merge Localisation/master into OpenRCT2/develop. 2017-09-05 04:00:19 +00:00
OpenRCT2 git bot
49066bac4a Merge Localisation/master into OpenRCT2/develop. 2017-09-03 04:00:21 +00:00
OpenRCT2 git bot
4a5e5b6519 Merge Localisation/master into OpenRCT2/develop. 2017-09-02 04:00:17 +00:00
Ted John
3f1991804a Add debug option to show dirty blocks 2017-08-31 22:36:15 +01:00
OpenRCT2 git bot
85650a27f5 Merge Localisation/master into OpenRCT2/develop. 2017-08-31 04:00:22 +00:00
rwjuk
c2b862ee51 Clean up and improve UI of track install window 
Clean up and improve UI of track install window

Cleanup window def

Clean up and improve track install window

Name track_list.var_484

Format widget definitions

Use get_friendly_track_type_name()

Guard against NULL
 2017-08-22 11:52:26 +02:00
Keatzee
a0f62f52f8 Fix bulrush typo 2017-08-21 08:12:07 +02:00
OpenRCT2 git bot
1a932ea964 Merge Localisation/master into OpenRCT2/develop. 2017-08-21 04:00:23 +00:00
OpenRCT2 git bot
96fbffa3f2 Merge Localisation/master into OpenRCT2/develop. 2017-08-19 04:00:22 +00:00
OpenRCT2 git bot
82be1de6d0 Merge Localisation/master into OpenRCT2/develop. 2017-08-18 04:00:20 +00:00
OpenRCT2 git bot
152897cff0 Merge Localisation/master into OpenRCT2/develop. 2017-08-17 04:00:28 +00:00
jensj12
c3a5ffbe04 Implement #3994: Show bottom toolbar with map tooltip 2017-08-16 22:27:20 +02:00
Dennis-Z
634ee96f54 Implement OpenGL renderer FilterRect through palette remapping 
Replace the previous "filtering" of rectangles based on
luminance, now using a remap palette like the software renderer for
better output colors.
Various other simplifications regarding to rectangle rendering are
included here too.
 2017-08-16 00:43:41 +02:00
OpenRCT2 git bot
88d2805fd0 Merge Localisation/master into OpenRCT2/develop. 2017-08-15 04:00:25 +00:00
OpenRCT2 git bot
68c2175cf3 Merge Localisation/master into OpenRCT2/develop. 2017-08-12 04:00:29 +00:00
OpenRCT2 git bot
2dc87469fd Merge Localisation/master into OpenRCT2/develop. 2017-08-05 04:00:29 +00:00
Gymnasiast
ca77c75a56 Improve tabs, alignment, remove now-unnecessary information and strings 
Removes RCT2 version string, Infogrames credits and logo, removes strings for aforementioned info.
Moves OpenRCT2 version string to under the Changelog... button, rewords and fixes some of the strings
 2017-08-04 08:41:46 +02:00
wolfreak99
ffc1dc6376 Add OpenRCT2 information and changelog to About window 2017-08-04 08:38:35 +02:00
OpenRCT2 git bot
2934a10d58 Merge Localisation/master into OpenRCT2/develop. 2017-08-03 04:00:18 +00:00
Michał Janiszewski
ee443818a8 Verify size of objects sent/requested (#6076) 2017-08-01 12:29:16 +01:00
OpenRCT2 git bot
84d273ac54 Merge Localisation/master into OpenRCT2/develop. 2017-07-31 04:00:18 +00:00
OpenRCT2 git bot
d23de89b33 Merge Localisation/master into OpenRCT2/develop. 2017-07-29 04:00:16 +00:00
OpenRCT2 git bot
bb57e3aa45 Merge Localisation/master into OpenRCT2/develop. 2017-07-28 04:00:18 +00:00
OpenRCT2 git bot
6f626f0997 Merge Localisation/master into OpenRCT2/develop. 2017-07-27 04:00:29 +00:00
Kuriibo
59fabad37c Added new string for shortcut, validate_global_widx 2017-07-26 17:23:47 +01:00
OpenRCT2 git bot
efdc52662d Merge Localisation/master into OpenRCT2/develop. 2017-07-26 04:00:19 +00:00
Michael Steenbeek
ef6aea98e4 Implement #4135: Rename RC Designer to Track designer and allow more ride types 2017-07-25 12:16:37 +02:00
OpenRCT2 git bot
fe19d9a2a3 Merge Localisation/master into OpenRCT2/develop. 2017-07-25 04:00:25 +00:00
Gymnasiast
cc289a60b6 Correct 'Haunted Harbour' identifier 2017-07-24 08:49:45 +02:00
OpenRCT2 git bot
e431c812fa Merge Localisation/master into OpenRCT2/develop. 2017-07-24 04:00:18 +00:00
wolfreak99
47a89c4cf3 Add "Ignore research status" cheat 2017-07-23 12:09:29 +02:00
OpenRCT2 git bot
eb28bba119 Merge Localisation/master into OpenRCT2/develop. 2017-07-23 04:00:16 +00:00
Richard Jenkins
fab8efbe2a Implement #5855: Display source game in missing obj window 2017-07-19 11:04:00 +02:00
OpenRCT2 git bot
0702402af4 Merge Localisation/master into OpenRCT2/develop. 2017-07-19 04:00:18 +00:00
OpenRCT2 git bot
ca1aaec59c Merge Localisation/master into OpenRCT2/develop. 2017-07-18 04:00:26 +00:00
OpenRCT2 git bot
1b042506d9 Merge Localisation/master into OpenRCT2/develop. 2017-07-16 04:00:23 +00:00
Zankoas
ff51d4aec6 Minor spelling fixes for en-GB localisation 2017-07-14 23:56:28 +02:00
William Wallace
fbb424ba21 Add enums for DrawImageInstance flags 2017-07-13 18:10:14 +01:00
William Wallace
09f5019394 Improve rendering of masked sprites in OpenGL drawing engine 2017-07-13 10:18:05 +02:00
OpenRCT2 git bot
7d5daad2e1 Merge Localisation/master into OpenRCT2/develop. 2017-07-09 04:00:32 +00:00
OpenRCT2 git bot
e225ea2bc0 Merge Localisation/master into OpenRCT2/develop. 2017-07-08 04:00:41 +00:00
spacek531
e47e71e949 change format to uint8 to stop overflow 
[ci-skip]
 2017-07-07 17:35:33 +01:00
spacek531
51c34ff800 removed BOM from en-GB 
[ci skip]
 2017-07-07 17:35:31 +01:00
spacek531
c815a427c0 Change Seconds (internal) to Milliseconds, en-GB too 2017-07-07 17:35:31 +01:00
OpenRCT2 git bot
487e94dd72 Merge Localisation/master into OpenRCT2/develop. 2017-07-06 04:00:28 +00:00
OpenRCT2 git bot
3151b2b9da Merge Localisation/master into OpenRCT2/develop. 2017-07-05 04:00:19 +00:00
OpenRCT2 git bot
0be6003474 Merge Localisation/master into OpenRCT2/develop. 2017-07-04 04:00:23 +00:00
OpenRCT2 git bot
126d0df2d0 Merge Localisation/master into OpenRCT2/develop. 2017-07-03 04:00:24 +00:00
OpenRCT2 git bot
018ccea688 Merge Localisation/master into OpenRCT2/develop. 2017-07-02 04:00:27 +00:00
rwjuk
214bf3988b Implement 'missing objects' window 
Implement 'missing objects' window

Basic implementation of 'bad objects' window

Add new object_load_error.c

Add object_load_error.c

Faffing about

String stuff

Stuff

Get window basically displaying

Proper col header for object

Display object types

Display file name and explanatory message

Probably about time I added myself to the dev list

Cleanup and comments

Make bad object window work with SC6

Fix whitespace, string IDs, flip core function sense

Fix spacing in string_ids.h

Fix string ID snafu

Fix HasNoInvalidObjects() sense

Attempt to refactor this to pass data properly

Move typedefs to separate header

Fix up signatures

Add park_load_result_types.h

Clean up includes and remnants of prev implementation

Split duplication into function, free invalid entries list on close

Use pointer for object_validity_result param

Fixup string IDs

Use LoadObject() directly

Use dependency injection, fix string termination

Xcode fix, make helper function static

Fix buffer overrun and memory leak

Use SDL for clipboard functionality

Fix function & variable declarations

Rework editor_read_s6() to use new park load result type

Update changelog for #5624

[ci skip]

Fix mem leak, function signature and whitespace
 2017-07-01 01:28:51 +01:00
OpenRCT2 git bot
f3b3345db6 Merge Localisation/master into OpenRCT2/develop. 2017-06-30 04:00:32 +00:00
Gymnasiast
4e87ad6ac3 Properly check 'Finish 5 roller coasters' criteria, fixes #597 
This fixes the following things:
- The objective was not available when using money (despite it being used on such scenarios in RCT1)
- The scenario editor set the 'partially finished flag' on every single ride
- The scenario editor did not check if there were five finished roller coasters
- When checking the goal, there was no check if the ride was a roller coaster
- When checking the goal, there was no check if the ride was one of the roller coasters to be completed
 2017-06-29 17:32:12 +02:00
OpenRCT2 git bot
961c6cb44f Merge Localisation/master into OpenRCT2/develop. 2017-06-26 04:00:23 +00:00
OpenRCT2 git bot
0318b5b1ca Merge Localisation/master into OpenRCT2/develop. 2017-06-25 04:00:18 +00:00
OpenRCT2 git bot
050ac3dee4 Merge Localisation/master into OpenRCT2/develop. 2017-06-24 04:00:23 +00:00
Matte A
92426994af Giving the cheat "Own all land" a tool-tip 2017-06-23 08:18:45 +02:00
OpenRCT2 git bot
f7937f56f0 Merge Localisation/master into OpenRCT2/develop. 2017-06-23 04:00:24 +00:00
OpenRCT2 git bot
14f9b221b3 Merge Localisation/master into OpenRCT2/develop. 2017-06-22 04:00:22 +00:00
OpenRCT2 git bot
1d93ac5011 Merge Localisation/master into OpenRCT2/develop. 2017-06-21 04:00:25 +00:00
OpenRCT2 git bot
97e6191851 Merge Localisation/master into OpenRCT2/develop. 2017-06-20 04:00:23 +00:00
Michael Steenbeek
4019dee565 en-GB: Change name of 'Midi Coaster' 2017-06-19 12:36:28 +02:00
OpenRCT2 git bot
c018cff5a3 Merge Localisation/master into OpenRCT2/develop. 2017-06-18 04:00:26 +00:00
OpenRCT2 git bot
bb0a655558 Merge Localisation/master into OpenRCT2/develop. 2017-06-17 04:00:19 +00:00
OpenRCT2 git bot
183e338173 Merge Localisation/master into OpenRCT2/develop. 2017-06-16 04:00:22 +00:00
Michael Steenbeek
96a7a8ab50 Sort rides into ride groups when in select-by-track-type mode 
* Add ride groups

* Convert ride groups to C++

* Fix linking and crashes in Xcode

* Comment out .field syntax to make Visual Studio happy

* Fix alignment, fix changelog, cleanup

* Properly save ride group index in the ride object repository and bump its version

* Fix fallback behaviour when the ride entry is not available or not invented

* Fix include

* Rename RideGroup to RideGroupManager, add const, cleanup

* Break after finding matching ride group
 2017-06-14 13:31:27 +02:00
OpenRCT2 git bot
4f873ce64a Merge Localisation/master into OpenRCT2/develop. 2017-06-14 04:00:21 +00:00
OpenRCT2 git bot
f5ce5c9289 Merge Localisation/master into OpenRCT2/develop. 2017-06-13 04:00:22 +00:00
Richard Jenkins
4c67ef1d6a Implement persistent 'real names of guests' setting 2017-06-12 14:05:19 +02:00
OpenRCT2 git bot
5c5389a2ff Merge Localisation/master into OpenRCT2/develop. 2017-06-10 04:00:28 +00:00
OpenRCT2 git bot
6eb14aa90d Merge Localisation/master into OpenRCT2/develop. 2017-06-09 04:00:20 +00:00
OpenRCT2 git bot
6e216141ca Merge Localisation/master into OpenRCT2/develop. 2017-06-08 04:00:22 +00:00
Jeremy Herbert
ac99683955 Add cheat to disable ride value ageing 2017-06-07 21:52:47 +01:00
OpenRCT2 git bot
d249855728 Merge Localisation/master into OpenRCT2/develop. 2017-06-07 04:00:25 +00:00
Michał Janiszewski
43114b105c Extend logging with signs and track modifications 2017-06-06 23:17:46 +02:00
delebota
f69e7ac89e Setup server action logging for server admins in multiplayer 
Squash commit containing:
- 398d978 Setup server action logging for server admins in multiplayer
- 13330ae Added server action logging for using cheats in multiplayer
- b619019 Added server action logging for demolishing rides in multiplayer
- 93de752 Added server action logging for editing ride properties in multiplayer
- 8a3d932 Added server action logging for editing park properties in multiplayer
- c78b6e7 Moved duplicate chat and server logging code into new network methods
- c8f66bf Changed logging variable types to avoid deprecated conversion errors in CI builds
- 454e527 Added improved server action logging for using cheats in multiplayer
- 1194305 Moved server action logging code in game.c into a separate method to reduce clutter
- d59cd42 Added server action logging for add/edit/remove scenery in multiplayer
- c41ae0e Added server action logging for clients in multiplayer
- c383341 Removed unused variable to fix CI build error
- 2d1d8e3 Added server action logging for ride creation in multiplayer
 2017-06-06 23:07:54 +02:00
wolfreak99
07d1ba4f8c Create "Own all land" cheat functionality (#5056) 
Implement "Own all land" cheat into cheat window

Restore only valid peep spawn points

Code improvements

Update to use PEEP_SPAWN / PARK_ENTRANCE defines
 2017-06-06 21:50:42 +01:00
Ted John
30585ea2a9 Show guest money effects with high precision 2017-06-05 21:18:14 +01:00
Sam Olsen
b9e9b8320f Add enhancement to show money effect when peeps make purchases 2017-06-05 21:02:05 +01:00
wolfreak99
36ca5b30ac Mark selected save file in load/save window 2017-06-05 15:45:36 +02:00
OpenRCT2 git bot
26196c62c3 Merge Localisation/master into OpenRCT2/develop. 2017-05-28 04:00:23 +00:00
OpenRCT2 git bot
dabaddd4cf Merge Localisation/master into OpenRCT2/develop. 2017-05-26 04:00:23 +00:00
OpenRCT2 git bot
0728e6869b Merge Localisation/master into OpenRCT2/develop. 2017-05-23 04:00:22 +00:00