1
0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-24 07:14:31 +01:00
Commit Graph

19688 Commits

Author SHA1 Message Date
Michael Steenbeek
68ce06e833 Refactor objective handling in Scenario Editor
This moves some knowledge out of the window and into the main code and also cleans up the window a bit.

This also allows setting the "x guests by the end of year y" goal for no money scenarios, which was not the case previously.
2020-08-12 22:10:47 +02:00
TELK
ea5aebe08c Update telk5093's name (#12660) 2020-08-12 19:01:46 +02:00
ζeh Matt
c1076658fc Merge pull request #12658 from ZehMatt/fix-network-hang
Fix freezes on incomplete packet transmission
2020-08-12 19:00:27 +02:00
Matt
08af1e9be6 Increase network buffer to maximum packet size of 64 KiB 2020-08-12 18:36:12 +02:00
Michael Steenbeek
d1b193c06d Fix #11968: Maze height is higher than it should be 2020-08-12 18:33:15 +02:00
Matt
ebc2be4cd0 Fix freezes on incomplete packet transmission 2020-08-12 18:11:09 +02:00
ζeh Matt
e464c9e522 Invert the condition (#12645) 2020-08-11 19:29:18 +01:00
Michael Steenbeek
2d56c8d2de Merge pull request #12636 from Gymnasiast/refactor/to-member-function
Use a 16-bit integer for track type in more places
2020-08-11 17:53:20 +02:00
ζeh Matt
ae25af291b Merge pull request #12631 from ZehMatt/12474-part1
Add more guards in network code
2020-08-11 17:25:22 +02:00
Matt
2a9796f2cc Add more guards in network code 2020-08-11 15:56:09 +02:00
Tulio Leao
2e4edf6f5d Merge pull request #12638 from quale/fix-debug-window
Fix Z coordinate and spillover in guest debug tab
2020-08-11 07:53:19 -03:00
OpenRCT2 git bot
75397c72a1 Merge Localisation/master into OpenRCT2/develop. 2020-08-11 04:04:02 +00:00
Jonathan van Tuijl
4117965a4a Fix Z coordinate in guest debug tab 2020-08-11 03:37:34 +02:00
Jonathan van Tuijl
dcdc782361 Increase minimum window size so pathfind history doesn’t spill out 2020-08-11 03:35:24 +02:00
Gymnasiast
89f04c4fb3 Fix names of two track type functions 2020-08-10 23:48:18 +02:00
Gymnasiast
6802011f7d Use a 16-bit integer for track type in more places 2020-08-10 21:34:10 +02:00
Gymnasiast
9d24655056 Convert track_element_is_block_start() to member function 2020-08-10 21:15:48 +02:00
Michael Steenbeek
be0123decb Fix #12611: Bad check for pay-per-ride ability 2020-08-10 18:56:06 +02:00
Michael Steenbeek
2bd8f21b2c Upgrade objects to v1.0.16
This fixes the descriptions for the sand surfaces and also fixes a few Dutch WW/TT translations.
2020-08-10 15:40:22 +02:00
Thomas Kluyver
6b79111261 Add releases in appdata XML file 2020-08-10 15:14:35 +02:00
ζeh Matt
cb38d28b62 Fix #12621: Missing argument for localisation 2020-08-10 14:58:39 +02:00
Michał Janiszewski
6f8ae294ae Fix launchpad builds (#12575)
```
/<<PKGBUILDDIR>>/src/openrct2-ui/interface/ViewportInteraction.cpp: In function ‘InteractionInfo viewport_interaction_get_item_left(const ScreenCoordsXY&)’:
/<<PKGBUILDDIR>>/src/openrct2-ui/interface/ViewportInteraction.cpp:85:29: error: potential null pointer dereference [-Werror=null-dereference]
   85 |             switch (sprite->sprite_identifier)
      |                     ~~~~~~~~^~~~~~~~~~~~~~~~~
```
2020-08-09 07:27:26 +01:00
Michael Lu
7cd6e72edd Refactor TEMPERATURE_FORMAT to use strong enum (#12610)
* Refactor TEMPERATURE_FORMAT to use strong enum

* Rename TEMPERATURE_FORMAT to TemperatureFormat

* Rename TemperatureFormat to TempueratureUnit
2020-08-09 07:26:46 +01:00
Arran Ireland
89e4714198 Close #12331: Use CoordsXY in track_remove_station_element (#12609)
* Update track_remove_station_element signature

Part of #12331: This commit will update the
signature of track_remove_station_element and
its callers, to use CoordsXYZD.

* Fix track_remove_station_element local vars

Part of #12331: This commit will ensure that
references to the previous arguments in
track_remove_station_element will now use the new
CoordsXYZD argument.

* Refactor remove in track_remove_station_element

Part of #12331: This commit refactors the removeX/Y
to use CoordsXY.

* Refactor station0 in track_remove_station_element

Part of #12331: This commit will refactor stationX/Y0
to use CoordsXY.

* Close #12331 track_remove_station_element refactor

This commit refactors stationX/Y1 to use CoordsXY,
and fixes the smallZ vs bigZ problem in callers of
track_remove_station_element. These are the final
changes for this issue.

* Added operator for CoordsXYZD minus CoordsXY.

This commit adds a missing operator for subtracting
a CoordsXY from a CoordsXYZD. This was needed for
refactoring Track.cpp

* Refactor track_remove_station_element Coord use

This commit utilises the overloaded operators for
Coords and ensures that they are used so that the
function implementation is more readable.

* Close #12331 track_remove_station_element refactor

This commit also fixes a bug in which a small Z
value (the Height of a RideStation) was being
updated with a big Z value without scaling. It
adds a few extra refactors in calls of the
track_remove_station_element function, and
changes the contributors to add ion232.
2020-08-09 07:25:44 +01:00
Arran Ireland
4de58e1fd4 Close #12440: Refactor VEHICLE_STATUS to use strong enum (#12606)
* Close #12440: Refactor VEHICLE_STATUS to use strong enum

* Fix code formatting for VEHICLE_STATUS refactoring

* Refactor VehicleStatus enum to be inside Vehicle

This commit moves VehicleStatus inside Vehicle,
renamed as Status.
2020-08-09 06:24:25 +01:00
Tom Parsons
c4ae579a84 Feature #11817: Show authors field in object selection (#12591)
* Feature #11817: Show authors field in object selection

- authors field in JSON shows as last line in bottom right on object selection
- authors field added to Object class
- ObjectFileIndex version bump as authors is serialised

* fix sign comparison warning

* Start object selection corner text higher to avoid overlap

* Use references to reduce unneccessary copies

* make GetAuthors const

* Clip drawing of authors string so it doesn't cross widgets

At max length the leftmost aligns exactly with description left

* Add a changelog message

* make SetAuthors use an rvalue reference

* remove unnecessary nullptr check
2020-08-09 06:23:28 +01:00
ζeh Matt
5f68927e88 Merge pull request #12615 from ZehMatt/fix-11085
Fix #11085: Handle player list before game actions during map load
2020-08-08 21:26:40 +02:00
Matt
059e6269be Update changelog.txt 2020-08-08 20:48:41 +02:00
Matt
c16bdb5c69 Fix #11085: Handle player list before game actions during map load 2020-08-08 20:47:34 +02:00
Arran Ireland
1702c90c8e Merge pull request #12605 from ion232/refactor-vehicle-type
closes #12439: Refactor VEHICLE_TYPE to use strong enum
2020-08-08 18:41:04 +01:00
Sidney
933570fd62 Close #12442: Refactor SCENARIO_SOURCE to use strong enum (#12608) 2020-08-08 09:38:43 -03:00
Łukasz Pękalski
399e0abe2e Close #12497: Remove extra SPRITE_INDEX_NULL checks (#12601) 2020-08-08 09:12:52 -03:00
Sidney
93ef28927f Close #12447: Refactor WEATHER_EFFECT to use strong enum (#12548) 2020-08-07 17:10:59 +01:00
ceeac
db010cd971 Fix compile error when compiling with clang-10 (#12599)
<cstddef> is required for size_t (used in CircularBuffer.h)
2020-08-06 16:24:50 +01:00
Tulio Leao
be9dca6945 Close #12416: Refactor CURRENCY_AFFIX to use strong enum (#12589)
* Close #12416: Refactor CURRENCY_AFFIX to use strong enum

* Add static assert to check config enum type

Co-authored-by: Matt Thomson <matt-thomson@users.noreply.github.com>
2020-08-05 20:26:18 -03:00
Tulio Leao
58fc1dd075 Add changelog for #10751 2020-08-05 20:19:33 -03:00
Matt Thomson
788bc1581c Add static assert to check config enum type 2020-08-05 20:48:02 +01:00
ζeh Matt
1f0a5587a0 Merge pull request #12593 from quale/fix10751
Fix #10751: Save mazes in their entirety
2020-08-05 19:18:17 +02:00
quale
96475e2eb0 Added myself to contributors.md 2020-08-05 18:08:34 +02:00
quale
9ef3eec47d Fix #10751: Save mazes in their entirety 2020-08-05 18:08:34 +02:00
ζeh Matt
765eada18e Merge pull request #12526 from ZehMatt/win32-cleanup
Win32 and namespace cleanup
2020-08-05 17:18:50 +02:00
Duncan
3533d1734f Merge pull request #12571 from ZehMatt/network/update-2
Refactor more network code
2020-08-05 15:55:24 +01:00
Matt
97d14feaa6 Rebase fixes 2020-08-05 16:35:40 +02:00
Matt
0dc43d66e4 Remove the use of INTERFACE macro and macro its self 2020-08-05 16:30:44 +02:00
Matt
83355e35cc Move IStream, MemoryStream, FileStream into OpenRCT2 namespace 2020-08-05 16:29:36 +02:00
Matt
30376085cf Include missing headers 2020-08-05 16:29:29 +02:00
Matt
59349b0a31 Add WIN32_LEAN_AND_MEAN to common.props 2020-08-05 16:27:48 +02:00
Matt
e91e68e3ec Re-phrase the network compatibility comment 2020-08-05 16:19:57 +02:00
Matt
05a9b27136 Fix ByteSwapBE type safety 2020-08-05 16:17:18 +02:00
Tom Parsons
58240cf1ad Close #12459: Remove unused enum PARK_LOAD_ERROR (#12590)
* Remove unused enum PARK_LOAD_ERROR

A refactoring a couple of years ago removed all uses so it
can safely be removed.

Closes #12459

* Also fix header order for clang-format
2020-08-04 23:26:59 -03:00