Resolve merge conflicts

CMakeLists.txt

@@ -69,9 +69,9 @@ set(TITLE_SEQUENCE_VERSION "0.4.14")
 set(TITLE_SEQUENCE_URL  "https://github.com/OpenRCT2/title-sequences/releases/download/v${TITLE_SEQUENCE_VERSION}/title-sequences.zip")
 set(TITLE_SEQUENCE_SHA1 "6c04781b959b468e1f65ec2d2f21f5aaa5e5724d")
 
-set(OBJECTS_VERSION "1.5.0")
+set(OBJECTS_VERSION "1.5.1")
 set(OBJECTS_URL  "https://github.com/OpenRCT2/objects/releases/download/v${OBJECTS_VERSION}/objects.zip")
-set(OBJECTS_SHA1 "90c26f416ddaeb0c35490b7af89f4c6f9d6351f3")
+set(OBJECTS_SHA1 "e922b9fd779e7752176f1d0d8766c2ee6ad1e41b")
 
 set(OPENSFX_VERSION "1.0.5")
 set(OPENSFX_URL  "https://github.com/OpenRCT2/OpenSoundEffects/releases/download/v${OPENSFX_VERSION}/opensound.zip")
@@ -81,9 +81,9 @@ set(OPENMSX_VERSION "1.6")
 set(OPENMSX_URL  "https://github.com/OpenRCT2/OpenMusic/releases/download/v${OPENMSX_VERSION}/openmusic.zip")
 set(OPENMSX_SHA1 "ba170fa6d777b309c15420f4b6eb3fa25082a9d1")
 
-set(REPLAYS_VERSION "0.0.85")
+set(REPLAYS_VERSION "0.0.86")
 set(REPLAYS_URL  "https://github.com/OpenRCT2/replays/releases/download/v${REPLAYS_VERSION}/replays.zip")
-set(REPLAYS_SHA1 "2B0939953A41D2CE82809CB7C21FC3883578383F")
+set(REPLAYS_SHA1 "637E73F20C03DCD52ACA36FAEE15DADB31797FE0")
 
 option(FORCE32 "Force 32-bit build. It will add `-m32` to compiler flags.")
 option(WITH_TESTS "Build tests")

data/language/en-GB.txt

@@ -2169,7 +2169,6 @@ STR_3136    :Warning: This design will be built with an alternative vehicle type
 STR_3137    :Select Nearby Scenery
 STR_3138    :Reset Selection
 STR_3139    :Cable lift unable to work in this operating mode
-STR_3140    :Cable lift hill must start immediately after station
 STR_3141    :Multi-circuit per ride not possible with cable lift hill
 STR_3142    :{WINDOW_COLOUR_2}Capacity: {BLACK}{STRINGID}
 STR_3143    :Show people on map
@@ -3790,5 +3789,8 @@ STR_6723    :At least one entertainer peep animations object must be selected
 STR_6724    :Scenario Texts
 STR_6725    :X:
 STR_6726    :Y:
-STR_6727    :Export emscripten data
-STR_6728    :Import emscripten data
+STR_6727    :Dive Loop (left)
+STR_6728    :Dive Loop (right)
+STR_6729    :Cable lift hill must start immediately after station or block brake
+STR_6730    :Export emscripten data
+STR_6731    :Import emscripten data

data/language/ko-KR.txt

@@ -2610,7 +2610,7 @@ STR_5368    :충돌 이력 제거
 STR_5371    :오브젝트 선택
 STR_5372    :마우스 오른쪽 드래그 시 좌우 반전
 STR_5373    :이름 {STRINGID}
-STR_5374    :날짜 {STRINGID}
+STR_5374    :수정 날짜 {STRINGID}
 STR_5375    :▲
 STR_5376    :▼
 STR_5404    :이미 존재하는 이름입니다
