1
0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-20 05:23:04 +01:00
Commit Graph

728 Commits

Author SHA1 Message Date
Aaron van Geffen
7cc1cd09ea Move StringIdType.h include out of common.h 2024-07-09 15:05:19 +02:00
AuraSpecs
8968c7d3fe Update OpenMusic to version 1.6 (#22262) 2024-07-10 07:43:52 +00:00
John
71cba8ac37 Add music track listing to ride music window (#20980)
Co-authored-by: Aaron van Geffen <aaron@aaronweb.net>
2024-07-08 17:03:54 +02:00
Aaron van Geffen
69c5e6ad9e Move money types into Money.hpp 2024-05-14 16:35:00 +02:00
Michał Janiszewski
3c35558f3f Fix compilation on Arch Linux with GCC 14 (#22031)
Fixes #22029
2024-05-13 22:09:00 +00:00
Duncan
eded6e2129 Readd algorithm header where it is used (#22000) 2024-05-10 10:37:01 +01:00
Claudio Tiecher
10a5d790c6 Part of #21421: replace define with constexpr (#21760)
* Part of #21421: refactor TUNNEL_MAX_COUNT

* Part of #21421: deleted unused OBJECT_SELECTION_NOT_...

* Part of #21421: refactor MAX_SERVER_DESCRIPTION_LENGTH

* Part of #21421: refactor EXPENDITURE_TABLE_MONTH_COUNT

* Part of #21421: refactor FINANCE_GRAPH_SIZE

* Part of #21421: refactor NETWORK_STREAM_VERSION and _ID

* Part of #21421: MONEY_STRING_MAXLENGTH

* Part of #21421: deleted MAX_USER_STRINGS

* Part of #21421: refactor USER_STRING_MAX_LENGTH

* Part of #21421: deleted USER_STRING_END

* Part of #21421: refactor REAL_NAME_START

* Part of #21421: refactor REAL_NAME_END

* Part of #21421: deleted FONT(X) and FONT_OPENRCT2_SPRITE

* Part of #21421: refactor CURRENCY_SYMBOL_MAX_SIZE

* Part of #21421: refactor CURRENCY_RATE_MAX_NUM_DIGITS

* Part of #21421: refactor SCROLLABLE_ROW_HEIGHT

* Part of #21421: refactor ADD_CLAMP_BODY

* Part of #21421: applied clang-format to Util.cpp

* Part of #21421: incorporate feedback from #21760

* Part of #21421: revert to nbsp in Currency.cpp

* Part of #21421: fix merge conflict

* Part of #21421: fix more merge conflict

* Part of #21421: apply clang format

* Part of #21421: using std::numerics for finding bounds

* Part of #21421: fix reference to kAddClampBody

* Part of #21421: improved on comments about AddClamp func

* Part of #21421: apply correct network stream version number

* Part of #21421: apply clang-format
2024-05-09 08:59:03 -03:00
Aaron van Geffen
ca6f142a97 Remove Config.h include from many places 2024-05-08 22:29:32 +02:00
Michał Janiszewski
7b12667ddb Reduce <algorithm> include (#21947) 2024-05-01 13:47:27 +02:00
mrmbernardi
f4cebb11df Speed up TerrainSurfaceObject::GetImageId() 2024-04-26 09:52:19 +02:00
Rahul Unniyampath
893ae7f0ca Refactor constant notation in Audio.h
Co-authored-by: ncerroneumich <ncerrone@umich.edu>
2024-04-21 00:12:13 +02:00
Michael Steenbeek
271a22d00e Merge pull request #21681 from AaronVanGeffen/obj-list-refactor
Move various object list properties out of ObjectTypes header
2024-04-12 11:54:13 +02:00
Michael Steenbeek
a38039f6e4 Add feature to allow overriding x/y offsets in GX files 2024-04-05 15:41:35 +02: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
Gymnasiast
c232aa9b0c Create import meta object, use single method for JSON parsing 2024-03-30 18:13:03 +01:00
Aaron van Geffen
cec251bb63 Take kAllObjectTypes internal as well 2024-03-27 21:26:07 +01:00
Aaron van Geffen
98c3c8b22c Add missing header to ObjectEntryManager.h 2024-03-27 20:39:16 +01:00
Aaron van Geffen
e898e9211d Move kObjectEntryGroupCounts to ObjectList.cpp 2024-03-27 20:13:10 +01:00
Aaron van Geffen
d645906003 Move kTransientObjectTypes, kIntransientObjectTypes out of header 2024-03-27 19:51:57 +01:00
Aaron van Geffen
5f4d02a6f7 Move kLegacyObjectEntryGroupEncoding to ObjectRepository.cpp 2024-03-27 19:20:05 +01:00
Claudio Tiecher
2c4c2da319 Part of #21421: Refactor VEHICLE_SEAT_PAIR_FLAG 2024-03-25 16:17:32 +01:00
Peter Froud
1e51925968 Change "ternary" to "tertiary" (#21582) 2024-03-11 08:42:54 -03:00
James103
1d8dc111f1 Replace 2023 with 2024 in copyright headers (#21139)
Replace all instances of the year 2023 with 2024 in all copyright headers
2024-01-01 12:52:28 +01:00
AuraSpecs
83598ba898 OpenMusic release v1.5 (#21004)
Adds Rock style 4 ride music by Blackend Blue.
2023-11-28 06:09:58 -03:00
AuraSpecs
1223b739e0 Create OpenMusic 1.4 release (#20795)
nl-NL: Fix/amend some descriptions by @Gymnasiast in #42
    Update French translation by @rmnvgr in #43
    Normalize the ragtime tunes by @karst in #44
    Complete list of Fairground organ style 2 tunes by @karst in #45
    Update Hungarian translation by @anon569 in #47
    Add Mystic style by @SkyshardMelody in #46
    pt-BR: Translate Mystic Style by @tupaschoal in #48
    hu-HU: Translate Mystic Style by @anon569 in #49
2023-09-21 19:36:37 +01:00
Ken Reese
3a3cd18321 Fix #19722: "Forbid tree removal" doesn't apply to large trees 2023-09-19 14:59:18 +02:00
Karst
0dafa3ca88 Add OpenMusic to DefaultObjects
This adds all OpenMusic to be included when creating a new scenario.
2023-08-25 16:47:31 +02:00
ζeh Matt
3d5e6ea932 Replace Equals with IEquals where appropriate 2023-07-05 23:14:05 +03:00
Matthias Moninger
b291c87d51 Merge pull request #20271 from duncanspumpkin/objDescriptor
Rework Object Identifier callers
2023-06-26 16:11:45 +03:00
Matthias Moninger
3edb044685 Merge pull request #20100 from IntelOrca/plugin/object-manager
Add plugin APIs for the object manager
2023-06-26 02:26:13 +03:00
Aaron van Geffen
d425e0a8bb Remove const qualifier from constexpr statements 2023-06-24 11:45:26 +02:00
duncanspumpkin
b58a17c731 Remove localisation object overrides 2023-05-22 08:50:19 +01:00
duncanspumpkin
8f53c6dbd3 Remove bad identifier users
Note this doesn't actually do anything under the hood it will do the same thing for now
2023-05-22 08:46:15 +01:00
Bart Ribbers
053c00218f Fix int32_t being undefined on Musl systems due to missing import (#20231) 2023-05-18 14:16:59 +01:00
Michael Steenbeek
fe2d1e2372 Small symbol cleanup (#20229)
* Remove unused generate_string_file() declaration

* Move IsUserStringID() to RCT12.h

The function is only used by RCT1/2 code, and the implementation is in RCT12.cpp

* Move ScenarioTranslate() to ScenarioRepository.cpp

Seems to have ended up in ObjectRepository.cpp by accident.
2023-05-17 19:27:04 +01:00
Duncan
db1c9fab41 Fix #19823. Disallow overriding with wrong object type (#20182)
* Fix #19823. Disallow overriding with wrong object type

Some community objects have been made incorrectly and override small scenery objects with large scenery objects. This prevents that overload from being allowed.

* Bump network version and add changelog
2023-05-14 20:31:06 +00:00
Michael Steenbeek
58baa85a27 Small path additions cleanup (#20076)
* Split off path addition paint calls

* Replace occurences of “path bit” with “path addition”

* Replace occurences of “footpath item“ with “path addition”
2023-05-09 20:08:25 +01:00
Ted John
79f8913065 Fix CI due to sign issue 2023-05-02 20:28:14 +01:00
Ted John
cbd4c78cf6 Handle legacy objects correctly 2023-05-02 20:28:14 +01:00
Ted John
069a2b3192 Implement object manager for plugins 2023-05-02 20:28:14 +01:00
Ted John
58dc3f193b Use simple identifiers 2023-05-02 20:27:57 +01:00
Ted John
2729956cef Add scenery group object interface 2023-05-02 20:27:56 +01:00
spacek531
1bbdba40b5 Implement paint code for spiral lifthill down (#19567)
* spiral lifthill down paintcode

* rename string anyway

* add some stuff I forgot and add documentation

* use static assert on SpriteGroupMultiplier

* add slope to list of opposite slopes

* bump scripting version

* update openrct2.d.ts

* improve documentation
2023-04-27 15:11:22 +01:00
Matthias Moninger
98aa816e5f Fix #19989: Crash with small scenery objects having no offsets defined (#19990) 2023-04-19 06:35:09 +01:00
Duncan
383642a812 Fix #19916. Crash when changing language (#19945)
Issue caused by the unload image function not resetting the image id back to invalid. Also noticed that water wasn't correctly cleaning up.

Fix #19918, #19926, #19927, #19928, #19929, #19931
2023-04-15 21:11:01 +00:00
Nikolas Parshook
ef35dfa40a Expose obj image offset and num images to plugins (#17567)
Co-authored-by: Duncan <duncans_pumpkin@hotmail.co.uk>
2023-04-13 19:09:15 +00:00
Gymnasiast
9c2d5b9fef Make GfxDrawSprite() take reference 2023-04-11 22:53:30 +01: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
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
ζeh Matt
92f821af07 Fix some mistake 2023-03-29 15:54:16 +03:00