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

24158 Commits

Author SHA1 Message Date
Gymnasiast
db7cd40fff Merge branch 'develop' 2022-12-14 13:16:41 +01:00
Gymnasiast
8d611961ed Remove outdated STR_6491 and STR_6493 for release 2022-12-14 13:16:21 +01:00
OpenRCT2 git bot
18987e90cc Merge Localisation/master into OpenRCT2/develop 2022-12-14 13:16:20 +01:00
Michael Steenbeek
a0a3d33472 Fix #18024: Confusing error message on loading incompatible .park files (#18837)
Now shows the version the current build supports, and doesn’t mention the minimum version if it’s equal to the target version.
2022-12-14 13:09:16 +01:00
OpenRCT2 git bot
69e918b47b Merge Localisation/master into OpenRCT2/develop 2022-12-14 04:01:54 +00:00
Rik Smeets
bd165199cd Fix #18802: Game can crash on mechanic path finding 2022-12-13 21:46:53 +01:00
Michael Steenbeek
643e33efcd Fix #1491: Clearance of the Cash Machine is too low 2022-12-13 18:27:12 +01:00
spacek531
44100234c3 Fix #18665, #18559: Add API for getting g2 icons by name
Co-authored-by: Michael Steenbeek <m.o.steenbeek@gmail.com>
2022-12-12 23:03:16 +00:00
Michael Steenbeek
6b8f7afe29 Merge pull request #18815 from Gymnasiast/fix/6341
Fix #6341: “Unlock vehicle limits” does not allow setting fewer vehicles than the vehicle type requires
2022-12-12 22:51:09 +01:00
OpenRCT2 git bot
1fe6a1795f Merge Localisation/master into OpenRCT2/develop 2022-12-12 04:02:01 +00:00
Gymnasiast
ca3dc801ce Properly display "0 cars per train" 2022-12-11 23:03:47 +01:00
Gymnasiast
174d638d1d Fix #6341: “Unlock vehicle limits” doesn’t work for setting fewer cpt 2022-12-11 23:00:51 +01:00
zzril
4583d0ae59 Fix #18805: Crash in WallCheckObstructionWithTrack
Revert refactored line for now to avoid crashes, will be solved properly in a later PR.

Co-authored-by: Michael Steenbeek <m.o.steenbeek@gmail.com>
2022-12-11 21:44:46 +00:00
Michael Steenbeek
5de62b774a Merge pull request #17997 from karst/steep-flume
Steep track pieces for log flumes
2022-12-11 15:20:20 +01:00
Michael Steenbeek
57a1bc4126 Merge pull request #18795 from Gymnasiast/refactor/track-block
Create method to safely retrieve track sequence block
2022-12-11 10:55:42 +01:00
OpenRCT2 git bot
5007eaef6c Merge Localisation/master into OpenRCT2/develop 2022-12-11 04:01:58 +00:00
Karst
5f84e7c49d Improve 60-25-down-nwse-png 2022-12-10 22:47:45 +01:00
Gymnasiast
c0bd066c52 Fix tabs usage in sprites.json 2022-12-10 22:47:18 +01:00
Rik Smeets
055f16f0e5 Fix #18696: Construction rights cannot be viewed after all are purchased 2022-12-10 22:35:59 +01:00
Gymnasiast
38b34e841a Use safe method to access ted block 2022-12-10 22:31:23 +01:00
Gymnasiast
d90d81c7b3 Create method to safely retrieve track sequence block 2022-12-10 22:08:42 +01:00
Michael Steenbeek
c01fe36d80 Fix #18787: Back of stall shown through vertical terrain (#18789) 2022-12-09 19:59:47 +01:00
Michał Janiszewski
ca91c67eeb Fix #18576: Cannot open parks with certain types of corrupt tile elements 2022-12-09 06:57:40 +00:00
OpenRCT2 git bot
88e9f07c49 Merge Localisation/master into OpenRCT2/develop 2022-12-09 04:09:59 +00:00
Michał Janiszewski
2d101a5212 Provide additional information when rejecting unknown tile element 2022-12-08 22:38:17 +01:00
Michael Steenbeek
b7bc29ee82 Add #18621 to changelog 2022-12-08 21:56:11 +01:00
ccahiggins
76d491b9a2 Improve OpenGL Rectangle SetInstances Performance
Change to use glBufferSubData instead of glBufferData