@@ -3506,9 +3506,9 @@ STR_6437    :보이기
 STR_6438    :{MOVE_X}{2}👁
 STR_6439    :칸 조사 창: 감춤 여부
 STR_6440    :물 투명하게 보기
-STR_6441    :최소 하나 이상의 일반 보도 바닥 오브젝트를 선택해야 합니다.
-STR_6442    :최소 하나 이상의 대기 줄 보도 바닥 오브젝트를 선택해야 합니다.
-STR_6443    :최소 하나 이상의 보도 난간 오브젝트를 선택해야 합니다.
+STR_6441    :최소 하나 이상의 일반 보도 바닥 오브젝트를 선택해야 합니다
+STR_6442    :최소 하나 이상의 대기 줄 보도 바닥 오브젝트를 선택해야 합니다
+STR_6443    :최소 하나 이상의 보도 난간 오브젝트를 선택해야 합니다
 STR_6444    :보도 바닥
 STR_6445    :보도 난간
 STR_6446    :{WINDOW_COLOUR_2}바닥 이름: {BLACK}{STRINGID}
@@ -3775,3 +3775,19 @@ STR_6707    :(선택 안 함)
 STR_6708    :부드러움 강도
 STR_6709    :부드러움 강도를 {COMMA16}∼{COMMA16} 사이의 값으로 입력하세요
 STR_6710    :안정된 정렬
+STR_6711    :파일 이름:
+STR_6712    :저장
+STR_6713    :{COMMA32} {STRINGID}
+STR_6714    :파일 이름
+STR_6715    :수정 날짜
+STR_6716    :파일 크기
+STR_6717    :파일 크기 {STRINGID}
+STR_6718    :손님 애니메이션
+STR_6719    :최소 하나 이상의 손님 애니메이션 오브젝트를 선택해야 합니다
+STR_6720    :최소 하나 이상의 미화원 애니메이션 오브젝트를 선택해야 합니다
+STR_6721    :최소 하나 이상의 정비기술자 애니메이션 오브젝트를 선택해야 합니다
+STR_6722    :최소 하나 이상의 경비원 애니메이션 오브젝트를 선택해야 합니다
+STR_6723    :최소 하나 이상의 엔터테이너 애니메이션 오브젝트를 선택해야 합니다
+STR_6724    :시나리오 텍스트
+STR_6725    :X:
+STR_6726    :Y:

data/language/nl-NL.txt

@@ -2607,7 +2607,7 @@ STR_5368    :Crashstatus weg
 STR_5371    :Objectselectie
 STR_5372    :Sleeprichting van rechtermuisknop omkeren
 STR_5373    :Naam {STRINGID}
-STR_5374    :Datum {STRINGID}
+STR_5374    :Gewijzigd {STRINGID}
 STR_5375    :▲
 STR_5376    :▼
 STR_5404    :Naam bestaat al
@@ -3773,3 +3773,8 @@ STR_6709    :Voer een afrondsterkte in tussen {COMMA16} en {COMMA16}
 STR_6710    :Stabiel sorteren
 STR_6711    :Bestandsnaam:
 STR_6712    :Opslaan
+STR_6713    :{COMMA32} {STRINGID}
+STR_6714    :Naam
+STR_6715    :Gewijzigd
+STR_6716    :Grootte
+STR_6717    :Grootte {STRINGID}

data/language/pl-PL.txt

@@ -1093,7 +1093,7 @@ STR_1698    :Można to umieścić jedynie na ścieżce kolejki
 STR_1699    :Za dużo ludzi w grze
 STR_1700    :Zatrudnij dozorcę
 STR_1701    :Zatrudnij mechanika
-STR_1702    :Zatrudnij ochroniarza
+STR_1702    :Zatrudnij strażnika
 STR_1703    :Zatrudnij komika
 STR_1704    :Nie można zatrudnić nowych pracowników…
 STR_1705    :Zwolnij pracownika
