mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-17 03:53:07 +01:00
Code Issues Releases Wiki Activity
21,830 Commits 8 Branches 59 Tags
28681eebc06dd1c2e781a0bf311e8658ea3083d6
Commit Graph

21830 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Hielke Morsink
28681eebc0 Merge pull request #15407 from ZehMatt/refactor/optional-use 
Make use of std::optional strict
 2021-09-14 17:45:18 +02:00
ζeh Matt
687b6c000e Apply review suggestion 
Co-authored-by: Tulio Leao <tupaschoal@gmail.com>
Co-authored-by: Hielke Morsink <hielke.morsink@gmail.com>
 2021-09-14 16:30:38 +03:00
Hielke Morsink
0b0354b113 Merge pull request #15410 from Broxzier/refactor/use-nullopt 2021-09-14 13:15:30 +02:00
OpenRCT2 git bot
3f8f78ac8f Merge Localisation/master into OpenRCT2/develop 2021-09-14 04:11:10 +00:00
Hielke Morsink
2ed7c217bf Remove local instances of std::optional 2021-09-13 23:26:14 +02:00
Hielke Morsink
2af5e0dc82 Remove unnecessary else block 2021-09-13 23:25:33 +02:00
Hielke Morsink
cf78d6841d return nullopt instead of {} 2021-09-13 23:24:57 +02:00
Hielke Morsink
7dd90b99d6 Merge pull request #15162 from seifer7/feature-7682 2021-09-13 21:00:27 +02: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
Gymnasiast
1dde081468 Bump Xcode deployment target to macOS 10.14 2021-09-13 21:38:31 +03:00
ζeh Matt
59a6c34db4 Make use of std::optional strict 2021-09-13 20:02:32 +03:00
Michael Steenbeek
6ffb03dde0 Add icon for path railings tab 2021-09-13 09:29:46 +02:00
Michael Steenbeek
36b0837318 Merge pull request #15400 from Gymnasiast/refactor/free-entity-from-nsf 
Small cherry-picks from NSF
 2021-09-12 19:05:13 +02:00
Michael Steenbeek
5d039a5f55 Use std::string_view instead of C string 
Co-authored-by: ζeh Matt <5415177+ZehMatt@users.noreply.github.com>
 2021-09-12 18:45:53 +02:00
Gymnasiast
6202ecb281 Make util_zlib_inflate() take const 2021-09-12 18:36:50 +02:00
Gymnasiast
1426010652 Plugin: use ObjectEntryIndex for music and entrance style 2021-09-12 18:33:27 +02:00
Gymnasiast
3e1544aac8 Add missing object types to ObjectTypeToString() 2021-09-12 18:31:21 +02:00
Gymnasiast
0f183e9ad2 Make FreeEntity take a reference 2021-09-12 18:29:37 +02:00
Michael Steenbeek
002c17cec8 Merge pull request #15399 from ZehMatt/refactor/remove-nullable 
Remove Nullable and use std::optional instead
 2021-09-12 16:19:19 +02:00
ζeh Matt
f999b0acb2 Remove Nullable and use std::optional instead 2021-09-12 16:55:56 +03:00
ζeh Matt
65a484105e Merge pull request #15395 from ZehMatt/refactor/common-numerics 
Remove numerics from common.h and use it as needed
 2021-09-11 14:27:07 -07:00
ζeh Matt
b733e97bfa Remove numerics from common.h and use it as needed 2021-09-11 20:21:08 +03:00
ζeh Matt
603be1c425 Merge pull request #15394 from ZehMatt/refactor/zipstream 
Move ZipStream into new header
 2021-09-11 09:40:12 -07:00
ζeh Matt
2daa356fbf Move ZipStream into new header 2021-09-11 19:06:17 +03:00
ζeh Matt
2e2bda8f70 Merge pull request #15378 from ZehMatt/refactor/object-importexport 
Refactor object storage in s6
 2021-09-11 07:48:36 -07:00
ζeh Matt
c9e2c9f4d2 Apply review suggestions 2021-09-11 17:25:42 +03:00
ζeh Matt
50d7b8bb1c Remove unused function get_loaded_object_entry 2021-09-11 16:50:30 +03:00
ζeh Matt
38ec042a52 Refactor object_entry_get_chunk wrapper 2021-09-11 16:50:30 +03:00
ζeh Matt
c416c7ca27 Remove unused function get_loaded_object_chunk 2021-09-11 16:50:30 +03:00
ζeh Matt
e3f39bf554 Use PascalCase for object members 2021-09-11 16:50:30 +03:00
ζeh Matt
47d1633224 Refactor Export 2021-09-11 16:50:29 +03:00
ζeh Matt
b1ba29716d Refactor import of s6 objects 2021-09-11 16:50:29 +03:00
ζeh Matt
ef6768dd33 Segment the object arrays in rct_s6_data 2021-09-11 16:50:26 +03:00
ζeh Matt
577966cc63 Merge pull request #15392 from ZehMatt/fix-off-by-one 
Fix out of bounds regression from #15391
 2021-09-10 12:34:46 -07:00
ζeh Matt
2e8d40b5e3 Fix out of bounds regression from #15391 2021-09-10 22:34:18 +03:00
Hielke Morsink
d42bc9a469 Merge pull request #15383 from Broxzier/refactor/smart-follow-cleanup 2021-09-10 20:13:23 +02:00
Michael Steenbeek
c572c21649 Merge pull request #15167 from ZehMatt/ride-id-fixes 
Convert ride_id_t to a strong type
 2021-09-10 19:01:33 +02:00
ζeh Matt
e5eb8f84cf Apply review suggestions 2021-09-10 19:36:14 +03:00
ζeh Matt
516232e0a7 Change static casts to EnumValue 2021-09-10 19:10:15 +03:00
ζeh Matt
d21ccc103b Bump up network version 2021-09-10 19:10:15 +03:00
ζeh Matt
d7e0e473c1 Apply review suggestion, cleanup 2021-09-10 19:10:14 +03:00
ζeh Matt
8a21bd01c6 Bump up scripting version 2021-09-10 19:10:14 +03:00
ζeh Matt
0cdd348428 Update replays 2021-09-10 19:10:14 +03:00
ζeh Matt
50467d4fd8 Remove unused serialiser traits 2021-09-10 19:10:14 +03:00
ζeh Matt
f8e26a3752 Fix signed/unsigned mismatch 2021-09-10 19:10:14 +03:00
ζeh Matt
120bb10fd5 Fix serialiser traits 2021-09-10 19:10:14 +03:00
ζeh Matt
18af5d4950 Use union for window association to prevent casts 2021-09-10 19:10:13 +03:00
ζeh Matt
eda3188ecf Fix rebase 2021-09-10 19:10:13 +03:00
ζeh Matt
e1e29379ba Add thought insertion overload with strong ride id type 2021-09-10 19:10:13 +03:00
ζeh Matt
078d12a207 Fix S4 importer 2021-09-10 19:10:13 +03:00