mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-29 01:35:06 +01:00
Code Issues Releases Wiki Activity
18,941 Commits 8 Branches 59 Tags
6808b8b73456f9916ceda04a72a18b693f3bd544
Commit Graph

18941 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Duncan
97e985521e Merge pull request #11819 from IntelOrca/refactor/game-palette 
Refactor rct_palette to GamePalette
 2020-05-28 11:41:04 +01:00
Michael Steenbeek
b7606d52fa Merge pull request #11820 from Gymnasiast/remove/twitch-2 
Remove (almost) non-functional Twitch integration
 2020-05-28 10:27:39 +02:00
Gymnasiast
0f76ae8005 Add Twitch removal to changelog 2020-05-28 09:30:32 +02: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
Michael Steenbeek
3859689595 Merge pull request #11797 from Gymnasiast/feature/extract-from-dat 
Create command to export images from .DAT file
 2020-05-23 17:47:09 +02: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
51ebcac432 Add #11386 to changelog 2020-05-22 10:40:43 +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
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