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

24622 Commits

Author SHA1 Message Date
Michael Steenbeek bd84d626c9
Clean up PaintAddImageAsChildRotated() (#19394) 2023-02-14 08:13:56 +00:00
OpenRCT2 git bot 4f00fbcea2 Merge Localisation/master into OpenRCT2/develop 2023-02-14 04:02:18 +00:00
Gymnasiast e585f1a633
Base shop/facility bounding box on actual height 2023-02-14 01:05:13 +01:00
Gymnasiast 23a5044509
Allow shops and stalls to set their own clearances 2023-02-14 00:52:21 +01:00
Michael Steenbeek 70af1c6c0d
Clean up PaintAddImageAsParent() calls (#19392) 2023-02-13 22:07:39 +00:00
kyphii dfb2c3fa60
Fix #17996 - Finances window not cleared when starting some .park scenarios (#19368) 
* Clear Finances Graph on Scenario Load

* Update changelog

---------

Co-authored-by: Trevor Finney <8711258+finneyt@users.noreply.github.com>
 2023-02-13 21:30:47 +00:00
Michael Steenbeek 3814d6b3af
Add some additional RCT1 vehicle IDs (#19389) 2023-02-13 20:38:03 +00:00
Matthias Moninger 7b61c6352a
Desnake some stuff, small string passing cleanup (#19388) 
* Rename scenario_index_entry to ScenarioIndexEntry

* Desnake members of ScenarioIndexEntry

* Pass const u8string& instead of utf8 pointer
 2023-02-13 20:30:16 +00:00
Duncan d8c09e5214
Merge pull request #19390 from Gymnasiast/refactor/p-a-i-a-parent-rotated 
Clean up PaintAddImageAsParentRotated() function and calls
 2023-02-13 20:29:56 +00:00
Gymnasiast 38b057a0ba
Use BoundBoxXYZ version of PaintAddImageAsParentRotated() 2023-02-13 20:51:42 +01:00
Gymnasiast 04f2479c34
Create PaintAddImageAsParentRotated() function that takes a BoundBoxXYZ 2023-02-13 19:59:30 +01:00
Silent 0383875692
Fix an assertion error in ResearchNextDesign, simplify code 2023-02-13 12:30:24 +01:00
spacek531 df0edc92d0
Vehicle/rename update flags (#19363) 
* rename VEHICLE_UPDATE_FLAG_ON_LIFT_HILL

* rename VEHICLE_UPDATE_FLAG_COLLISION_DISABLED

* rename VEHICLE_UPDATE_FLAG_WAIT_ON_ADJACENT

* rename VEHICLE_UPDATE_FLAG_REVERSING_SHUTTLE

* rename VEHICLE_UPDATE_FLAG_READY_DEPART

* rename VEHICLE_UPDATE_FLAG_TESTING

* rename VEHICLE_UPDATE_FLAG_6

* rename VEHICLE_UPDATE_FLAG_ZERO_VELOCITY

* rename VEHICLE_UPDATE_FLAG_BROKEN_CAR

* rename VEHICLE_UPDATE_FLAG_BROKEN_TRAIN

* rename VEHICLE_UPDATE_FLAG_ON_BRAKE_FOR_DROP

* rename VEHICLE_UPDATE_FLAG_USE_INVERTED_SPRITES

* rename VEHICLE_UPDATE_FLAG_12

* rename VEHICLE_UPDATE_FLAG_ROTATION_OFF_WILD_MOUSE

* rename VEHICLE_UPDATE_FLAG_SINGLE_CAR_POSITION

* rename VEHICLE_UPDATE_FLAG_CRASHED

* name flag 12 to Reverse Incline Completed Lap

* name flag 6 to Currently Colliding

* fix formatting

* rename has/clear/set update flag

* fix formatting again

* move to namespace constexpr

* fix formatting

* the one that got away
 2023-02-12 22:32:16 +00:00
Michael Steenbeek 3912381502
Implement "no platforms" for Junior RC (#19379) 2023-02-12 21:33:24 +00:00
Michael Steenbeek 07d198f084
Close #12466: Add flag to use RCT1 interest (#19377) 
* Close #12466: Add flag to use RCT1 interest

* Bump network version
 2023-02-12 21:23:05 +00:00
Michael Steenbeek bc20c33568
Add command to combine CSG1i and CSG1 (#19378) 2023-02-12 21:13:46 +00:00
Duncan d811c9a9ba
Add Object Entry Manager (#19332) 
* Add object entry manager

Port over wall and banner

* Port over small scenery to ObjectEntryManager

Clang format files

Actually make things safe

Fix build
 2023-02-12 20:43:11 +00:00
Silent 7fb21721a7
Fix a division by zero in TitleScreen::TitleInitialise (#19380) 
This occurs when there are no installed sequences
and random_title_sequence is enabled in the config.
 2023-02-12 18:59:28 +00:00
OpenRCT2 git bot 757be34b5e Merge Localisation/master into OpenRCT2/develop 2023-02-11 04:01:55 +00:00
spacek531 1dfbb5f124
Widen Vehicle::update_flags to 32 bits (#19340) 
* Expand update_flags to uint32

* move IsCrashedVehicle to update_flags

* rename update_flags to Flags

* Update replays

---------

Co-authored-by: duncanspumpkin <duncans_pumpkin@hotmail.co.uk>
 2023-02-10 21:46:06 +00:00
eaeiv 96bfa633fe
Widens TotalRideValue to fix overflow reported in #19292 (#19326) 
* Widens TotalRideValue to 64 bits

* Adds name to contributors file

* Adds totalRideValue overflow fix to changelog
 2023-02-09 21:51:03 +00:00
Josh Trzebiatowski 4591ad2f4e
scenery filtering improvements 2023-02-08 23:54:58 +01:00
OpenRCT2 git bot 36b6e9a011 Merge Localisation/master into OpenRCT2/develop 2023-02-06 04:01:59 +00:00
Matthias Moninger ece0ee42d5
Rename snake functions in Station.cpp (#19316) 2023-02-05 20:48:35 +00:00
Matthias Moninger ccc234fe8c
Merge pull request #19315 from ZehMatt/ride-cleanup 
Cleanup code around Vehicle/Ride
 2023-02-05 19:39:50 +02:00
ζeh Matt d492cfc6d9
Make clang-format happy 2023-02-05 18:07:04 +02:00
ζeh Matt bf9efc7f84
Rename some variables 2023-02-05 17:52:47 +02:00
ζeh Matt a2a06d6dde
Return const RideObjectEntry*, refactor uses and fix related access 2023-02-05 17:36:37 +02:00
ζeh Matt 76b94a150c
Cleanup UpdateMaxVehicles 2023-02-05 17:07:09 +02:00
ζeh Matt a509efd0ab
Cleanup VehicleCreateCar 2023-02-05 17:01:21 +02:00
ζeh Matt 6b814ddc9b
Cleanup use of GetRideTypeDescriptor 2023-02-05 16:40:58 +02:00
ζeh Matt 1a83702b2c
De-snake more functions 2023-02-05 16:32:18 +02:00
ζeh Matt 59a0def818
Rename some functions and pass Ride instance instead of ride id 2023-02-05 16:20:51 +02:00
OpenRCT2 git bot 90b1e7c29f Merge Localisation/master into OpenRCT2/develop 2023-01-30 04:02:08 +00:00
Hielke Morsink 51dccb4096
Remove unused global 2023-01-29 20:51:26 +00:00
Matthias Moninger 62a96cc251
Fix and refactor banner fixing (#19288) 2023-01-28 22:43:59 +00:00
Hielke Morsink 566c1f21dd
Merge pull request #17288 from guljam/clear-shortcut-order 
Reorganise the order of shortcut keys in the Shortcut Keys window
 2023-01-28 17:31:58 +01:00
Matthias Moninger 5994fe6be6
Merge pull request #19284 from ZehMatt/entityId 
Refactor sprite_index to entityId for entities
 2023-01-28 18:13:04 +02:00
Hielke Morsink 192867d32e
Add changelog entry 2023-01-28 17:01:55 +01:00
Hielke Morsink 5ada16723b
Clean up shortcut bindings and unused constructors 2023-01-28 15:43:03 +01:00
Duncan 24581e781f
Move misc ObjectEntries into Object folder (#19281) 
* Move water entry

* Move FootpathEntry

* Move EntranceEntry

* Move SceneryGroupEntry
 2023-01-27 19:44:58 +00:00
ζeh Matt 2f8e208a9d
Refactor sprite_index to Id 2023-01-27 19:21:57 +02:00
ζeh Matt 17ce2d759f
Rename Id to Id to PeepId to avoid conflicts with entity id 2023-01-27 19:11:04 +02:00
mdbckrtn b1b056ec52
Fix #18839: New staff members now picked up correctly (#18956) 
* Fix #18839: New staff members now picked up correctly

When "Automatically place staff" is disabled, new staff members were not automatically placed into the "picked" state as is the case with vanilla RCT. This change ensures that new staff members are automatically placed into the picker and that, in scenarios where multiple new staff members are queued up without having first placed one, the most recently created staff member will be the actively picked up peep (also the case with vanilla).

* Fix #18839: Address networking issues

* Fix #18839: Add else to pickup action intent.
 2023-01-27 08:20:59 +00:00
Josh Trzebiatowski 258b569deb
Allow filtering in Scenery window (#19272) 
* WIP: scenery searching

* refactor snake case

* actually start filtering scenery

* prepare for merge from develop

* use ObjectManager to get scenery info

* clear selected scenery when it is filtered out

* Clear tool when no scenery is selected

* updating changelog

* fix clang formatting issues
 2023-01-26 21:40:02 +00:00
Duncan 85b72c766e
Spin off Object Type into standalone header (#19278) 
* Split off object type into standalone header

* Include missing header

* Rename to ObjectTypes.h
 2023-01-26 21:39:20 +00:00
Duncan ead13c44b8
Split off LargeSceneryEntry (#19277) 2023-01-26 18:44:42 +00:00
OpenRCT2 git bot 474de1e2dc Merge Localisation/master into OpenRCT2/develop 2023-01-26 04:01:49 +00:00
guljam 3fc029fc34
custom order for default shortcut keys 2023-01-26 00:02:20 +01:00
Michael Steenbeek bb7fdc0e28
Hide primary/secondary remap button on broken large scenery (#17045) 2023-01-25 22:21:05 +00:00