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

18906 Commits

Author SHA1 Message Date
TomasZilinek 4c88630070
Fix #11567 - create draw_string_centred_underline() overload (#11771) 
Created the overload and deleted the old function (there were no calls)
 2020-05-17 17:10:36 -03:00
TomasZilinek 7582ed849a
Fix #11568 - create draw_string_left_underline() overload (#11770) 
* Fix #11568 - create draw_string_left_underline() overload

created the overload, changed all calls from the old function to the new (just 1 call) and deleted the old function
 2020-05-17 16:18:15 -03:00
TomasZilinek 277080de74
Fix #11570 - create gfx_draw_string_centered() overload (#11760) 
* Fix #11570 - create gfx_draw_string_centered() overload

I created the overload, updated all calls from the old function to the new and deleted the old one
 2020-05-17 15:29:56 -03:00
Tulio Leao e87343f9c6
Rename MoneyEffect member variables to prevent shadowing (#11748) 2020-05-16 17:04:31 -03:00
Ted John da0ef7d3a4
Fix #11753: Listview with header does not display last item in the list (#11754) 2020-05-15 22:05:00 -03:00
Tulio Leao b7b5a26a57
Rename ServerList member variables to prevent shadowing 2020-05-15 12:06:41 +02:00
Michael Steenbeek c88bb9e2bd
Merge pull request #11750 from tupaschoal/prevent-shadow-peep 
Renames some Peep member variables to prevent shadowing
 2020-05-14 11:03:56 +02:00
Tulio Leao c17aa095d5 Rename Peep::surrounding_thought_timeout > SurroundingsThoughtTimeout 2020-05-13 23:28:16 -03:00
Tulio Leao 32c8e5614f Rename Peep::angriness to Angriness 2020-05-13 23:25:09 -03:00
Tulio Leao 589a7a48be Rename Peep::time_lost to TimeLost 2020-05-13 23:22:08 -03:00
Tulio Leao a216cb9930 Rename Peep::days_in_queue to DaysInQueue 2020-05-13 23:19:41 -03:00
Tulio Leao 128c1993c1 Rename Peep::balloon_colour to BalloonColour 2020-05-13 23:16:43 -03:00
Tulio Leao 6c57f33dc9 Rename Peep::umbrella_colour to UmbrellaColour 2020-05-13 23:14:45 -03:00
Tulio Leao 222f8df6cb Rename Peep::hat_colour to HatColour 2020-05-13 23:11:28 -03:00
Tulio Leao 3b632fcf95 Rename Peep::favourite_ride to FavouriteRide 2020-05-13 23:06:40 -03:00
Tulio Leao 7a6de648fe Rename Peep::favourite_ride_rating to FavouriteRideRating 2020-05-13 23:03:58 -03:00
Tulio Leao 14e0cc5e4a Rename Peep::item_standard_flags to ItemStandardFlags 2020-05-13 23:01:03 -03:00
Michael Steenbeek 620fb5e5c4
Migrate many set_format_arg calls to Formatter (#11744) 2020-05-13 21:29:39 -03:00
Michael Steenbeek f0bd05cf6d
Part of #11158: Remove more C-style casts (#11743) 2020-05-13 21:22:50 -03:00
Michael Steenbeek 32609791de
Merge pull request #11719 from Gymnasiast/random-cleanup 
Convert sprite_move to method
 2020-05-13 11:52:18 +02:00
Michael Steenbeek 511a300251
Some cleanup in Vehicle.cpp (#11742) 2020-05-13 11:51:38 +02:00
Gymnasiast b5b563c2a8
Apply review requests 2020-05-13 10:53:30 +02:00
Gymnasiast ae194192d6
Clean up calls to MoveTo 2020-05-13 10:47:33 +02:00
Gymnasiast 11472f909d
Convert sprite_move to method 2020-05-13 10:47:32 +02:00
Duncan f04f62305d
Merge pull request #11718 from MegaMech/patch-1 
Added check to prevent overflow assertion error
 2020-05-13 07:58:02 +01:00
Ted John 0d0349fc09
Allow plugins to update dropdown items (#11735) 2020-05-12 21:10:07 -03:00
Michael Steenbeek 666d39cee5
Fix log_warning statement 2020-05-13 00:37:44 +02:00
MegaMech 1f2eec13dd
Added check to prevent overflow assertion error 2020-05-13 00:35:09 +02:00
Michael Steenbeek 1b242d825c
Fix Text Input window colours (#11736) 
Text Input uses one colour, specifically the body colour of the calling window. This was previously handles by a modified window shim, but https://github.com/OpenRCT2/OpenRCT2/pull/11653 changed this and this window now uses the standard window shim. This is why it now needs to change the colour assignment.
 2020-05-13 00:31:24 +02:00
Michael Steenbeek 70f3b9cd8e
Merge pull request #11732 from IntelOrca/fix/11730-11731 
Fix #11730, 11731: invalid read / write in plugin code
 2020-05-12 22:56:13 +02:00
Ted John b3c4dd4844 Fix invalidation of list view widget 2020-05-12 21:03:21 +01:00
Ted John 86fa2f3714 Fix #11730: invalid write in CustomListView::SortItems 2020-05-12 20:57:26 +01:00
Ted John c4502df947 Fix #11731: invalid read in ScWindow::x_get 2020-05-12 18:53:37 +01:00
Duncan 53b627432d
Merge pull request #11596 from AaronVanGeffen/cmake/duktape 
Fix #11576: Add duktapeConfig.cmake
 2020-05-12 16:45:59 +01:00
Michael Steenbeek e9fc50d435
Remove NEW_BLOCK_BRAKES define (#11727) 
This define was never enabled, because this "new block brake" behaviour (i.e. not braking at all if the brake was open) was too different from the old behaviour to be useful.
Its intended purpose will be handled by adding actual speed settings on block brakes in the future.

This commit removes the define, and also removes the second parameter to apply_non_stop_block_brake(), which is now always true.
 2020-05-12 16:29:15 +02:00
Aaron van Geffen 6edf9b03e0 Add duktapeConfig.cmake to ease configuration. 
Used for reference:
https://github.com/microsoft/vcpkg/blob/master/ports/duktape/duktapeConfig.cmake.in
 2020-05-12 15:13:14 +02:00
stalefishies 9c26c9776b
Fix plugin dropdown widget items not appearing (#11729) 
Commit e182791 (mistakenly?) removed the code to populate the custom
dropdown widget's items from the list of strings passed in from the
plugin. This replaces that code.
 2020-05-12 08:21:43 -03:00
OpenRCT2 git bot 6e61d392aa Merge Localisation/master into OpenRCT2/develop. 2020-05-12 04:01:53 +00:00
Michael Steenbeek 451af76fb6
Remove nonfunctional "guest is lost" notification (#11722) 2020-05-11 21:31:02 +02:00
Duncan 79dda7260a
Fix #11695. Mechanics walking to 0,0 on entrance only (#11704) 
Mistake made when refactoring that meant that null locations were converted into tile 0, 0. I've fixed the general case but it is preferred to try avoid using null states for coordinates if at all possible.
 2020-05-11 20:28:40 +02:00
Michael Steenbeek 89011b105f
Merge pull request #11724 from Gymnasiast/refactor/shop-item 
Refactor shop items
 2020-05-11 20:10:34 +02:00
Gymnasiast b46437ccde
Make common price functions take const 2020-05-11 19:22:25 +02:00
Gymnasiast af1180a484
Make ShopItemDescriptor::HasFlag take const 2020-05-11 19:21:25 +02:00
Gymnasiast 15b5d97795
Refactor shop items 2020-05-11 19:16:23 +02:00
Michael Steenbeek d7637cd70f
Replace many C-style casts (#11720) 2020-05-11 14:32:56 +02:00
Michael Steenbeek a261b4ce33
Remove commented out code (#11721) 2020-05-11 13:54:15 +02:00
OpenRCT2 git bot 0f35fae148 Merge Localisation/master into OpenRCT2/develop. 2020-05-11 04:01:53 +00:00
relic-automaton 3e39e2d0db
[Plugin] Add a script hook for ride ratings calculation (#11698) 
The hook is called after ride rating calculation is complete and allows
scripts to override the ratings.
 2020-05-10 23:26:10 -03:00
Ted John 35e039c65d
Call tick and day plugin hook at the end of the update routine (#11713) 2020-05-10 23:24:15 -03:00
stalefishies 8aaf8d0156
Fix error on windows due to upkeep narrowing (#11711) 
Running msbuild openrct2.proj /t:build /p:platform=x64 gave warning
C4309, which is to do with narrowing on a type conversion. This replaces
static_cast<money16>(0xFFFF) with MONEY16_UNDEFINED (which is
static_cast<money16>(static_cast<uint16_t>(0xFFFF)) ).
 2020-05-10 19:58:01 -03:00