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

19176 Commits

Author SHA1 Message Date
Sohil Adwani 03f016e9ef
Smart pointers (#11852) 
* Part of #11159 Added smart pointers to a few functions

* Use camelCase for variables

Co-authored-by: duncanspumpkin <duncans_pumpkin@hotmail.co.uk>
 2020-06-15 19:47:07 +01:00
Hudson Oliveira feb3fcfd6e
Remove gotos from TrackMotionForwardsGetNewTrack (#11955) 
* Remove gotos from TrackMotionForwardsGetNewTrack

* Move default case to the bottom of the switch

Co-authored-by: Michael Steenbeek <m.o.steenbeek@gmail.com>
 2020-06-15 01:25:13 +02:00
Duncan 1e5739b739
Vehicle motion update: small cleanup; work towards unifying code paths 2020-06-14 22:54:34 +02:00
Tulio Leao 112ac33a24
Merge pull request #11952 from tupaschoal/draw_string_centred_11564 
Use ScreenCoordsXY for gfx_draw_string_centred_clipped
 2020-06-14 17:42:15 -03:00
hdpoliveira a3fe90c250
Create SpriteBase::Invalidate methods (#11948) 2020-06-14 15:18:07 -03:00
Tulio Leao 13df05ce32 Part of #11564: Use ScreenCoordsXY instead of <x,y> 2020-06-14 12:51:06 -03:00
Tulio Leao 613cec3f7a Part of #11564: gfx_draw_string_centred_clipped with ScreenCoordsXY 2020-06-14 12:26:53 -03:00
Tulio Leao ce171164c9
Merge pull request #11932 from tupaschoal/draw_string_right-11569 
Use ScreenCoordsXY for gfx_draw_string_right
 2020-06-14 12:11:10 -03:00
Tulio Leao e54a3d89f2
Rename some Peep member variables to use TitleCase (#11931) 
* Rename Peep::destination_tolerance to use TitleCase

* Rename Peep::destination_y to use TitleCase

* Rename Peep::destination_x to use TitleCase

* Rename Peep::trousers_colour to use Title Case

* Rename Peep::tshirt_colour to use TitleCase

* Rename Peep::no_of_rides to use Title Case

* Rename Peep::staff_type to use TitleCase

* Rename Peep::type to use TitleCase

* Rename Peep::sprite_type to use TitleCase

* Rename Peep::sub_state to use TitleCase

* Rename Peep::state to use TitleCase

* Rename Peep::outside_of_park to use TitleCase

* Rename Peep::next_flags to use TitleCase

* Rename Peep::name to use TitleCase

* Rename Peep::NoOfRides to GuestNoOfRides

* Rename Peep::Type to AssignedPeepType

* Rename Peep::GuestNoOfRides to GuestNumRides
 2020-06-14 06:31:08 +01:00
Aaron van Geffen de045978de
Implement #11944: Remember rides sort mode (#11945) 2020-06-13 23:36:43 +02:00
Michael Steenbeek d695e1d071
Merge pull request #11942 from Gymnasiast/refactor/rtd-build-cost 
Move build costs to RTD
 2020-06-13 22:26:05 +02:00
Michael Steenbeek aff920c874
Add support for importing RCT Modified ride entrances (#11938) 2020-06-13 20:10:43 +02:00
Gymnasiast f66d103d9a
Move build costs to RTD 2020-06-13 18:48:53 +02:00
Gymnasiast b73b7e73e7
Move PriceEstimateMultiplier to ride_cost 2020-06-13 18:48:53 +02:00
Michael Steenbeek 8f29810e04
Move RideData4 to RideTypeDescriptors (#11939) 2020-06-13 11:29:00 +01:00
hdpoliveira 2dc98e6370
Remove regs use from minigolf vehicle functions (#11937) 
* Remove regs use from UpdateTrackMotionMiniGolf

* Remove regs from UpdateTrackMotionMiniGolfVehicle
 2020-06-13 07:56:35 +01:00
Michał Janiszewski a8d21610fb
Improve #4617: signs causing crashes (#11094) 2020-06-12 21:33:07 +02:00
lightray22 082dfc4bb0
Fix build on OpenBSD (#11870) 
Co-authored-by: ibara <ibara@users.noreply.github.com>
Co-authored-by: Michael Steenbeek <m.o.steenbeek@gmail.com>
 2020-06-12 16:45:22 +02:00
OpenRCT2 git bot 3530a00998 Merge Localisation/master into OpenRCT2/develop. 2020-06-12 04:02:56 +00:00
Duncan 319bab8978
Refactor fountain painting (#11891) 
* Refactor fountain painting


Co-authored-by: Tulio Leao <tupaschoal@gmail.com>
 2020-06-11 20:20:00 -03:00
Duncan b3d77dd6c9
Remove banner entry when deleting tiles with tile inspector (#11880) 2020-06-11 23:42:48 +02:00
hdpoliveira 5660a59c18
Fix #11914: Notification spam when opening a new scenario 2020-06-11 23:28:44 +02:00
Tulio Leao d6baec3f66 Reduce scope of ScreenCoordsXY variables 2020-06-11 18:26:16 -03:00
Tulio Leao 8287ef4e7a
Merge pull request #11839 from IntelOrca/plugin/vehicle-entity 
[Plugin] Add API for vehicles
 2020-06-11 17:57:54 -03:00
hdpoliveira ea22d2c8de
Vehicle update 9473 11 (#11936) 
* Part of #9473: Create Vehicle::UpdateTrackMotionForwardsGetNewTrack

Converted from vehicle_update_track_motion_forwards_get_new_track

* Part of #9473: Create Vehicle::UpdateTrackMotionBackwardsGetNewTrack

Converted from vehicle_update_track_motion_backwards_get_new_track
 2020-06-11 21:19:11 +01:00
hdpoliveira 55bb2eaec9
Change all invalidate_sprite_2(Vehicle*) to Vehicle->Invalidate() (#11935) 2020-06-11 20:42:11 +01:00
Ted John a3aed8dce1 Update vehicle powered fields 2020-06-11 17:54:41 +01:00
Ted John c5b2b2017a Add vehicle API for plugins 2020-06-11 17:54:36 +01:00
Michael Steenbeek 2743629142
Merge pull request #11716 from hdpoliveira/vehicle_update_9473_10 
Remove some of goto from vehicle_update_track_motion_mini_golf
 2020-06-11 17:31:06 +02:00
Tulio Leao 03ba7e5301
Merge pull request #11933 from AaronVanGeffen/unused-vars 
Patch unused variables
 2020-06-11 12:12:06 -03:00
Aaron van Geffen d993ec7ecf Remove Twitch source files from Xcode project. 2020-06-11 15:22:39 +02:00
Aaron van Geffen 3090e2af79 Fix compilation failure due to unused vars. 
Compilation fails due to warnings-turned-errors.
 2020-06-11 15:22:06 +02:00
Tulio Leao 183ee1e595 Part of #11569: Use ScreenCoordsXY instead of <x,y> 2020-06-11 10:11:33 -03:00
Tulio Leao fab0ea131f Part of #11569: Use gfx_draw_string_right with ScreenCoordsXY 2020-06-11 10:11:20 -03:00
Michael Steenbeek 1ea1d24f00
Use constant for 255 tile element height (#11928) 2020-06-10 23:18:26 +02:00
Tulio Leao eb154c7b48
Merge pull request #11915 from tupaschoal/prevent-shadow-peep-6 
Rename some Peep member variables to use TitleCase
 2020-06-10 14:49:21 -03:00
XplosiveLugnut f9c5633c19
Can now pop balloons and quack ducks in title screen. (#9614) 
* Can now pop balloons and quack ducks in title screen.

* Chengelog entry

* Narrow check for misc sprite down to only duck and balloon sprite.

* Update distribution/changelog.txt

Co-authored-by: Michael Steenbeek <m.o.steenbeek@gmail.com>

* Use the IsBalloon and IsDuck functions instead.

* Update src/openrct2-ui/interface/ViewportInteraction.cpp

Co-authored-by: Michael Steenbeek <m.o.steenbeek@gmail.com>

* Squash: Bring code up to date.

* Add nullptr check.

* Update src/openrct2-ui/interface/ViewportInteraction.cpp

Co-authored-by: Aaron van Geffen <aaron@aaronweb.net>

Co-authored-by: Michael Steenbeek <m.o.steenbeek@gmail.com>
Co-authored-by: Aaron van Geffen <aaron@aaronweb.net>
 2020-06-10 18:31:33 +01:00
Ted John 14899f3940
Fix #11926: Plugin Checkbox and Groupbox widgets crash the game (#11927) 2020-06-10 14:00:53 -03:00
Michael Steenbeek cdcfcbfbe8
Remove no longer relevant CMake hack 2020-06-09 18:03:17 +02:00
OpenRCT2 git bot 20a4e77b24 Merge Localisation/master into OpenRCT2/develop. 2020-06-09 04:02:49 +00:00
Tulio Leao 5d57012390 Rename Peep::var_37 to Var37 2020-06-08 23:47:45 -03:00
Tulio Leao a993ad8408 Rename Peep::energy to Energy 2020-06-08 23:34:35 -03:00
Tulio Leao 1c59cc2aae Rename Peep::energy_target to EnergyTarget 2020-06-08 23:32:22 -03:00
Tulio Leao 92fbb9fc04 Rename Peep::happiness to Happiness 2020-06-08 23:30:27 -03:00
Tulio Leao 1b7223462f Rename Peep::happiness_target to use TitleCase 2020-06-08 23:27:47 -03:00
Tulio Leao e387539802 Rename Peep::nausea to Nausea 2020-06-08 23:25:37 -03:00
Tulio Leao 71dc82e79a Rename Peep::nausea_target to NauseaTarget 2020-06-08 23:21:17 -03:00
Tulio Leao 533695cbe6 Rename Peep::hunger to Hunger 2020-06-08 23:18:12 -03:00
Tulio Leao aad80d3390 Rename Peep::thirst to Thirst 2020-06-08 23:12:38 -03:00
Tulio Leao 3dd4adeb81 Rename Peep::toilet to Toilet 2020-06-08 23:10:18 -03:00