1
0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-22 22:34:33 +01:00
Commit Graph

22238 Commits

Author SHA1 Message Date
ζeh Matt
ac84b61eaf Merge remote-tracking branch 'upstream/develop' into new-save-format 2021-09-30 00:21:02 +03:00
ζeh Matt
afc0e87f29 Merge pull request #15477 from ZehMatt/nsf/update-xyz
Update entities xyz to int32_t
2021-09-29 13:32:06 -07:00
ζeh Matt
15547ff8f4 Merge pull request #15488 from ZehMatt/fix-14798
Fix #14798: Overflow on sound position
2021-09-29 13:07:09 -07:00
ζeh Matt
98625e1aaa Fix #14798: Overflow on sound position 2021-09-29 22:47:53 +03:00
Michael Steenbeek
987174e828 Merge pull request #15436 from duncanspumpkin/staff
Small Staff Refactor from NSF
2021-09-29 20:46:24 +02:00
Michael Steenbeek
e5f9282a36 Merge pull request #15470 from Broxzier/bugfix/15213-unicode-freeze
Fix #15213: Freeze when reading a partially cut unicode character
2021-09-29 20:26:01 +02:00
Michael Steenbeek
22af2ecdcc Merge pull request #15486 from ZehMatt/nsf/backport-overflow
Use int32_t for iterating tiles
2021-09-29 20:02:05 +02:00
Gymnasiast
bb933d1eb7 Fix #14824: locating a staff member by patrol area picks wrong staff member
Co-authored-by: duncanspumpkin <duncanspumpkin@users.noreply.github.com>
2021-09-29 19:56:55 +02:00
ζeh Matt
82f0da24b1 Use int32_t for iterating tiles
Co-authored-by: Ted John <ted@brambles.org>
2021-09-29 20:40:57 +03:00
Duncan
8c6f10797b Prevent wasting paint time on unviewable entities 2021-09-29 19:20:43 +02: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
ζeh Matt
c1cde60e7f Bump up network version 2021-09-29 19:49:42 +03:00
ζeh Matt
afd5e8668f Update replays 2021-09-29 19:49:15 +03:00
ζeh Matt
3a5452f0c9 Update entities xyz to int32_t 2021-09-29 19:49:15 +03:00
Duncan
cce3bb1845 Fix #15136: Exported SV6 hangs/crashes vanilla RCT2 2021-09-29 18:48:50 +02:00
ζeh Matt
9216786efc Refactor GetSpatialIndexOffset (#15479) 2021-09-29 17:19:47 +01:00
frutiemax
2906cb8c89 Fix #14474: Map size can be synced in multiplayer (#15312)
* Fix #14474: Map size can be synced in multiplayer

* Bump up network version

Co-authored-by: ζeh Matt <5415177+ZehMatt@users.noreply.github.com>
2021-09-29 16:46:03 +01:00
OpenRCT2 git bot
c284aa2ce2 Merge Localisation/master into OpenRCT2/develop 2021-09-29 04:08:29 +00:00
ζeh Matt
8ae8a26a0f Merge remote-tracking branch 'upstream/develop' into new-save-format 2021-09-28 01:53:18 +03:00
ζeh Matt
fb51f796c2 Merge pull request #15475 from ZehMatt/fix/spatial-overflow
Fix out of bounds access
2021-09-27 15:46:47 -07:00
ζeh Matt
274bc039af Fix out of bounds access 2021-09-28 01:26:22 +03:00
ζeh Matt
04f15b7d45 Merge pull request #15474 from ZehMatt/fix/spatial-overflow
Fix overflow in GetSpatialIndexOffset
2021-09-27 14:54:31 -07:00
ζeh Matt
185cfdea0f Refactor GetSpatialIndexOffset and fix overflow 2021-09-28 00:25:15 +03:00
Duncan
50118ae039 Move function for NSF use 2021-09-27 22:54:41 +02:00
ζeh Matt
d8ce486fa4 Merge remote-tracking branch 'upstream/develop' into new-save-format 2021-09-27 23:13:49 +03:00
ζeh Matt
6fcd224efd Merge pull request #15473 from ZehMatt/backport/nsf-paintsetup
Use CoordsXY for sprite_paint_setup
2021-09-27 13:10:19 -07:00
ζeh Matt
4ea8902587 Refactor arg passing to sprite_paint_setup 2021-09-27 22:48:06 +03:00
ζeh Matt
cecf4ac202 Use CoordsXY for sprite_paint_setup
Co-authored-by: Ted John <ted@brambles.org>
2021-09-27 22:47:36 +03:00
Hielke Morsink
219a4efa0f Add changelog entry 2021-09-27 15:09:08 +02:00
Hielke Morsink
c234abfbb8 Fix #15213: Freeze when reading a partially cut unicode character 2021-09-27 15:03:25 +02:00
Hielke Morsink
e88f96a15c Move StaticLayout out of header file 2021-09-27 14:56:37 +02:00
duncanspumpkin
1d788030ca Revert mistaken rename 2021-09-27 12:35:03 +01:00
Gymnasiast
ea4c9681b5 Revert stray changes 2021-09-26 20:00:42 +02:00
Gymnasiast
8f97730a5e Merge remote-tracking branch 'upstream/develop' into new-save-format 2021-09-26 19:56:04 +02:00
Michael Steenbeek
f7d61c67e6 Fix arbitrary ride type cheat not working 2021-09-26 16:21:34 +02:00
Gymnasiast
0825865d13 Merge remote-tracking branch 'upstream/develop' into new-save-format 2021-09-26 11:57:32 +02:00
Gymnasiast
e4d6cd3c34 Revert stray changes to openrct2.d.ts 2021-09-26 11:54:06 +02:00
Hielke Morsink
9dd9b27db4 Make WIDGETS_END constexpr 2021-09-26 11:11:42 +02:00
Gymnasiast
a9ba0fce9d Fix track element ride type on import
Not yet tested because of other import errors.
2021-09-25 22:54:06 +02:00
seanmajorpayne
2ba515fb37 Improve #15322: Circus Music Not Playing
Alleviates the issue, though the circus in European Extravaganza still does not work correctly.
2021-09-25 19:21:38 +00:00
Hielke Morsink
5d2a367249 Merge branch 'develop' into new-save-format 2021-09-25 12:28:42 +02:00
Michael Steenbeek
1feac16bed Merge pull request #15414 from frutiemax/develop
#15367: Encode RideType in TrackElement
2021-09-25 12:02:08 +02:00
Hielke Morsink
a8b84989eb Check for nullptr explicitly in operct2-ui (#15460) 2021-09-25 08:45:06 +02:00
Hielke Morsink
53c22c9b4b Check for nullptr explicitly (#15458) 2021-09-24 20:05:50 +02:00
Gymnasiast
d9ca8a130f Remove accidentally committed statement 2021-09-23 22:24:44 +02:00
ζeh Matt
f689b4e4c8 Merge remote-tracking branch 'upstream/develop' into new-save-format 2021-09-23 22:28:17 +03:00
ζeh Matt
e5de2adc4f Merge pull request #15429 from ZehMatt/backport/ticks
Remove scenario ticks and adjust export/import
2021-09-23 12:08:16 -07:00
ζeh Matt
7302cb806a Update replays 2021-09-23 21:49:09 +03:00
ζeh Matt
c61f141cdc Bump up network version 2021-09-23 21:49:09 +03:00