@@ -2000,7 +2000,7 @@ STR_2804    :Podświetl tych pracowników na mapie
 STR_2805    :Pokaż plan parku
 STR_2806    :{RED}Goście skarżą się na fatalny stan ścieżek w twoim parku{NEWLINE}Sprawdź gdzie znajdują się twoi dozorcy i rozważ lepszą organizacje ich pracy
 STR_2807    :{RED}Goście skarżą się na śmieci leżące na ziemi w twoim parku{NEWLINE}Sprawdź gdzie znajdują się twoi dozorcy i rozważ lepszą organizację ich pracy
-STR_2808    :{RED}Goście skarzą się na wandalizm w twoim parku{NEWLINE}Sprawdź gdzie znajdują się twoi ochroniarze i rozważ poprawę organizacji ich pracy
+STR_2808    :{RED}Goście skarzą się na wandalizm w twoim parku{NEWLINE}Sprawdź gdzie znajdują się twoi strażnicy i rozważ poprawę organizacji ich pracy
 STR_2809    :{RED}Goście są głodni i nie mogą znaleźć miejsca gdzie mogliby kupić coś do jedzenia
 STR_2810    :{RED}Goście są spragnieni i nie mogą znaleźć miejsca gdzie mogliby kupić jakieś napoje
 STR_2811    :{RED}Goście się skarżą, że w twoim parku bardzo ciężko jest znaleźć toaletę
@@ -2201,7 +2201,7 @@ STR_3188    :Znaki drogowe
 STR_3189    :Klasyczne ścieżki
 STR_3190    :Dodatki drogowe
 STR_3191    :Grupa scenerii
-STR_3192    :Wejście do parku
+STR_3192    :Wejścia do parku
 STR_3193    :Woda
 STR_3195    :Lista wynalazków
 STR_3196    :{WINDOW_COLOUR_2}Grupa badawcza: {BLACK}{STRINGID}
@@ -3736,8 +3736,8 @@ STR_6671    :Pokazuj „prawdziwe” imiona pracowników
 STR_6672    :Przełącz między pokazywaniem imion pracowników a numerami
 STR_6673    :Przezroczyste
 STR_6674    :{MONTH}, Rok {COMMA16}
-STR_6675    :Imiona gości
-STR_6676    :Co najmniej jeden obiekt z nazwami gości musi być wybrany
+STR_6675    :Imiona postaci
+STR_6676    :Należy wybrać co najmniej jeden obiekt z nazwami postaci
 STR_6677    :Dodaj plaże wokół zbiorników wodnych
 STR_6678    :Źródło mapy wysokości:
 STR_6679    :Równina
@@ -3779,3 +3779,12 @@ STR_6714    :Nazwa pliku
 STR_6715    :Data modyfikacji
 STR_6716    :Rozmiar pliku
 STR_6717    :Rozmiar {STRINGID}
+STR_6718    :Animacje postaci
+STR_6719    :Należy wybrać co najmniej jeden obiekt animacji gościa
+STR_6720    :Należy wybrać co najmniej jeden obiekt animacji dozorcy
+STR_6721    :Należy wybrać co najmniej jeden obiekt animacji mechanika
+STR_6722    :Należy wybrać co najmniej jeden obiekt animacji strażnika
+STR_6723    :Należy wybrać co najmniej jeden obiekt animacji komika
+STR_6724    :Teksty scenariuszy
+STR_6725    :X:
+STR_6726    :Y:

data/language/pt-BR.txt

@@ -2201,7 +2201,7 @@ STR_3188    :Placa para Caminho
 STR_3189    :Calçadas Obsoletas
 STR_3190    :Caminhos Extras
 STR_3191    :Grupo de Cenários
-STR_3192    :Entrada do Parque
+STR_3192    :Entradas dos Parques
 STR_3193    :Água
 STR_3195    :Lista de Invenções
 STR_3196    :{WINDOW_COLOUR_2}Grupo de Pesquisa: {BLACK}{STRINGID}
