1
0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-16 03:23:15 +01:00
Commit Graph

1882 Commits

Author SHA1 Message Date
Gymnasiast
b2ffbb3639 Merge remote-tracking branch 'upstream/develop' into new-save-format 2021-07-19 19:04:19 +02:00
OpenRCT2 git bot
707d4156bc Merge Localisation/master into OpenRCT2/develop 2021-07-07 04:07:54 +00:00
OpenRCT2 git bot
2650828f08 Merge Localisation/master into OpenRCT2/develop 2021-06-28 04:07:26 +00:00
Hielke Morsink
acd45e6f75 Redesign About window (#14841) 2021-06-26 10:54:38 +02:00
OpenRCT2 git bot
9383fcef41 Merge Localisation/master into OpenRCT2/develop 2021-06-16 04:07:56 +00:00
duncanspumpkin
35fdcdb256 Merge branch 'develop' into HEAD 2021-06-08 13:02:16 +01:00
OpenRCT2 git bot
c1c9353dd2 Merge Localisation/master into OpenRCT2/develop 2021-06-06 05:00:05 +00:00
duncanspumpkin
5bac7821c9 Merge develop 2021-06-04 13:11:47 +01:00
OpenRCT2 git bot
5b5aa0771e Merge Localisation/master into OpenRCT2/develop 2021-05-29 05:52:24 +00:00
OpenRCT2 git bot
4c1ab8d934 Merge Localisation/master into OpenRCT2/develop 2021-05-28 05:22:13 +00:00
Gymnasiast
3e357e6148 Merge remote-tracking branch 'upstream/develop' into new-save-format 2021-05-27 22:40:34 +02:00
Gymnasiast
b214a9fd97 Show what a stall sells in Object Selection 2021-05-27 19:54:44 +02:00
Gymnasiast
f2ac658935 Show tracks list of music styles in Object Selection 2021-05-27 19:53:52 +02:00
Michael Steenbeek
4be838a9b8 Reserve strings for the new-save-format branch
Avoiding constant merge conflicts
2021-05-27 19:52:11 +02:00
Gymnasiast
8bc8a0df14 Remove Music Acknowledgements window
It was of limited use to us anyway since we didn’t license the music ourselves, but now the actual track names and composers are shown in the Object Selection, the window lost its last bit of usefulness.
2021-05-26 17:56:02 +02:00
Gymnasiast
7feb3802fb Show what a stall sells in Object Selection 2021-05-26 17:46:04 +02:00
Gymnasiast
5fcb1f7273 Show tracks list of music styles in Object Selection 2021-05-26 17:46:03 +02:00
OpenRCT2 git bot
1b11e691c9 Merge Localisation/master into OpenRCT2/develop 2021-05-26 04:43:40 +00:00
OpenRCT2 git bot
15bb5f53f8 Merge Localisation/master into OpenRCT2/develop 2021-05-25 04:28:28 +00:00
Ted John
de6c4b7b76 Fix park value objective string for currency 64 2021-05-24 20:04:54 +01:00
Gymnasiast
080343c99d Merge remote-tracking branch 'upstream/develop' into new-save-format 2021-05-24 19:30:05 +02:00
Gymnasiast
8f6713a4f1 Reverse option, add shortcut 2021-05-24 16:54:30 +02:00
Gymnasiast
89eae5198b Add option to make water opaque 2021-05-24 16:39:39 +02:00
Ted John
2b2159976d Merge branch 'develop' into new-save-format 2021-05-17 21:33:29 +01:00
Gymnasiast
971c7fa26b Update footpath railings tab icon; update some descriptions 2021-05-16 14:15:41 +02:00
OpenRCT2 git bot
217b5a5c48 Merge Localisation/master into OpenRCT2/develop 2021-05-12 04:13:26 +00:00
OpenRCT2 git bot
c20bb2b8aa Merge Localisation/master into OpenRCT2/develop 2021-05-02 04:11:56 +00:00
Ted John
dbd1f0aa46 Show error message if JSON object selected on td select 2021-04-26 20:51:18 +01:00
Ted John
6db0c01fdc Merge branch 'develop' into new-save-format 2021-04-25 15:03:45 +01:00
Ted John
8b40162871 Update title inspector for footpaths 2021-04-24 17:25:52 +01:00
Ted John
627735da72 Add tooltips for new footpath objects 2021-04-24 16:57:02 +01:00
Ted John
dff8d443f6 Ensure one footpath surface and railing is selected 2021-04-24 16:23:34 +01:00
Michał Janiszewski
10bc3da9b9 Improve shader compatibility with GLES (#14489) 2021-04-20 08:10:23 +02:00
Gymnasiast
4437e692e2 Replace remnants of corrupted elements 2021-04-03 00:21:43 +01:00
Gymnasiast
87422c2806 Replace corrupt elements with invisibility bit 2021-04-03 00:21:43 +01:00
OpenRCT2 git bot
0bb5d453a4 Merge Localisation/master into OpenRCT2/develop 2021-04-02 04:05:31 +00:00
OpenRCT2 git bot
7c33a31d3a Merge Localisation/master into OpenRCT2/develop 2021-04-01 04:02:31 +00:00
Gymnasiast
69f7ad35fc en-GB: Use real multiplication sign instead of x 2021-03-31 14:37:35 +02:00
OpenRCT2 git bot
6bff0fb1a1 Merge Localisation/master into OpenRCT2/develop 2021-03-30 04:02:43 +00:00
OpenRCT2 git bot
dd7258eb33 Merge Localisation/master into OpenRCT2/develop 2021-03-29 04:04:12 +00:00
OpenRCT2 git bot
7c78a2b8c3 Merge Localisation/master into OpenRCT2/develop 2021-03-28 04:03:42 +00:00
Geoff B
6c8493cb69 Close #14253: Replace font size tokens with adjusted DrawText calls 2021-03-27 14:40:17 +01:00
Michael Steenbeek
713410ab6c Apply changed strings from the new-save-format branch 2021-03-27 14:31:13 +01:00
OpenRCT2 git bot
e8e30e9c6a Merge Localisation/master into OpenRCT2/develop 2021-03-27 04:02:43 +00:00
OpenRCT2 git bot
4631c22a3c Merge Localisation/master into OpenRCT2/develop 2021-03-21 04:05:54 +00:00
OpenRCT2 git bot
cc68b8bf4d Merge Localisation/master into OpenRCT2/develop 2021-03-15 04:06:00 +00:00
manatails
4fe5b1dc79 Add "Vandals stopped" stat for security guards (#14071)
* Add a stat for security guards: Vandals stopped

* Update src/openrct2-ui/windows/Staff.cpp

Co-authored-by: Tulio Leao <tupaschoal@gmail.com>

* Update src/openrct2/peep/Guest.cpp

Co-authored-by: Tulio Leao <tupaschoal@gmail.com>

* No need to update screenCoords at the last line

Co-authored-by: Michael Steenbeek <m.o.steenbeek@gmail.com>

* Add changelog entry and bump network version

* Update to new UI code

Co-authored-by: Tulio Leao <tupaschoal@gmail.com>
Co-authored-by: Michael Steenbeek <m.o.steenbeek@gmail.com>
2021-03-14 09:18:35 -03:00
OpenRCT2 git bot
72b6160b65 Merge Localisation/master into OpenRCT2/develop 2021-03-14 04:05:51 +00:00
OpenRCT2 git bot
32ce6c9b4b Merge Localisation/master into OpenRCT2/develop 2021-03-13 04:06:03 +00:00
OpenRCT2 git bot
cffb467a77 Merge Localisation/master into OpenRCT2/develop 2021-03-11 04:06:01 +00:00