An initial buffer size is set with glBufferData.
glBufferSubData is then used to copy to the existing buffer,
rather than creating a new one for each frame.

We keep track of the buffer size, and if instances size increases
above the buffer size, a new buffer is created with glBufferData
2022-12-08 21:14:31 +01:00
Gymnasiast
59f6856cd3 Make steep Log Flume pieces in older parks invisible 2022-12-08 20:03:08 +01:00
Rik Smeets
9226448eb1 Fix #18552: Trains clipping through helixes 2022-12-08 19:49:54 +01:00
OpenRCT2 git bot
94a4a45e30 Merge Localisation/master into OpenRCT2/develop 2022-12-08 04:09:58 +00:00
Karst
2c68c73a24 Add steep drops to the Log Flume 2022-12-07 22:52:22 +01:00
Michael Steenbeek
6f82bdf099 en-GB: Fix typo 2022-12-07 09:35:27 +01:00
HouseholdVTuber
228a8573e2 Fix #18364: No Too High! or Too Low! error messages when attempting to raise/lower land beyond the limits 2022-12-06 23:06:06 -03:00
OpenRCT2 git bot
84b3fc9da4 Merge Localisation/master into OpenRCT2/develop 2022-12-06 04:09:15 +00:00
Michael Steenbeek
b3af9b6eb3 Set a default scenery group priority value
All custom groups I checked seem to use ‘40’ as the priority, so I went with that.
2022-12-05 07:36:10 +01:00
QwertyChouskie
8438d05011 Work around more false warnings when compiling deb (#18753)
See https://github.com/OpenRCT2/OpenRCT2/issues/16691 and
https://github.com/OpenRCT2/OpenRCT2/issues/17371
2022-12-05 07:22:31 +01:00
Michael Steenbeek
6be16ed64f Fix spelling of ‘scenery’ 2022-12-04 23:06:49 +01:00
Michał Janiszewski
5b839f7e2f Update debian compat version to 13 (#18767)
This is done primarily to make debhelper default to parallel builds

Fixes #18741

5d1bb29841/debhelper.pod (compatibility-levels)
2022-12-04 23:06:22 +01:00
frutiemax
b7a1db6e69 Use BoundBoxXYZ for PaintAddImageAsParent (part 1) 2022-12-04 20:43:19 +01:00
Michael Steenbeek
01ac5d36e9 Add #18720 to changelog 2022-12-04 20:17:35 +01:00
GalBr
8d4979588e Fix #18755: Ferris Wheel and Circus ghosts not coloured correctly 2022-12-04 20:11:11 +01:00
X123M3-256
3dfe1eedb6 Fix #18720: Can build upward helix on Alpine Coaster 2022-12-04 20:10:30 +01:00
QwertyChouskie
7602eb6095 Use -Wno-stringop-overflow when compiling .deb (#18731)
This warning is bugged in GCC < `11.3`, see https://gcc.gnu.org/bugzilla/show_bug.cgi?id=99578

Closes https://github.com/OpenRCT2/OpenRCT2/issues/16691
2022-12-02 21:50:35 +01:00
OpenRCT2 git bot
752eec116a Merge Localisation/master into OpenRCT2/develop 2022-11-30 04:02:05 +00:00
OpenRCT2 git bot
050f3f85a4 Merge Localisation/master into OpenRCT2/develop 2022-11-28 04:01:52 +00:00
frutiemax
76faa77f6b Part of #16152: Use BoundBoxXYZ for PaintAddImageAsChild 2022-11-27 18:33:11 +00:00
OpenRCT2 git bot
540e5d248b Merge Localisation/master into OpenRCT2/develop 2022-11-27 04:01:53 +00:00
OpenRCT2 git bot
f4a75ce217 Merge Localisation/master into OpenRCT2/develop 2022-11-26 04:01:59 +00:00
Michael Steenbeek
4281914c73 Fix #18653: Negative ratings multipliers do not appear in Vehicle tab 2022-11-24 20:42:25 +00:00
Michael Steenbeek
eeb28e5db8 Close #18591: Order RollerCoaster Tycoon 2 scenarios by difficulty 2022-11-24 13:12:27 +01:00