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

1927 Commits

Author SHA1 Message Date
Gymnasiast
aac479d76d Merge remote-tracking branch 'upstream/develop' into new-save-format 2021-10-26 20:14:01 +02:00
OpenRCT2 git bot
2146abb17f Merge Localisation/master into OpenRCT2/develop 2021-10-26 04:08:51 +00:00
OpenRCT2 git bot
72439c28d2 Merge Localisation/master into OpenRCT2/develop 2021-10-23 04:08:27 +00:00
ζeh Matt
5199325209 Merge remote-tracking branch 'upstream/develop' into new-save-format 2021-10-21 19:05:17 +03:00
OpenRCT2 git bot
14c5f13b18 Merge Localisation/master into OpenRCT2/develop 2021-10-21 04:08:57 +00:00
ζeh Matt
b96565266c Merge remote-tracking branch 'upstream/develop' into new-save-format 2021-10-06 19:47:09 +03:00
OpenRCT2 git bot
36a0a28e3f Merge Localisation/master into OpenRCT2/develop 2021-10-05 04:08:34 +00:00
OpenRCT2 git bot
b7bda6e938 Merge Localisation/master into OpenRCT2/develop 2021-10-02 04:08:15 +00:00
Gymnasiast
3d7769826f Remove obsolete string 2021-09-29 19:12:04 +02:00
Gymnasiast
17a6ecb09b Merge remote-tracking branch 'upstream/develop' into new-save-format 2021-09-29 19:10:01 +02:00
OpenRCT2 git bot
c284aa2ce2 Merge Localisation/master into OpenRCT2/develop 2021-09-29 04:08:29 +00:00
Gymnasiast
6280152c9c Merge remote-tracking branch 'upstream/develop' into new-save-format 2021-09-21 10:36:26 +02:00
OpenRCT2 git bot
fddf009afc Merge Localisation/master into OpenRCT2/develop 2021-09-21 04:08:19 +00:00
duncanspumpkin
63b075695e Merge branch 'develop' into HEAD 2021-09-19 07:20:35 +01:00
OpenRCT2 git bot
99e3883b6e Merge Localisation/master into OpenRCT2/develop 2021-09-19 04:07:58 +00:00
Gymnasiast
c390e9f521 Merge remote-tracking branch 'upstream/develop' into new-save-format
Some conflicts intentionally unresolved
2021-09-17 10:15:09 +02:00
OpenRCT2 git bot
16472a400f Merge Localisation/master into OpenRCT2/develop 2021-09-16 04:07:59 +00:00
OpenRCT2 git bot
3f8f78ac8f Merge Localisation/master into OpenRCT2/develop 2021-09-14 04:11:10 +00:00
Kane
b35fd28c55 Feature #7682: Lock camera to vehicle in main window
Pressing the "Locate" button in the Ride window when selected on a "Vehicle/Train" will now have the main viewport track the vehicle.
2021-09-13 20:44:52 +02:00
OpenRCT2 git bot
e2841477bd Merge Localisation/master into OpenRCT2/develop 2021-09-10 04:08:27 +00:00
OpenRCT2 git bot
c6e4dc5ef1 Merge Localisation/master into OpenRCT2/develop 2021-09-07 04:08:07 +00:00
OpenRCT2 git bot
fc189f8c7d Merge Localisation/master into OpenRCT2/develop 2021-09-06 04:08:02 +00:00
Hielke Morsink
8ae918118a Add a bug-report item in file dropdown menu 2021-09-05 15:25:44 +02:00
Gymnasiast
62b5d08554 Merge remote-tracking branch 'upstream/develop' into new-save-format 2021-09-03 21:57:45 +02:00
OpenRCT2 git bot
91ca2e58bc Merge Localisation/master into OpenRCT2/develop 2021-09-03 04:08:05 +00:00
Gymnasiast
93c656f91d Merge remote-tracking branch 'upstream/develop' into new-save-format 2021-08-29 15:39:42 +02:00
OpenRCT2 git bot
d8997cd60f Merge Localisation/master into OpenRCT2/develop 2021-08-21 04:07:57 +00:00
Gymnasiast
ca47b31207 Merge remote-tracking branch 'upstream/develop' into new-save-format 2021-08-13 18:29:09 +02:00
OpenRCT2 git bot
31ccac8354 Merge Localisation/master into OpenRCT2/develop 2021-08-08 04:07:52 +00:00
Gymnasiast
185d171940 Merge remote-tracking branch 'upstream/develop' into new-save-format 2021-08-07 19:13:10 +02:00
OpenRCT2 git bot
3503a433dc Merge Localisation/master into OpenRCT2/develop 2021-08-02 04:07:54 +00:00
Gymnasiast
d885c545d8 Merge remote-tracking branch 'upstream/develop' into new-save-format 2021-08-01 15:54:04 +02:00
Ted John
d78deacb6d Fix park value objective string for currency 64 2021-08-01 15:14:43 +02:00
Kane
bd8d3934e0 Close #15143: Add a shortcut key for Giant Screenshot 2021-08-01 09:20:34 +02:00
OpenRCT2 git bot
660a5f9b02 Merge Localisation/master into OpenRCT2/develop 2021-08-01 04:07:50 +00:00
OpenRCT2 git bot
292b8b9ab7 Merge Localisation/master into OpenRCT2/develop 2021-07-31 04:07:58 +00:00
Duncan
465d1c5414 Cleanup of Banner related actions (#15126)
* Close #15107. Use correct type and provide appropriate error messages

* Add further error messages to actions

* Apply review comments
2021-07-30 20:53:13 +01:00
OpenRCT2 git bot
2eb1ee631b Merge Localisation/master into OpenRCT2/develop 2021-07-30 04:08:04 +00:00
OpenRCT2 git bot
d01a3a783a Merge Localisation/master into OpenRCT2/develop 2021-07-29 04:07:50 +00:00
Gymnasiast
9f61748d95 Merge remote-tracking branch 'upstream/develop' into new-save-format 2021-07-28 11:00:36 +02:00
Michael Steenbeek
ab18612882 Remove Music Acknowledgements window (#15116)
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-07-28 10:26:35 +02:00
OpenRCT2 git bot
6bbc2fb4fe Merge Localisation/master into OpenRCT2/develop 2021-07-28 04:07:35 +00:00
Gymnasiast
14297da683 Merge remote-tracking branch 'upstream/develop' into new-save-format 2021-07-27 12:11:25 +02:00
OpenRCT2 git bot
399bd15d5e Merge Localisation/master into OpenRCT2/develop 2021-07-27 04:07:29 +00:00
OpenRCT2 git bot
8b9129d9f3 Merge Localisation/master into OpenRCT2/develop 2021-07-21 04:07:43 +00:00
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