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

22174 Commits

Author SHA1 Message Date
OpenRCT2 git bot efa40b119a Merge Localisation/master into OpenRCT2/develop 2021-11-04 04:08:47 +00:00
Michael Steenbeek e878f43148
Fix #15602: Cannot relocate shops properly 2021-11-04 00:10:12 +01:00
Duncan 0389e926a0
Fix 15851: Katie Smith cheat (#15852) 
* Fix #15851. Katie Smith cheat had v. low chance of jumping

Mistake made during implementation

* Increment network

* Update changelog
 2021-11-03 17:35:52 +00:00
OpenRCT2 git bot 8b724cd998 Merge Localisation/master into OpenRCT2/develop 2021-11-03 04:08:44 +00:00
ζeh Matt 8158956f18
Fix #15819: Potential crash placing a maze design 2021-11-02 09:31:21 +01:00
Michael Steenbeek af78bbb448
Fix Tracks Manager crash on closing the tracks list 2021-11-01 18:32:55 +01:00
Michael Steenbeek 2e063e6df8
Fix #15831: Track Manager crash after clicking “Select another ride” 2021-11-01 18:32:28 +01:00
OpenRCT2 git bot 22408ee4b6 Merge Localisation/master into OpenRCT2/develop 2021-11-01 04:08:42 +00:00
Michael Steenbeek a7318b631a
Add #10614 to changelog 
[ci skip]
 2021-10-31 17:51:22 +01:00
Michael Steenbeek 7ba8c522a7
Merge pull request #15829 from adam-bloom/macos-cmake-improvements 
Auto-discovery for Homebrew prefix, pin openssl version
 2021-10-30 22:53:56 +02:00
adam-bloom 51aa9a78f3 Auto-discovery for Homebrew prefix, pin openssl version 
Co-authored-by: devnexen <devnexen@users.noreply.github.com>
 2021-10-30 11:59:26 -06:00
ζeh Matt 0e892e9d33
Merge pull request #15815 from ZehMatt/fix/error-proapgation 
Avoid overwriting gGameCommandErrorText
 2021-10-28 15:59:23 -07:00
Duncan 3f19d6f7d7
Split Peep header Guest into separate header (#15810) 
* Move guest functions and classes to guest header

* Reduce includes of Peep.h
 2021-10-28 21:38:23 +01:00
ζeh Matt 322e1203fc
Fix error message for WallPlaceAction 2021-10-28 21:26:07 +03:00
ζeh Matt 14b6894e77
Remove overwriting error message in map_is_location_in_park 2021-10-28 21:21:59 +03:00
ζeh Matt 45c4ed2679
Fix error messages for when map_is_location_owned is false 2021-10-28 21:20:42 +03:00
ζeh Matt 3016701a98
Prevent map_is_location_owned from overwriting the global error message 2021-10-28 21:15:24 +03:00
OpenRCT2 git bot 86f91585d2 Merge Localisation/master into OpenRCT2/develop 2021-10-28 04:08:32 +00:00
ζeh Matt 30750b2d01
Merge pull request #15811 from ZehMatt/fix-15809 
Fix #15809: Assign a temporary result to avoid crashes
 2021-10-27 18:52:44 -07:00
ζeh Matt c2b16cedce
Fix #15809: Assign a temporary result to avoid crashes 2021-10-28 01:20:17 +03:00
Duncan a8d2d5fd44
Staff patrol area 2 from NSF (#15600) 
* Port over changes from NSF for staff

* Fix import and export

* Fix crash on export

* Fix import issue

* Fix patrol import issue

* Remove staff id field

* Increment network version

* Actually remove all instances of staff id

* Update replays
 2021-10-27 21:19:10 +01:00
ζeh Matt 1cfa4f8a9e
Merge pull request #15637 from ZehMatt/refactor/explicit-gameactionresult 
#15636: Refactor explicit construction on GameAction::Result
 2021-10-27 10:15:25 -07:00
ζeh Matt acef8a592a
Apply review suggestion 2021-10-27 19:50:08 +03:00
Michael Steenbeek ad2a77bfa5
Fix #12981: New vehicles do not appear in vehicle type dropdown 2021-10-27 11:30:55 +02:00
Michael Steenbeek 3997210bba
Fix #15585: Clear Tool issues 2021-10-27 08:08:11 +02:00
OpenRCT2 git bot 5eeb970787 Merge Localisation/master into OpenRCT2/develop 2021-10-27 04:08:56 +00:00
Tulio Leao 3e182e5b24
Merge pull request #15624 from vijfhoek/serverlist-screencoordsxy 2021-10-27 00:20:02 -03:00
Sijmen cec8447c6f
Refactor Viewport.cpp to use ScreenRect (#15790) 2021-10-27 00:13:38 -03:00
ζeh Matt ec78ef3974
Refactor explicit constructor usage in NetworkBase 2021-10-27 04:32:08 +03:00
ζeh Matt 1aed54f106
Refactor explicit constructor usage in Peep::Place 2021-10-27 04:32:08 +03:00
ζeh Matt 3bb86ebcfa
Refactor explicit constructor usage in LandSmoothAction 2021-10-27 04:32:07 +03:00
ζeh Matt 12a200abfe
Refactor explicit constructor usage in SetCheatAction 2021-10-27 04:32:07 +03:00
ζeh Matt 3b8486ed4a
Refactor explicit constructor usage in WallPlaceAction 2021-10-27 04:32:07 +03:00
ζeh Matt 89cca5cb32
Refactor explicit constructor usage in TrackRemoveAction 2021-10-27 04:32:07 +03:00
ζeh Matt d9222ab063
Refactor explicit constructor usage in RideDemolishAction 2021-10-27 04:32:07 +03:00
ζeh Matt 72b59445ad
Refactor explicit constructor usage in RideSetPriceAction 2021-10-27 04:32:07 +03:00
ζeh Matt 5c964d7fe8
Refactor explicit constructor usage in RideEntranceExitPlaceAction 2021-10-27 04:32:06 +03:00
ζeh Matt d8a255562a
Refactor explicit constructor usage in WaterSetHeightAction 2021-10-27 04:32:06 +03:00
ζeh Matt a4e5a92c54
Refactor explicit constructor usage in WaterRaiseAction 2021-10-27 04:32:06 +03:00
ζeh Matt 84acdba0f0
Refactor explicit constructor usage in WaterLowerAction 2021-10-27 04:32:06 +03:00
ζeh Matt 2702b2641f
Refactor explicit constructor usage in ScenarioSetSettingAction 2021-10-27 04:32:06 +03:00
ζeh Matt 8e80a74daa
Refactor explicit constructor usage in WallSetColourAction 2021-10-27 04:32:06 +03:00
ζeh Matt 2c38d3b180
Refactor explicit constructor usage in RideSetVehicleAction 2021-10-27 04:32:06 +03:00
ζeh Matt adbad84cc5
Refactor explicit constructor usage in SurfaceSetStyleAction 2021-10-27 04:32:05 +03:00
ζeh Matt ab248a67df
Refactor explicit constructor usage in TrackSetBrakeSpeedAction 2021-10-27 04:32:05 +03:00
ζeh Matt 60838f563e
Refactor explicit constructor usage for TileInspector 2021-10-27 04:32:05 +03:00
ζeh Matt fc489452ab
Refactor explicit constructor usage in RideSetSettingAction 2021-10-27 04:32:05 +03:00
ζeh Matt 86a07d7f48
Refactor explicit constructor usage in StaffSetPatrolAreaAction 2021-10-27 04:32:05 +03:00
ζeh Matt 6600f813de
Refactor explicit constructor usage in StaffSetCostumeAction 2021-10-27 04:32:05 +03:00
ζeh Matt 219d49aee1
Refactor explicit constructor usage in StaffSetOrdersAction 2021-10-27 04:32:04 +03:00