@@ -3785,3 +3785,6 @@ STR_6720    :Ao menos um objeto de animação de pessoinha de faxineiro deve ser
 STR_6721    :Ao menos um objeto de animação de pessoinha de mecânico deve ser selecionado
 STR_6722    :Ao menos um objeto de animação de pessoinha de segurança deve ser selecionado
 STR_6723    :Ao menos um objeto de animação de pessoinha de animador deve ser selecionado
+STR_6724    :Textos dos Cenários
+STR_6725    :X:
+STR_6726    :Y:

data/language/ru-RU.txt

@@ -2162,7 +2162,6 @@ STR_3136    :Внимание: Этот дизайн будет построен
 STR_3137    :Выберите Ближайший Пейзаж
 STR_3138    :Сброс Выбора
 STR_3139    :Кабельный лифт не может работать в этом режиме
-STR_3140    :Кабельный лифт должен начинаться сразу после станции
 STR_3141    :Мульти-кольца невозможны с кабельным лифтом
 STR_3142    :{WINDOW_COLOUR_2}Вместимость: {BLACK}{STRINGID}
 STR_3143    :Показать людей на карте
@@ -2194,7 +2193,7 @@ STR_3188    :Знаки
 STR_3189    :Дорожки
 STR_3190    :Доп. пути
 STR_3191    :Группы пейзажа
-STR_3192    :Вход в парк
+STR_3192    :Входы в парк
 STR_3193    :Вода
 STR_3195    :Изобретения
 STR_3196    :{WINDOW_COLOUR_2} Разработка:  {BLACK}{STRINGID}
@@ -3773,3 +3772,7 @@ STR_6720    :Нужно выбрать хотя бы один объект ан
 STR_6721    :Нужно выбрать хотя бы один объект анимации механиков
 STR_6722    :Нужно выбрать хотя бы один объект анимации охранников
 STR_6723    :Нужно выбрать хотя бы один объект анимации развлекателей
+STR_6724    :Тексты сценариев
+STR_6725    :X:
+STR_6726    :Y:
+STR_6729    :Кабельный лифт должен начинаться сразу после станции или блок-тормоза

distribution/changelog.txt

