mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-22 22:34:33 +01:00
Code Issues Releases Wiki Activity
22,257 Commits 8 Branches 59 Tags
5a0fa60b9e63bf8347281a3c50494666a480b550
Commit Graph

17356 Commits

Author SHA1 Message Date
Gymnasiast
5a0fa60b9e Merge remote-tracking branch 'upstream/develop' into new-save-format 2021-10-01 18:45:51 +02:00
Michael Steenbeek
06dc75845a Fix #15476: Crash in map_place_clear_func() 2021-10-01 16:10:25 +00:00
Michael Steenbeek
d320a5cfe7 Merge pull request #15505 from Gymnasiast/fix/15496 
Fix #15496 and clean up paint_swinging_inverter_ship_structure() a bit
 2021-10-01 18:03:22 +02:00
Michael Steenbeek
317e562845 Merge pull request #15495 from ZehMatt/refactor/xyz-access 
Use GetLocation in more places
 2021-10-01 14:02:34 +02:00
Gymnasiast
d3cfa07a2a Fix #15496: crash in paint_swinging_inverter_ship_structure() 2021-10-01 13:51:00 +02:00
Gymnasiast
c74984740b Pass ride ref to paint_swinging_inverter_ship_structure() 2021-10-01 13:48:27 +02:00
duncanspumpkin
69c520e278 Readd header 2021-09-30 17:07:21 +01:00
Michael Steenbeek
26d1186240 Merge pull request #15493 from Broxzier/refactor/minor-cleanups 
Minor code cleanups
 2021-09-30 15:03:33 +02:00
ζeh Matt
456e54b022 Remove useless comment 
Co-authored-by: Michael Steenbeek <m.o.steenbeek@gmail.com>
 2021-09-30 05:37:23 -07:00
Hielke Morsink
429e34d7f3 Make uses of window_get_main use (const) auto* 2021-09-30 14:36:06 +02:00
ζeh Matt
c492362e45 Fix mistake and cleanup 2021-09-30 15:34:22 +03:00
duncanspumpkin
7b954f876e Merge branch 'develop' into HEAD 2021-09-30 13:06:41 +01:00
Duncan
e01c9a3afa Stream changes from NSF (#15446) 
* Bring over NSF changes to stream classes

* Add orca stream to project files

* Bring over util changes as well.

* Add const to util and fix util ungzip

* Add const and apply review comments

* Apply review comments
 2021-09-30 13:02:54 +01:00
Hielke Morsink
bb5d09982f Properly name argument 2021-09-30 10:40:32 +02:00
Hielke Morsink
94144bcd89 Remove some dead code 
Reported by clang
clang-analyzer-deadcode.DeadStores
 2021-09-30 10:40:32 +02:00
Michael Steenbeek
bfe7caacd7 Fix #15487: map animations do not work correctly in vanilla RCT2 (#15492) 
Co-authored-by: duncanspumpkin <duncanspumpkin@users.noreply.github.com>

Co-authored-by: duncanspumpkin <duncanspumpkin@users.noreply.github.com>
 2021-09-30 07:40:58 +01:00
ζeh Matt
ac84b61eaf Merge remote-tracking branch 'upstream/develop' into new-save-format 2021-09-30 00:21:02 +03:00
Michał Janiszewski
ce1d3e9c83 Minor fixes (#15491) 2021-09-29 21:06:46 +00:00
Hielke Morsink
ba74393a43 Remove pointless return statement 2021-09-29 22:39:34 +02: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
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
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
ζeh Matt
eb2de0222b Use GetLocation in more places 2021-09-28 03:16:04 +03:00
ζeh Matt
8ae8a26a0f Merge remote-tracking branch 'upstream/develop' into new-save-format 2021-09-28 01:53:18 +03: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
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
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