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

14658 Commits

Author SHA1 Message Date
hdpoliveira c40dd3d3d0 Access news queues directly or with iterators 2020-05-30 13:56:10 -03:00
hdpoliveira f4778a8c01 Split gNewsItems into two 2020-05-30 13:56:10 -03:00
hdpoliveira 230162534b Create constants for sizes of NewsItem queues 2020-05-30 13:56:10 -03:00
hdpoliveira a4d010415b Encapsulate gNewsItems 2020-05-30 13:56:10 -03:00
Ted John 8f77125cdb
Fix #11298: Unable to advertise server (500): Retry with ipv4 only (#11824) 
Add new config option to allow any address to be advertised. This then
doesn't rely on the master server retrieving the server IP address via
the HTTP request which can often be IPv6 by default.
 2020-05-30 18:21:22 +02:00
Michael Steenbeek 6d13f7ba68 Apply suggestions from code review 
Co-authored-by: Aaron van Geffen <aaron@aaronweb.net>
 2020-05-30 17:10:08 +02:00
Michiel ac8dce44fd Apply suggestions from code review 
Co-authored-by: Michael Steenbeek <m.o.steenbeek@gmail.com>
 2020-05-30 17:10:08 +02:00
Michiel Bos 3fdab8e7d9 Added icon to Cheats button to indicate clearance checks are disabled 2020-05-30 17:10:08 +02:00
Michiel Bos 31e4029a22 Moved 'Open cheat menu' and 'Toggle clearance checks' to new category 2020-05-30 17:10:08 +02:00
Michiel Bos 67ffc5642b Fixed the include order in KeyboardShortcut.cpp to match with clang. 2020-05-30 17:10:08 +02:00
Michiel Bos 670b879235 Added a shortcut key for disabling/enabling clearance checks. 2020-05-30 17:10:08 +02:00
Tulio Leao 7b8257c692
Fix #11816: Text overflowing boundary box (#11830) 2020-05-30 17:07:58 +02:00
Michael Steenbeek da54f19a34
Fix compilation on Docker CI (#11826) 2020-05-30 15:23:48 +02:00
Michael Steenbeek 2bd92527fd
Merge pull request #11818 from IntelOrca/refactor/palettes 
Create new PaletteMap type to replace byte pointers
 2020-05-29 23:09:32 +02:00
Michael Steenbeek c3921d9d4c
Merge pull request #11712 from IntelOrca/plugin/ride-fields 
[Plugin] Add more ride fields to API
 2020-05-29 21:10:51 +02:00
Ted John 626178a70e Add constants for palette indexes 2020-05-28 22:37:50 +01:00
Ted John 28e4b6ba07 Add blend helper and strict param checking 2020-05-28 21:44:24 +01:00
Michael Steenbeek 6808b8b734
Fix JSON object walls with only remap colours 2 and 3 (#11821) 
This fixes the hack, allowing JSON files laid out in the described manner to actually work properly.
The objects themselves will also need to be updated, but that can be done separately.
 2020-05-28 22:03:50 +02:00
Ted John d3f7ec4844 Create new PaletteMap type to replace byte pointers 2020-05-28 20:00:23 +01:00
Duncan 97e985521e
Merge pull request #11819 from IntelOrca/refactor/game-palette 
Refactor rct_palette to GamePalette
 2020-05-28 11:41:04 +01:00
Gymnasiast 60d54a6c9b
Remove Twitch icon from g2.dat 2020-05-28 09:28:32 +02:00
Gymnasiast 9a9ab47856
Remove Twitch from the rest of the code 2020-05-28 09:28:32 +02:00
Gymnasiast aaece7a435
Remove Twitch from Options window 2020-05-28 09:28:32 +02:00
Ted John 46bb30f8a1 Refactor rct_palette to GamePalette 2020-05-27 20:52:51 +01:00
Michael Steenbeek 10209690c2
Fix documentation of `sprite exportalldat` command (#11799) 2020-05-23 18:32:41 +02:00
Ted John 82371fb003
Fix #11796: Unable to use sharedStorage (#11798) 
isUserConfig must only be true for configuration not sharedStorage
 2020-05-23 18:22:09 +02:00
Ted John a683f2250f Register missing ride classification 2020-05-23 15:28:03 +01:00
Ted John da8f21fb70 Add ride age and improve documentation 2020-05-23 15:28:03 +01:00
Ted John f4fb456c50 Add ride value to ScRide 2020-05-23 15:28:03 +01:00
Ted John a0f76ddc1b Add running cost and inspection 2020-05-23 15:28:03 +01:00
Ted John bfa96d6205 Fix price in ScRide 2020-05-23 15:28:03 +01:00
Ted John f6fbd272ec Add built_date to ScRide and add GetAge() 2020-05-23 15:28:03 +01:00
Ted John 819208f3cb Add more ride fields to plugin API 2020-05-23 15:28:03 +01:00
Gymnasiast d5e60e0e71
Create command to export images from .DAT file 2020-05-23 15:30:50 +02:00
Gymnasiast 08b0268b0f
Clean up CmdlineSprite.cpp 2020-05-23 13:02:08 +02:00
tylerleamon 51872f9741
Fix #10634: Guests are unable to use uphill paths out of toilets 
Co-authored-by: duncanspumpkin <duncans_pumpkin@hotmail.co.uk>
 2020-05-22 19:58:38 +02:00
Michael Steenbeek ffea52f24a
Merge pull request #11386 from janisozaur/fix-strlogicalcmp 
Fix strlogicalcmp
 2020-05-22 10:39:31 +02:00
Michael Steenbeek 7e7b15812d
Merge pull request #11747 from IntelOrca/plugin/small-additions 
[Plugin] Add language and split peep into guest and staff
 2020-05-20 10:24:24 +02:00
Michał Janiszewski 7f8a65c095 Make strlogicalcmp case insensitive 2020-05-20 08:35:41 +02:00
Michał Janiszewski 16d8c64cea Improve strlogicalcmp for strings of unequal lengths 
This version actually works and doesn't overrun provided buffers
 2020-05-20 08:33:25 +02:00
Sohil Adwani d2565af867
Part of #11562: gfx_draw_string_left_wrapped() overload (#11784) 2020-05-19 21:57:11 -03:00
Michael Steenbeek 6ddd1b6563
Merge pull request #11781 from Gymnasiast/cleanup/import-palette 
Merge cmdline and JSON object palette
 2020-05-19 21:50:16 +02:00
Gymnasiast de69bbd661
Guard against illegal access 2020-05-19 21:25:27 +02:00
Gymnasiast 4b25345d8d
Create GamePalette struct 2020-05-19 21:09:51 +02:00
TomasZilinek 7da9c7b234
Fix #11566 - draw_string_right_underline() overload (#11780) 
created the overload, changed all calls from the old function to the new one and deleted the old function
 2020-05-19 16:02:39 -03:00
Gymnasiast 70c4bd89f1
Remove unused struct 2020-05-19 19:42:44 +02:00
TomasZilinek a687a13185
Fix #11563 - gfx_draw_string_right_clipped() overload (#11782) 
created the overload, changed all calls from the old function to the new one and deleted the old function
 2020-05-19 13:54:07 -03:00
Gymnasiast eb25b0db33
Merge cmdline and JSON object palette 2020-05-19 15:42:58 +02:00
Ted John 03b1974912
Add plugin API for editing park messages (#11755) 2020-05-18 22:59:35 -03:00
Sohil Adwani 310ff84b23
Part of #11562: gfx_draw_string_left_wrapped() overload 
* gfx_draw_string_left_wrapped overload added


Co-authored-by: Tulio Leao <tupaschoal@gmail.com>
 2020-05-18 22:52:49 -03:00
hdpoliveira d93edf77d6
Part of #9473: Create Vehicle::KillPassengers() (#11714) 
* Part of #9473: Create Vehicle::KillPassengers()

Converted from vehicle_kill_all_passengers

Co-authored-by: Michael Steenbeek <m.o.steenbeek@gmail.com>
 2020-05-17 23:11:19 -03:00
TusharSariya 2cf95adc4b
Fix #11565: gfx_draw_string_left_clipped to use ScreenCoordsXY (#11765) 
* Issue #11565, created overload for gfx_draw_string_left_clipped

Co-authored-by: Tushar <tushar.97@hotmail.com>
Co-authored-by: Tulio Leao <tupaschoal@gmail.com>
 2020-05-17 19:30:58 -03:00
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
Ted John f5f8f5bd8e Use named flags for Peep instead of number 2020-05-15 00:24:24 +01:00
Ted John b710e417df Split peep into guest and staff and add more fields 2020-05-14 18:35:21 +01:00
Ted John 7c0da8a32d Add peep flags and destination 2020-05-14 18:34:25 +01:00
Ted John 41d41df3a5 Add ability to get current language 2020-05-14 18:34:25 +01: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
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
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
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
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