@@ -1,13 +1,19 @@
 0.4.19 (in development)
 ------------------------------------------------------------------------
 - Feature: [#23328] Introducing peep animation objects, enabling custom entertainer costumes.
+- Feature: [#23569] Add large diagonal flat to steep and dive loop track pieces.
+- Improved: [#20683] Allow Giga Coaster cable lift to start after block brake section.
 - Improved: [#23328] The costume list in the staff window is now ordered alphabetically.
 - Improved: [#23540] The file browser now optionally shows a file size column.
 - Change: [#23328] All RCT2 entertainer costumes are now available in legacy parks.
+- Fix: [#1479] Incorrect values provided by the in game console “get location” command.
 - Fix: [#21794] Lay-down coaster cars reverse on first frames of downwards corkscrew.
+- Fix: [#23368] Incorrect refund amount when deleting track pieces at or above 96m.
 - Fix: [#23508] Simultaneous virtual floors shown for ride and footpath.
+- Fix: [#23512] Holding brakes are skipped if they’re too close together.
 - Fix: [#23581] [Plugin] Food/drink items given to guests have no consumption duration set.
 - Fix: [#23591] “Install new track” button in Track Designs Manager is misaligned.
+- Fix: [#23618] Can no longer build diagonal brakes & block brakes on Steeplechase, Inverted Lay-down, & Inverted Multi-Dim roller coasters.
 
 0.4.18 (2025-01-08)
 ------------------------------------------------------------------------

distribution/openrct2.d.ts

@@ -4874,6 +4874,9 @@ declare global {
         frameBase: number;
         frameCount?: number;
         frameDuration?: number;
+        primaryColour?: number;
+        secondaryColour?: number;
+        tertiaryColour?: number;
         offset?: ScreenCoordsXY;
     }
 

distribution/windows/readme.md

@@ -1,6 +1,4 @@
 # Windows Installer
 This directory contains the script and resources for the Windows installer. The installer is created using [Nullsoft Scriptable Install System (NSIS)](http://nsis.sourceforge.net) version v3.0a0+.
 
-As there is currently only a 32 bit version of OpenRCT2 available, the architecture and windows version checks have been disabled. These will be re-enabled once OpenRCT2 is a stand alone executable.
-
 Code based on [OpenTTD](http://openttd.org) installer.

openrct2.proj

@@ -45,14 +45,14 @@
     <LibsSha1 Condition="'$(Platform)'=='Win32'">9984c1e317dcfb3aaf8e17f1db2ebb0f771e2373</LibsSha1>
     <TitleSequencesUrl>https://github.com/OpenRCT2/title-sequences/releases/download/v0.4.14/title-sequences.zip</TitleSequencesUrl>
     <TitleSequencesSha1>6c04781b959b468e1f65ec2d2f21f5aaa5e5724d</TitleSequencesSha1>
-    <ObjectsUrl>https://github.com/OpenRCT2/objects/releases/download/v1.5.0/objects.zip</ObjectsUrl>
-    <ObjectsSha1>90c26f416ddaeb0c35490b7af89f4c6f9d6351f3</ObjectsSha1>
+    <ObjectsUrl>https://github.com/OpenRCT2/objects/releases/download/v1.5.1/objects.zip</ObjectsUrl>
+    <ObjectsSha1>e922b9fd779e7752176f1d0d8766c2ee6ad1e41b</ObjectsSha1>
     <OpenSFXUrl>https://github.com/OpenRCT2/OpenSoundEffects/releases/download/v1.0.5/opensound.zip</OpenSFXUrl>
     <OpenSFXSha1>b1b1f1b241d2cbff63a1889c4dc5a09bdf769bfb</OpenSFXSha1>
     <OpenMSXUrl>https://github.com/OpenRCT2/OpenMusic/releases/download/v1.6/openmusic.zip</OpenMSXUrl>
     <OpenMSXSha1>ba170fa6d777b309c15420f4b6eb3fa25082a9d1</OpenMSXSha1>
-    <ReplaysUrl>https://github.com/OpenRCT2/replays/releases/download/v0.0.85/replays.zip</ReplaysUrl>
-    <ReplaysSha1>2B0939953A41D2CE82809CB7C21FC3883578383F</ReplaysSha1>
+    <ReplaysUrl>https://github.com/OpenRCT2/replays/releases/download/v0.0.86/replays.zip</ReplaysUrl>
+    <ReplaysSha1>637E73F20C03DCD52ACA36FAEE15DADB31797FE0</ReplaysSha1>
   </PropertyGroup>
 
   <ItemGroup>

readme.md

@@ -226,7 +226,7 @@ OpenRCT2 requires original files of RollerCoaster Tycoon 2 to play. It can be bo
 ---
 
 # 4. Contributing
-OpenRCT2 uses the [gitflow workflow](https://www.atlassian.com/git/tutorials/comparing-workflows#gitflow-workflow). If you are implementing a new feature or logic from the original game, please branch off and perform pull requests to ```develop```. If you are fixing a bug for the next release, please branch off and perform pull requests to the correct release branch. ```master``` only contains tagged releases, you should never branch off this.
+OpenRCT2 uses the [gitflow workflow](https://www.atlassian.com/git/tutorials/comparing-workflows#gitflow-workflow). If you are implementing a new feature or fixing a bug, please branch off and perform pull requests to ```develop```. ```master``` only contains tagged releases, you should never branch off this.
 
 Please read our [contributing guidelines](https://github.com/OpenRCT2/OpenRCT2/blob/develop/CONTRIBUTING.md) for information.