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
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
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
Tulio Leao
05cc016132
Rename Peep::mass to Mass
2020-06-08 23:07:31 -03:00
Tulio Leao
2fdf38a0a9
Rename Peep::time_to_consume to use TitleCase
2020-06-08 23:04:04 -03:00
Tulio Leao
4f9227fd83
Rename Peep::intensity to Intensity
2020-06-08 22:55:07 -03:00
Tulio Leao
f1337768f5
Rename Peep::nausea_tolerance to use TitleCase
2020-06-08 22:41:15 -03:00
Tulio Leao
f732c2f1cd
Rename Peep::window_invalidate_flags to use TitleCase
2020-06-08 22:25:54 -03:00
Tulio Leao
1c566eebcb
Rename Peep::paid_on_drink to PaidOnDrink
2020-06-08 20:23:14 -03:00
Tulio Leao
61a598edba
Rename Peep::ride_types_been_on to use TitleCase
2020-06-08 20:10:15 -03:00
Tulio Leao
958ffabf15
Rename Peep::item_extra_flags to use TitleCase
2020-06-08 20:07:44 -03:00
Tulio Leao
c2322d79c8
Merge pull request #11901 from tupaschoal/prevent-shadow-peep-5
...
Rename some Peep member variables to use TitleCase
2020-06-08 18:08:56 -03:00
Tulio Leao
ea6b3aa05a
Fix Peep watching state being based on wrong flag
2020-06-08 17:38:10 -03:00
Tulio Leao
18995664fe
Use constant to check null Peep::CurrentRide
2020-06-08 17:38:10 -03:00
Tulio Leao
1ee5653c8c
Rename Peep::photo2_ride_ref to use TitleCase
2020-06-08 17:36:35 -03:00
Tulio Leao
397c1137db
Rename Peep::photo3_ride_ref to use TitleCase
2020-06-08 17:36:35 -03:00
Tulio Leao
df87daaa6e
Rename Peep::photo4_ride_ref to use TitleCase
2020-06-08 17:36:35 -03:00
Tulio Leao
ccd76f8fc4
Rename Peep::current_ride to CurrentRide
2020-06-08 17:36:35 -03:00
Tulio Leao
c302b16386
Rename Peep::current_ride_station to use TitleCase
2020-06-08 17:36:34 -03:00
Tulio Leao
1ac3b3d2dc
Rename Peep::current_train to use TitleCase
2020-06-08 17:36:34 -03:00
Tulio Leao
335cbc900e
Rename Peep::current_car to CurrentCar
2020-06-08 17:36:34 -03:00
Tulio Leao
1376dc45c0
Rename Peep::current_seat to CurrentSeat
2020-06-08 17:36:34 -03:00
Tulio Leao
7d25480a4d
Rename Peep::time_to_sitdown to TimeToSitdown
2020-06-08 17:36:34 -03:00
Tulio Leao
267bec698f
Rename Peep::time_to_stand to TimeToStand
2020-06-08 17:36:34 -03:00