1
0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-16 03:23:15 +01:00
Commit Graph

24650 Commits

Author SHA1 Message Date
OpenRCT2 git bot
70e97bd322 Merge Localisation/master into OpenRCT2/develop 2023-04-07 04:01:48 +00:00
Matthias Moninger
5462c28b8c Fix dereferencing nullptr for bad loaded g2 using OpenGL renderer (#19855) 2023-04-06 21:56:52 +02:00
Rik Smeets
c2d55e9535 Fix Looping Coaster trains clipping through steep quarter turns down 2023-04-06 21:34:00 +02:00
Michał Janiszewski
993da08fb9 Fix #19850: Only provide default value for final arguments (#19852) 2023-04-06 15:35:02 +01:00
kyphii
39790779bb Extend color selection dropdown with more colors (#19446)
* Setup for extended palette

* Define order for color picker cells

* Init G2 Palettes in ColoursInitMaps

* Add Glass Palettes

* Use special sprite for Invisible color

* Set up new cheat for special colors

* Add glass palettes to palette_to_g1_offset

* Add entries for new colors in TranslucentWindowPalettes

* Finish implementation of special colors cheat

* Some cleanup

* New colors almost work

* Correct g2 palette loading indices

* Invisible color sprite displays properly

* Repaint works with large scenery and walls

* Prevent random shop items from overflowing to junk palettes

* More cleanup

* Fix glass palettes

* Add mapping of new colors to original colors for UI themes

* Fix junk palettes for random shop items

* Fix missing highlight color in software renderer

* Convert small scenery support flag to allow use of new colors

* Progress on displaying new colors in software renderer

* Fix invisible color scheme sprite

* Formatting cleanup

* Resolve comparison of integer expressions of different signedness

* Index g2 palette maps to fix visible chain lift

* Progress on fixing new colors in software renderer

* Fix station and support colors

* Fix dropdown selected index

* Get invisible color (mostly) working in software renderer

* Use forceBmp for palette resources

* Remove test function definition left in by mistake

* Remove some obsolete range checks for original color values

* Add changelog entry

* Reorder color dropdown based on NE user feedback

* Some cleanup

* Further cleanup

* Formatting

* Add include for GetPaletteMapIndexForColour

* Fix a couple things I broke

* Fix function placement

* Revert "Add include for GetPaletteMapIndexForColour"

This reverts commit 0af9611e6656d792adb7a36efe7dbf3387a4a759.

* Use color constants for color order list

* Make remappable colors contiguous

* turn off clang format for ordered color list

* Appease clang

* Use all colors for random shop item animation

* Improvements to palette map resources

* Fix chain lifts again + adjustments to a few colors

* Update changelog and contributors.md

* Revert changes to S4 and S6 importers which are no longer needed

* Bump network, plugin, and minimum park versions

* Revert "Progress on displaying new colors in software renderer"

This reverts commit 337602e4a7.

* Remove unnecessary comment

---------

Co-authored-by: Trevor Finney <8711258+finneyt@users.noreply.github.com>
2023-04-06 08:36:07 +01:00
Hielke Morsink
b4beb0c69f Fix #19839: Game freezes on protected rides tab (#19840) 2023-04-06 07:33:29 +02:00
Michał Janiszewski
ee6746373e Fix #19817: merry-go-round doesn't have a vehicle until opened (#19842)
Merry-go-round doesn't receive its vehicle until it gets tested/opened,
but tries painting non-existent guests anyway, leading to reference
binding to nullptr.
2023-04-06 00:55:05 +02:00
Duncan
1ec62e44bb Add missing string test (#19837) 2023-04-05 21:28:50 +01:00
AuraSpecs
19a8384547 Update OpenMusic to version 1.2.0 (#19833) 2023-04-05 20:21:12 +01:00
Duncan
d3c492a967 Update objects for OpenRCT2/OpenRCT2#19547 (#19836) 2023-04-05 19:03:50 +00:00
Hielke Morsink
28252bcb79 Add changelog entry for #12598 (#19834) 2023-04-05 17:08:18 +02:00
Michał Janiszewski
fe4be750c6 Fix #12598: Incorrect assignment in TrackDesign (#19831) 2023-04-05 13:05:48 +00:00
X123M3-256
3c4e32458a Add large sloped turns to hybrid and single rail (#19547)
* Implement large sloped turns

* Fix formatting

* Add sprites

* Fix large turns button being active on steep slopes

* Remove bad comment

* Increment network,plugin,park version numbers

* Update changelog

* Increment park file version again
2023-04-05 13:47:56 +01:00
Matthias Moninger
4248cf3038 Add test summary to each job (#19824) 2023-04-05 10:17:33 +02:00
kyphii
1dafb8e56e Fix small scenery repainting (#19826)
Co-authored-by: Trevor Finney <8711258+finneyt@users.noreply.github.com>
2023-04-05 06:27:51 +02:00
Michał Janiszewski
81fd7b6b8a Merge pull request #19821 from janisozaur/llvm-coverage
Add clang-based tests coverage
2023-04-04 15:52:58 +02:00
John Mulcahy
18ce417dc0 Fix 19231 - Fix Tile Copy/Paste null pointer exception 2023-04-04 11:35:20 +02:00
Michał Janiszewski
0f7996f006 Include test binary in coverage artifacts for offline processing 2023-04-04 09:56:31 +02:00
Michał Janiszewski
b996a59d3c Provide coverage report in CI logs 2023-04-04 09:56:20 +02:00
Duncan
c0bd64f778 Split of Needs supports changes from OpenRCT2/OpenRCT2#19446 (#19759) 2023-04-04 07:52:07 +00:00
Michał Janiszewski
e822880db8 Add clang-based coverage information for tests 2023-04-04 08:54:19 +02:00
Michał Janiszewski
b3b45853b7 Update CI images to v11 2023-04-04 08:53:33 +02:00
Michał Janiszewski
d25fa7fe1e Fix compilation with mingw GCC 12
Another case of the compiler bug found in #17371
2023-04-04 08:52:12 +02:00
OpenRCT2 git bot
a794c982ba Merge Localisation/master into OpenRCT2/develop 2023-04-04 04:02:03 +00:00
Hielke Morsink
50242c2160 Fix YML error in stale-prs job 2023-04-03 21:35:23 +02:00
Matthias Moninger
a949255067 Merge pull request #19812 from ZehMatt/fix-19811
Fix #19811: Use the correct SDL event for window resize handling
2023-04-03 21:32:37 +03:00
AuraSpecs
8924490483 Improve communication of the stale bot. (#19758)
* Update stale-prs.yml

* Stale after a month

Upped the stale PR from 2 weeks to a month. Reasoning is to not have it spam every two weeks when developers are busy at the time. Let me know if need to be reverted.

* Update communication on closing backtrace issues

* Update .github/workflows/stale-prs.yml

Co-authored-by: James103 <37945304+James103@users.noreply.github.com>

* Update .github/workflows/stale-prs.yml

Co-authored-by: Hielke Morsink <hielke.morsink@gmail.com>

* Revert "Update communication on closing backtrace issues"

This reverts commit b2b6c3ccf1.

---------

Co-authored-by: James103 <37945304+James103@users.noreply.github.com>
Co-authored-by: Hielke Morsink <hielke.morsink@gmail.com>
2023-04-03 13:34:56 -03:00
Michał Janiszewski
049d962a7c Merge pull request #19462 from duncanspumpkin/cmakeTests
Actually Run All Unit Tests in CMake
2023-04-03 17:43:23 +02:00
ζeh Matt
cc64ab530c Fix #19811: Use the correct SDL event for window resize handling 2023-04-03 17:09:50 +03:00
Michał Janiszewski
470d02572d Fix #17371: GCC regression with -Wmaybe-uninitialized (#19810)
https://gcc.gnu.org/bugzilla/show_bug.cgi?id=105937 was reported for
GCC12 and fixed in GCC13 (not yet released).

Leave the suppresions in place until we can get rid of GCC12
2023-04-03 16:09:41 +02:00
Vlad Rakhmanin
90599d9b5a Fix #13801: Refactor ServerList to use Window class (#19675)
Co-authored-by: Tulio Leao <tupaschoal@gmail.com>
2023-04-03 06:51:40 -03:00
Duncan
2afed4c272 Fix #19803. Crash when invalid scenery element for sign 2023-04-03 10:27:19 +02:00
Matthias Moninger
d7923c479e Merge pull request #19481 from Gymnasiast/feature/compat-object
Add flag to mark an object as a compatibility object
2023-04-03 11:17:13 +03:00
Rik Smeets
de06f6026e Fix #18895: Responding mechanic blocked at level crossing (#19620)
Remove the condition regarding the ride's breakdown reason. Other breakdown reasons can also cause trains getting stuck at a level crossing.
2023-04-02 17:57:59 +02:00
Rik Smeets
f8b30fbb36 Reduce guests walking through trains on level crossing next to station (#19619) 2023-04-02 17:38:00 +02:00
Vlad Rakhmanin
63cad26dfc Fix #13771: Refactor EditorObjectiveOptions to use Window class (#19789)
* Initial refactoring to class completed.

* Removed legacy events.

* Fix issues with variables shadowing outer scope.

* Declaring class final.

* Deleted unused GetHeight function.

* Added early return and OnScrollGetSize

* Fixed typo in OnScrollGetSize
2023-04-02 15:10:58 +01:00
Andrew
ad0229199d Sticky the Misc scenery tab next to the All scenery tab (#19764)
* Sticky the Misc tab next to the All tab

* More robust misc check

Co-authored-by: Hielke Morsink <hielke.morsink@gmail.com>
Co-authored-by: Duncan <duncans_pumpkin@hotmail.co.uk>
2023-04-02 08:42:37 +00:00
Michael Steenbeek
fd80b4c822 Refactor and clean up date handling (#19666)
* Refactor and clean up date handling

* Remove gDate, remove direct access to days_in_month

* Adjust the MultiLaunch test

* Bump network version

---------

Co-authored-by: ζeh Matt <5415177+ZehMatt@users.noreply.github.com>
2023-04-02 09:25:41 +01:00
Matthias Moninger
9e4099fcdf Fix VS debug builds not finding gtestd.lib (#19798) 2023-04-02 09:20:47 +02:00
Michał Janiszewski
6ab69895ae Update dependencies to v34 (#19790)
Updates:

    benchmark 1.6.1 -> 1.7.1
    breakpad 2020-09-14 -> 2022-07-12
    discord-rpc 3.4.0 (no change)
    freetype 2.11.1 -> 2.12.1
    fribidi 1.0.12 (no change)
    gtest 1.11.0 -> 1.13.0
    libflac 1.3.4 -> 1.4.2
    libogg 1.3.5 (no change)
    libvorbis 1.3.7 (no change)
    libpng 1.6.37 -> 1.6.39
    libzip 1.8.0 -> 1.9.2
    nlohmann-json 3.10.5 -> 3.11.2
    openal-soft 1.21.1 -> 1.23.0
    SDL 2.0.22 -> 2.26.4
    speexdsp 1.2.0 -> 1.2.1
    zlib 1.2.12 -> 1.2.13
2023-04-02 00:28:55 +02:00
Kevin Strehl
1174063c27 Improve check whether path is connected (#19788) 2023-04-01 06:44:22 +00:00
OpenRCT2 git bot
3dcd7b6a5c Merge Localisation/master into OpenRCT2/develop 2023-03-31 04:02:00 +00:00
Matthias Moninger
63b0d16025 Merge pull request #19757 from ZehMatt/fix-19296
Fix #19296: Race condition for parallel object loading
2023-03-31 01:21:00 +03:00
Matthias Moninger
72753778e7 Merge pull request #19784 from ZehMatt/backtrace-forks
Disable the issue automation on forks
2023-03-30 19:56:00 +03:00
ζeh Matt
14bfa9a42e Disable the issue automation on forks 2023-03-30 18:55:31 +03:00
duncanspumpkin
b9ce206044 Move to pretest discovery 2023-03-30 08:31:59 +01:00
OpenRCT2 git bot
47e8835bc5 Merge Localisation/master into OpenRCT2/develop 2023-03-30 04:01:53 +00:00
Duncan
893ade7ccc Update to objects v1.3.9 (#19770) 2023-03-29 21:33:31 -03:00
Duncan
2650b19666 Remove shell.nix (#19772) 2023-03-29 21:17:45 -03:00
duncanspumpkin
bde48f0b25 Fix running the tests 2023-03-29 22:05:21 +01:00