1
0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-04 13:42:55 +01:00
Commit Graph

25649 Commits

Author SHA1 Message Date
Peter Froud
40a7fa70fc Fix empty error messages (#21351)
* Add `STR_ERR_CANT_CHANGE_PARK_ENTRANCE_FEE`

* Add `STR_ERR_TRACK_ON_THIS_TILE_NEEDS_WATER`

* Return existing `GameAction::Result`

* Add `STR_ERR_ACTION_INVALID_FOR_THAT_STAFF_TYPE`

I am open to suggestions for a different message!
Originally this was going to be STR_ERR_WRONG_STAFF_TYPE
but I thought that was confusing because the game
action arguments do not specify a staff type. We
want it to mean "the staff ID you specified is the
wrong StaffType for this game action".

* Refactor `StaffSetColour()` to return `Result`

* Remove unnecessary arguments when `Status` is `Ok`

* Refactor `SwapTileElements()` to return `Result`

Also add STR_ERR_CANT_SWAP_TILE_ELEMENT_WITH_ITSELF

* Format code

* Use `STR_ERR_CANT_CHANGE_PARK_ENTRANCE_FEE` in title

* Format code using Github web editor

* Format indentation
2024-02-19 20:58:04 -03:00
Matt
1042c428e8 Merge pull request #21429 from Martymoose98/refactor
Move gBankLoan and gBankLoanInterestRate to GameState_t
2024-02-19 17:26:37 +02:00
Martin
2f0dea0243 Merge branch 'OpenRCT2:develop' into refactor 2024-02-19 04:50:22 -05:00
Martin Mizzi
f5a9846ea2 Move gBankLoan and gBankLoanInterestRate to GameState_t 2024-02-19 04:42:44 -05:00
Romain
a3ce64c009 Add launchable to appdata 2024-02-19 07:37:46 +01:00
OpenRCT2 git bot
a0933c7020 Merge Localisation/master into OpenRCT2/develop 2024-02-19 04:01:38 +00:00
OpenRCT2 git bot
7f59e20926 Merge Localisation/master into OpenRCT2/develop 2024-02-18 04:01:35 +00:00
Ota
e9b214282d Fix #21039: Text rendering bleeds pixels through windows
Should fix [#21039 ](https://github.com/OpenRCT2/OpenRCT2/issues/21039).

As it is explained in the issue, the outline and inset code would not respect the DPI bounds in the drawing process by accessing e.g. `*(dst + 1)` to draw an outline, in this case to the right.
#### Approach
I approached this issue by creating a function `GetPixel()`  in `TTFSurface` that would return a value if the given x and y coordinates is a part of a TTF text, else 0. 

In the for loop, iterating through the TTF text, the if condition
```
if (surface->GetPixel(xx + srcX_start + 1, yy + srcY_start)
                        || surface->GetPixel(xx + srcX_start - 1, yy + srcY_start)
                        || surface->GetPixel(xx + srcX_start, yy + srcY_start + 1)
                        || surface->GetPixel(xx + srcX_start, yy + srcY_start - 1))
```
checks if the coordinates **(xx, yy)** is an outline of a text. the writing bounds. Adding `srcX_start`, which is 0 or `-skipX` if `skipX < 0`, when calling `GetPixel()`, would shift the pixel access to the correct position, where the text begins on the surface. The same is done for the Y axis. (Not having this would lead to the outlines/insets not moving with the text when the window with the TTF text moves)
2024-02-17 23:31:07 +01:00
Michael Steenbeek
ecbc523229 Merge pull request #21412 from Gymnasiast/refactor-even-more-wooden-supports
Refactor even more wooden supports
2024-02-17 22:39:51 +01:00
Gymnasiast
accfa1af61 Add WoodenSupportType::Null, replace std::nullopt with it 2024-02-17 22:26:15 +01:00
Gymnasiast
b254501b25 Refactor calls to old WoodenASupportsPaintSetupRotated() 2024-02-17 22:26:15 +01:00
Alex Parisi
efb6d48c4c Add plugin API to get registered plugin metadata (#20709)
* Added API for getAllPlugins

Added functionality to the Scripting API to allow Contexts to return a list of all registered plugins.

* Fixed naming conventions, returning list of authors

Changed function names to follow get/set convention. Removed unnecessary copies of shared pointers, now using auto instead. Changed the functionality to return an array of authors instead of a string.

* Added changelog entry

Also added myself to list of contributors

* Moved all functionality to ScPlugin

Created a ScPlugin class and moved the current getPlugins functionality there.

* Changed from method to property

Function names now match the get/set convention for properties. Also did some code cleanup.

* Update copyright

* Bump plugin version

---------

Co-authored-by: Tulio Leao <tupaschoal@gmail.com>
2024-02-16 05:53:48 -03:00
OpenRCT2 git bot
04603f5213 Merge Localisation/master into OpenRCT2/develop 2024-02-16 04:01:41 +00:00
Matt
d929e6a540 Allow tooltips to show up when an error window is present 2024-02-15 13:32:58 +01:00
Michael Steenbeek
1613658647 Merge pull request #21401 from Gymnasiast/refactor/track-design-save-cpp
Small cleanup in TrackDesignSave.cpp
2024-02-15 13:32:21 +01:00
Matt
d25a2e7b05 Merge pull request #21403 from Harry-Hopkinson/gNewsItems-to-GameState
Move gNewsItems to GameState
2024-02-15 09:04:16 +02:00
OpenRCT2 git bot
cb2bca7c7a Merge Localisation/master into OpenRCT2/develop 2024-02-15 04:01:47 +00:00
Harry-Hopkinson
43f13ff36c Format code 2024-02-14 14:13:17 +00:00
Harry-Hopkinson
0a8f1154ad Add OpenRCT2 as namespace. 2024-02-14 14:10:08 +00:00
Harry Hopkinson
691f5f88e5 Move gNewsItems to GameState 2024-02-14 10:54:15 +00:00
OpenRCT2 git bot
2d0a04ada9 Merge Localisation/master into OpenRCT2/develop 2024-02-14 04:01:42 +00:00
Gymnasiast
085a126bbf Remove unnecessary arguments to TrackDesignSave{Add,Remove}TileElement 2024-02-13 23:31:09 +01:00
Gymnasiast
4b03275cff Remove snake_case in TrackDesignSave.cpp 2024-02-13 23:26:41 +01:00
David Sungaila
89f83d6c0d Fix #21288: Overlapping text in the About window 2024-02-13 23:10:39 +01:00
Harry Hopkinson
1c285dbf9f Move gMaxBankLoan to GameState 2024-02-13 21:36:35 +01:00
Severin Paul Höfer
0c7b94255f Fix #21318: VirtualFloor not properly invalidated (#21386)
* Fix condition for setting VirtualFloor coordinates

* Update changelog.txt
2024-02-13 16:53:55 -03:00
Michał Janiszewski
8cf393f971 Use libsawyer's gxc to build g2.dat (#21392) 2024-02-13 16:04:54 -03:00
Matt
19be093569 Fix #21208: Error messages disappear too quickly if the game runs for a while (#21394)
* Reset gCurrentRealTimeTicks when the map is initialized

* Use 32 bit for gWindowUpdateTicks

* Update changelog.txt
2024-02-13 16:03:30 -03:00
Matt
5ac347e9f6 Merge pull request #21389 from ZehMatt/error-update-1
Don't close the error window if the new error will not show
2024-02-13 15:54:14 +02:00
Matt
5ed5fece46 Merge pull request #21390 from Harry-Hopkinson/gMapSize-to-GameState_t
Move gMapSize to GameState_t
2024-02-13 14:14:57 +02:00
OpenRCT2 git bot
64787ff91f Merge Localisation/master into OpenRCT2/develop 2024-02-13 04:01:45 +00:00
Michael Steenbeek
c3380e29dd Fix #21286: Cannot build unbanking turns with RCT1 vehicles 2024-02-12 23:23:05 +01:00
Michael Steenbeek
48a8d484cf en-GB: Remove old music style strings
These are no longer used, as they have been moved to objects.
2024-02-12 23:01:31 +01:00
Harry-Hopkinson
ce8afe252a Use OpenRCT2 namespace in Map.cpp 2024-02-12 21:49:57 +00:00
Harry-Hopkinson
b755c873e5 Move gMapSize to GameState_t 2024-02-12 21:32:08 +00:00
ζeh Matt
c24657a7f7 Don't close the error window if the new error will not show 2024-02-12 23:02:31 +02:00
OpenRCT2 git bot
72ca04633e Merge Localisation/master into OpenRCT2/develop 2024-02-12 04:01:42 +00:00
Harry Hopkinson
a55da09e1c Move gMapBaseZ to GameState_t (#21370)
* Move gMapBaseZ to GameState_t

* Fix fomatting
2024-02-11 21:40:32 +00:00
Michael Steenbeek
1a13cdcc57 Fix #21220: Localised park name not used when loading SC4 2024-02-11 20:51:23 +00:00
Michael Steenbeek
70b9d0ca47 Add button to reload object 2024-02-11 20:45:31 +00:00
Matt
6626208695 Merge pull request #21355 from sungaila/readme-arm64
Windows: Build g2.dat on Arm64 machines and update readme
2024-02-11 22:29:08 +02:00
Michael Steenbeek
c4be52644d Fix #21358: Crash during RCT1 research import 2024-02-11 20:08:48 +00:00
David Sungaila
20eddc4d49 Windows: Build g2.dat on Arm64 machines and update readme 2024-02-11 19:03:55 +01:00
Michael Steenbeek
67a7614140 Merge pull request #21111 from Gymnasiast/refactor/goto-removal
Remove more gotos in Vehicle.cpp
2024-02-11 18:09:23 +01:00
OpenRCT2 git bot
26bdaebe4f Merge Localisation/master into OpenRCT2/develop 2024-02-11 04:01:39 +00:00
Matt
c8b28ca457 Fix #21330: Tooltips from dropdown widgets have the wrong position 2024-02-10 18:47:40 +01:00
Matt
0c1991c004 Merge pull request #21361 from karst/opensfx-1.0.4
Update OpenSFX to version 1.0.4
2024-02-10 16:02:01 +02:00
David Sungaila
920e39fb34 Windows: add app manifest to enable PerMonitorV2 2024-02-10 14:08:16 +01:00
Karst
da8594cec1 Update OpenSFX to version 1.0.4 2024-02-09 21:36:59 +01:00
Michael Steenbeek
776674af7a Merge pull request #21130 from Gymnasiast/fix/research-table-size
Fix: Research table in LL parks imported incompletely
2024-02-08 22:05:09 +01:00