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

26186 Commits

Author SHA1 Message Date
Claudio Tiecher a94e6c54d8
Part of #21421: replace define with constexpr (#21679) 2024-04-01 07:00:32 -03:00
Michael Steenbeek 9062049be1
Fix sound effects not working with RCTC base, fix audio object conflict 
Due to this overwriting of object IDs, loading the sound effects would not work on RCTC. This overwriting also caused object conflicts which weren’t always won by the RCTC one. This fixes both problems by using non-clashing names, and only renaming one to `rct2.audio.base`, the name expected by the asset packs.
 2024-03-31 22:28:17 +00:00
Michał Janiszewski 06081eb23d
Fix #21691: Use correct iterator in RideCheckTrackContainsBanked (#21701) 2024-04-01 00:23:37 +02:00
Michael Steenbeek 19a65d1642
Bump network version for large scenery fix (#21699) 2024-03-31 19:25:19 +02:00
Michael Steenbeek 0668f0fb92
Fix #21695: Cannot remove large scenery 2024-03-31 17:57:14 +02:00
Michał Janiszewski d8ba574e6c
Default-initialise more members of Ride (#21694) 
It seems they got omitted in https://github.com/OpenRCT2/OpenRCT2/pull/21514
 2024-03-31 00:12:24 +01:00
Michael Steenbeek 8d16c0a73d
Merge pull request #21647 from Gymnasiast/refactor/image-import 
Refactor image import
 2024-03-31 00:08:31 +01:00
Michael Steenbeek ab73fe7317
Merge pull request #21514 from ZehMatt/ride-initialization 
Default Ride initialization
 2024-03-30 23:34:20 +01:00
ζeh Matt 84d1f502b1
Rename NO_TRAIN to kNoTrain 2024-03-30 23:18:51 +01:00
ζeh Matt f14b86426d
Remove some unnecessary field assignments in RideCreateAction 2024-03-30 23:18:51 +01:00
ζeh Matt e3343f263f
Default initialize newly created Rides 2024-03-30 23:18:08 +01:00
ζeh Matt d969a4f80d
Default initialize all members in Ride 2024-03-30 23:18:08 +01:00
Gymnasiast 88eca0d518
Move everything in ImageImporter.cpp into namespace 2024-03-30 18:13:03 +01:00
Gymnasiast c232aa9b0c
Create import meta object, use single method for JSON parsing 2024-03-30 18:13:03 +01:00
Gymnasiast eb2cda6a56
Replace `"forceBmp": true` with `"format": "raw"` 2024-03-30 18:13:02 +01:00
Michael Steenbeek 27e43b3a94
Merge pull request #21581 from pfroud/cleanup-error-logging 
Cleanup error logging
 2024-03-30 18:08:12 +01:00
Gymnasiast 18232341c8
Remove unused variables 2024-03-30 17:31:59 +01:00
Peter Froud c4b7845c26
Use `if... else if` 2024-03-30 17:15:17 +01:00
Peter Froud 869d1b398b
Assign variable in condition for documentation 2024-03-30 17:15:17 +01:00
Peter Froud 322321645b
Add `STR_ERR_INVALID_COLOUR` 2024-03-30 17:15:14 +01:00
Peter Froud 2b1d5ad9b7
Use specific error stringIDs 2024-03-30 17:12:54 +01:00
Peter Froud 276ff311cf
Add `LOG_WARNING` about bugged scenery entry 2024-03-30 17:12:54 +01:00
Peter Froud 1f698dfc76
Add `LOG_ERROR` calls 2024-03-30 17:12:54 +01:00
Peter Froud d1f740c786
Change "Could not find X" to "No X" 2024-03-30 17:12:54 +01:00
Peter Froud 40537a17fa
General cleanup of existing error messages 2024-03-30 17:12:54 +01:00
Peter Froud 226fc4cb00
Add location to error messages 2024-03-30 17:12:54 +01:00
Peter Froud 257c2d45d3
Change `if(elem!=nullptr)` to `if(elem==nullptr)` 2024-03-30 17:12:54 +01:00
Peter Froud f49fe68cc6
Improve messages for default case in switch stmt 2024-03-30 17:12:54 +01:00
Peter Froud a1517a4fcb
Use "X not found for Y" message style 2024-03-30 17:12:54 +01:00
Peter Froud 9e702d8b65
Missed an instance of `ride == nullptr` 2024-03-30 17:12:54 +01:00
Peter Froud 87ee06b7a4
Use `STR_ERR_RIDE_NOT_FOUND` when `ride==nullptr` 2024-03-30 17:12:54 +01:00
Peter Froud 13abc3441c
Change "invalid game command" messages 2024-03-30 17:12:54 +01:00
Peter Froud 125fa12d6f
Remove redundant word ("index. index = %u") 2024-03-30 17:12:53 +01:00
Peter Froud 338cca6760
Add missing `%u` in format strings 2024-03-30 17:12:53 +01:00
Peter Froud 23958186bd
Change `LOG_ERROR` to `LOG_WARNING` for errors 2024-03-30 17:12:53 +01:00
Gymnasiast e1127cde8a
Split Lay-down RC track drawer 2024-03-30 00:33:35 +01:00
Gymnasiast 96c9b7d85d
Refactor track paint functions and available pieces in RTD 2024-03-30 00:33:35 +01:00
Ryan Gudonis b5fdcf9a17
Change difficulty order for Wacky Worlds scenarios 2024-03-29 00:11:30 +01:00
mrmbernardi d48b75fb86
Refactor TTF drawing (#21621) 2024-03-28 23:28:54 +01:00
Matt 4eacb21f57
Merge pull request #21685 from AaronVanGeffen/ci-distros 
Drop Ubuntu Focal v20.04 from the CI roster
 2024-03-28 21:38:28 +02:00
Matt b9a0dcbe2f
Merge pull request #21686 from AaronVanGeffen/android-cpp20 
Move Android build fully to C++20 as well
 2024-03-28 16:42:00 +02:00
Aaron van Geffen db18c712fe Remove frowny faces regarding char8_t<->char conversion 2024-03-28 14:04:54 +01:00
Aaron van Geffen 66ca0388ed Move Android build fully to C++20 as well 2024-03-28 00:38:56 +01:00
Aaron van Geffen abc02511e1 Show distro vendor in CI roster 2024-03-28 00:37:32 +01:00
Aaron van Geffen afb4dcf728 Drop Ubuntu Focal v20.04 from the CI roster 2024-03-28 00:34:01 +01:00
reversebottle 854d4e6fa4
Fix #21652: set correct color on save overwrite first open (#21666) 2024-03-27 23:12:55 +00:00
Michael Steenbeek 66edbc01aa
Merge pull request #21682 from AaronVanGeffen/pragma-once 
Add pragma once to a few headers
 2024-03-27 22:16:24 +01:00
Aaron van Geffen cec251bb63 Take kAllObjectTypes internal as well 2024-03-27 21:26:07 +01:00
Aaron van Geffen e173564500 Add missing pragma once to TileElementsView.h 2024-03-27 20:39:37 +01:00
Aaron van Geffen 98c3c8b22c Add missing header to ObjectEntryManager.h 2024-03-27 20:39:16 +01:00