mirrors
/
OpenRCT2
mirror of https://github.com/OpenRCT2/OpenRCT2.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity
22,435 Commits 7 Branches 39 Tags 344 MiB
Commit Graph

22435 Commits

Author SHA1 Message Date
Gymnasiast 14275f3be4
Read hasShelter property from station object 2021-10-27 11:46:07 +02:00
ζeh Matt 1feaf19f89
Merge remote-tracking branch 'upstream/develop' into new-save-format 2021-10-27 04:30:41 +03:00
ζeh Matt ea3463399f
Merge pull request #15635 from ZehMatt/refactor/constructionclearance-result 
#15632: Refactor result passing on ConstructClearResult
 2021-10-26 18:29:49 -07:00
ζeh Matt bdc4393517
Cleanup MapCanConstructWithClearAt 2021-10-26 22:15:04 +03:00
Gymnasiast aac479d76d
Merge remote-tracking branch 'upstream/develop' into new-save-format 2021-10-26 20:14:01 +02:00
Michael Steenbeek a1b70b59d6
Fix #15177: Crash in lightfx_add_lights_magic_vehicle() 2021-10-26 20:10:03 +02:00
Michael Steenbeek dd007c836f
Fix #15579: Crash in track_block_get_next() 2021-10-26 18:05:13 +00:00
OpenRCT2 git bot 2146abb17f Merge Localisation/master into OpenRCT2/develop 2021-10-26 04:08:51 +00:00
Michael Steenbeek b1538d434a
Merge pull request #15623 from Gymnasiast/fix/14482 
Fix #14482: Rides with Crooked House hack sometimes misbehave
 2021-10-24 21:13:45 +02:00
OpenRCT2 git bot 72439c28d2 Merge Localisation/master into OpenRCT2/develop 2021-10-23 04:08:27 +00:00
Gymnasiast 9e0fac9169
Bump network version 2021-10-22 16:17:40 +02:00
Gymnasiast 9b6b86c855
Make convertFlat parameter explicit 2021-10-22 16:16:50 +02:00
Gymnasiast 59e73f9cfb
Add additional explanation + fix for flat ride vehicles on track 2021-10-22 16:15:21 +02:00
Gymnasiast afb49dfe38
Also fix vehicle track refs for good measure 2021-10-22 16:15:21 +02:00
Gymnasiast 815d09a431
Fix #14482: Rides with Crooked House hack sometimes misbehave 2021-10-22 16:15:21 +02:00
Hielke Morsink a4ed1cb6ce
Update feature requests link to point to Discussions 2021-10-22 12:59:42 +00:00
ζeh Matt 31239e3941
Refactor result passing on ConstructClearResult 2021-10-21 19:26:17 +03:00
ζeh Matt 5199325209
Merge remote-tracking branch 'upstream/develop' into new-save-format 2021-10-21 19:05:17 +03:00
Michael Steenbeek 4205b3569b
Merge pull request #15619 from ZehMatt/refactor/construction-clearnace 
Refactor out construction clearance into a new compilation unit
 2021-10-21 16:55:21 +02:00
ζeh Matt dd2a140d1f
Apply review suggestions 2021-10-21 16:44:56 +03:00
OpenRCT2 git bot 14c5f13b18 Merge Localisation/master into OpenRCT2/develop 2021-10-21 04:08:57 +00:00
Duncan e13307a28d
Small cleanup of variables (#13655) 
Co-authored-by: Gymnasiast <m.o.steenbeek@gmail.com>
 2021-10-20 23:51:06 -03:00
Sijmen ebedf83176
Format ServerList.cpp (#15625) 2021-10-20 21:26:01 -03:00
Steve Blythe b15dc66acb
Part of #12098: Use ScreenRect in gfx_filter_rect() (#15603) 2021-10-20 19:43:32 -03:00
Michael Steenbeek 977833cf8f
Remove resolved TODO 2021-10-20 21:37:01 +02:00
ζeh Matt a40f6a8444
Include required headers 2021-10-20 22:21:54 +03:00
ζeh Matt 7a30169c28
Refactor out construction clearance into a new compilation unit 2021-10-20 22:21:54 +03:00
ζeh Matt 3142ed7058
Merge remote-tracking branch 'upstream/develop' into new-save-format 2021-10-20 20:47:31 +03:00
ζeh Matt 60422960a3
Merge pull request #15616 from ZehMatt/fix-15006 
Fix #15006: Prevent allocating empty texture atlases
 2021-10-20 10:46:57 -07:00
ζeh Matt ea0b8840ac
Merge pull request #15610 from ZehMatt/refactor/stringvariant 
Replace StringVariant with std::variant
 2021-10-20 10:46:42 -07:00
Michael Steenbeek 62a9096079
Fix #15466: Crash when opening dropdown with 0 rows 2021-10-20 18:50:21 +02:00
Michael Steenbeek b762cb26ed
Turn some guest functions into methods 2021-10-20 18:33:14 +02:00
ζeh Matt 7bb8a7b838
Merge remote-tracking branch 'upstream/develop' into new-save-format 2021-10-20 19:22:12 +03:00
ζeh Matt 428eed469a
Merge pull request #15611 from ZehMatt/backport/imagetable 
NSF Backport ImageTable changes
 2021-10-20 09:19:32 -07:00
ζeh Matt 6a219b2481
Fix #15006: Prevent allocating empty texture atlases 2021-10-20 19:02:15 +03:00
Michael Steenbeek 578d8ce247
Fix #15612: Crash in WallCheckObstruction() 2021-10-20 14:15:35 +00:00
ζeh Matt 6f28f3e516
Backport ImageTable changes 
Co-authored-by: Ted John <ted@brambles.org>
 2021-10-20 16:50:38 +03:00
ζeh Matt 3325898e25
Apply review suggestions 2021-10-20 16:37:32 +03:00
ζeh Matt 4d72c29ca3
Specify underlying type for rct_string_id 2021-10-20 16:35:58 +03:00
ζeh Matt 5bf3513156
Default initialize ErrorTitle and ErrorMessage with STR_NONE 2021-10-20 16:35:58 +03:00
ζeh Matt 7fc49fca39
Replace StringVariant with std::variant 2021-10-20 16:35:58 +03:00
ζeh Matt a98caef48a
Merge remote-tracking branch 'upstream/develop' into new-save-format 2021-10-20 16:35:05 +03:00
ζeh Matt 27939c2417
Merge pull request #15587 from ZehMatt/refactor/trackdesignaction-result 
Refactor result passing of TrackDesignAction
 2021-10-20 06:34:23 -07:00
seanmajorpayne f6cb144f8c
Fix #15322: Circus Music is Not Playing (Full Fix) 2021-10-20 13:11:06 +00:00
ζeh Matt 8e06d84a09
Refactor result passing of TrackDesignAction 2021-10-20 16:08:21 +03:00
ζeh Matt e06f9c3ee7
Refactor result passing of TrackPlaceAction 2021-10-20 14:15:24 +02:00
ζeh Matt 89bbe47211
Merge remote-tracking branch 'upstream/develop' into new-save-format 2021-10-20 00:09:17 +03:00
ζeh Matt 2d78a5efc3
Move GameActionResult into its own unit (#15588) 2021-10-19 17:50:24 -03:00
Hielke Morsink 64d8b1bd69
Fix mapgen clang-formatting 2021-10-19 22:27:41 +02:00
Hielke Morsink 7e2e6e2b2f
Merge branch 'develop' into new-save-format 2021-10-19 22:26:08 +02:00