mirror of https://github.com/OpenRCT2/OpenRCT2.git
Merge branch 'develop'
This commit is contained in:
Michał Janiszewski
commit
3ab71b6412
|
|
@ -1,5 +1,4 @@
|
|||
---
|
||||
Language: Cpp
|
||||
# BasedOnStyle: WebKit
|
||||
AccessModifierOffset: -4
|
||||
AlignAfterOpenBracket: AlwaysBreak
|
||||
|
|
@ -10,7 +9,7 @@ AlignOperands: false
|
|||
AlignTrailingComments: true
|
||||
AllowAllParametersOfDeclarationOnNextLine: true
|
||||
AllowShortBlocksOnASingleLine: false
|
||||
AllowShortCaseLabelsOnASingleLine: true
|
||||
AllowShortCaseLabelsOnASingleLine: false
|
||||
AllowShortFunctionsOnASingleLine: None
|
||||
AllowShortIfStatementsOnASingleLine: false
|
||||
AllowShortLoopsOnASingleLine: false
|
||||
|
|
@ -18,8 +17,8 @@ AlwaysBreakAfterDefinitionReturnType: None
|
|||
AlwaysBreakAfterReturnType: None
|
||||
AlwaysBreakBeforeMultilineStrings: false
|
||||
AlwaysBreakTemplateDeclarations: false
|
||||
BinPackArguments: false
|
||||
BinPackParameters: false
|
||||
BinPackArguments: true
|
||||
BinPackParameters: true
|
||||
BraceWrapping:
|
||||
AfterClass: true
|
||||
AfterControlStatement: true
|
||||
|
|
@ -63,20 +62,21 @@ IncludeCategories:
|
|||
- Regex: '^<'
|
||||
Priority: 2
|
||||
IndentCaseLabels: true
|
||||
IndentPPDirectives: AfterHash
|
||||
IndentWidth: 4
|
||||
IndentWrappedFunctionNames: true
|
||||
KeepEmptyLinesAtTheStartOfBlocks: false
|
||||
MacroBlockBegin: ''
|
||||
MacroBlockEnd: ''
|
||||
MaxEmptyLinesToKeep: 1
|
||||
NamespaceIndentation: None
|
||||
PenaltyBreakAssignment: 2
|
||||
NamespaceIndentation: All
|
||||
PenaltyBreakAssignment: 1000
|
||||
PenaltyBreakBeforeFirstCallParameter: 19
|
||||
PenaltyBreakComment: 300
|
||||
PenaltyBreakFirstLessLess: 120
|
||||
PenaltyBreakString: 1000
|
||||
PenaltyExcessCharacter: 1000000
|
||||
PenaltyReturnTypeOnItsOwnLine: 60
|
||||
PenaltyReturnTypeOnItsOwnLine: 1000
|
||||
PointerAlignment: Left
|
||||
ReflowComments: true
|
||||
SortIncludes: true
|
||||
|
|
|
|||
|
|
@ -163,6 +163,11 @@ matrix:
|
|||
- if [[ "z$OPENRCT2_ORG_TOKEN" != "z" && "$TRAVIS_PULL_REQUEST" == "false" && ("${TRAVIS_BRANCH}" =~ ^(develop|push/) || "z${TRAVIS_TAG}" != "z") ]] ; then
|
||||
curl -o - -v --form "key=$OPENRCT2_ORG_TOKEN" --form "fileName=OpenRCT2-${OPENRCT2_VERSION}${FILENAME_PART}-android-x86.apk" --form "version=${OPENRCT2_VERSION}" --form "gitHash=$TRAVIS_COMMIT" --form "gitBranch=$PUSH_BRANCH" --form "flavourId=12" --form "file=@app/build/outputs/apk/app-x86-pr.apk" "https://openrct2.org/altapi/?command=push-build";
|
||||
fi
|
||||
- os: linux
|
||||
services:
|
||||
- docker
|
||||
script:
|
||||
- docker run --rm -w /openrct2 -v $(pwd):/openrct2 openrct2/openrct2:format ./scripts/run-clang-format.py -r src test --exclude src/openrct2/thirdparty
|
||||
# Following entries used to be included in testing, but they only proved useful while changing things in CMake setup.
|
||||
# They are meant to be used when there are changes to CMakeLists.txt
|
||||
# - os: linux
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
# CMAKE project for openrct2
|
||||
cmake_minimum_required(VERSION 3.1)
|
||||
cmake_minimum_required(VERSION 3.8)
|
||||
if (CMAKE_BINARY_DIR STREQUAL CMAKE_SOURCE_DIR)
|
||||
message(FATAL_ERROR "Building in-source is not supported! Create a build dir and remove ${CMAKE_SOURCE_DIR}/CMakeCache.txt")
|
||||
endif()
|
||||
|
|
@ -12,14 +12,17 @@ endif ()
|
|||
include(CheckCXXCompilerFlag)
|
||||
include(GNUInstallDirs)
|
||||
|
||||
set(CMAKE_CXX_STANDARD 17)
|
||||
set(CMAKE_CXX_STANDARD_REQUIRED ON)
|
||||
|
||||
set(ROOT_DIR "${CMAKE_CURRENT_LIST_DIR}")
|
||||
set(CMAKE_MACOSX_RPATH 1)
|
||||
|
||||
set(TITLE_SEQUENCE_URL "https://github.com/OpenRCT2/title-sequences/releases/download/v0.1.2/title-sequence-v0.1.2.zip")
|
||||
set(TITLE_SEQUENCE_SHA1 "1136ef92bfb05cd1cba9831ba6dc4a653d87a246")
|
||||
|
||||
set(OBJECTS_URL "https://github.com/OpenRCT2/objects/releases/download/v1.0.2/objects.zip")
|
||||
set(OBJECTS_SHA1 "acf853ff6fa4285cea94cc9d8f74730e57202d06")
|
||||
set(OBJECTS_URL "https://github.com/OpenRCT2/objects/releases/download/v1.0.6/objects.zip")
|
||||
set(OBJECTS_SHA1 "61c70237814dc0f5aee5e9219f2ff232ea1a6111")
|
||||
|
||||
option(FORCE32 "Force 32-bit build. It will add `-m32` to compiler flags.")
|
||||
option(WITH_TESTS "Build tests")
|
||||
|
|
@ -47,6 +50,16 @@ if (PORTABLE OR WIN32)
|
|||
set(CMAKE_INSTALL_RPATH "$ORIGIN")
|
||||
endif ()
|
||||
|
||||
# Describe current version in terms of closest tag
|
||||
execute_process(
|
||||
COMMAND git describe HEAD
|
||||
COMMAND sed -E "s/-g.+$//"
|
||||
WORKING_DIRECTORY ${ROOT_DIR}
|
||||
OUTPUT_VARIABLE OPENRCT2_VERSION_TAG
|
||||
OUTPUT_STRIP_TRAILING_WHITESPACE
|
||||
ERROR_QUIET
|
||||
)
|
||||
|
||||
# Define current git branch
|
||||
execute_process(
|
||||
COMMAND git rev-parse --abbrev-ref HEAD
|
||||
|
|
@ -75,7 +88,7 @@ function (ADD_CHECK_CXX_COMPILER_FLAG _CXXFLAGS _CACHE_VAR _FLAG)
|
|||
endfunction ()
|
||||
|
||||
if (MSVC)
|
||||
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /utf-8 /std:c++latest /permissive- /Zc:externConstexpr /WX")
|
||||
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /utf-8 /permissive- /Zc:externConstexpr /WX")
|
||||
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /wd4244") # C4244: 'conversion_type': conversion from 'type1' to 'type2', possible loss of data
|
||||
|
||||
add_definitions(-D_CRT_SECURE_NO_WARNINGS)
|
||||
|
|
@ -96,6 +109,9 @@ else ()
|
|||
ADD_CHECK_CXX_COMPILER_FLAG(CMAKE_CXX_FLAGS CXX_WARN_UNREACHABLE_CODE_BREAK -Wunreachable-code-break)
|
||||
ADD_CHECK_CXX_COMPILER_FLAG(CMAKE_CXX_FLAGS CXX_WARN_LOGICAL_OP -Wlogical-op)
|
||||
ADD_CHECK_CXX_COMPILER_FLAG(CMAKE_CXX_FLAGS CXX_WARN_RANGE_LOOP_ANALYSIS -Wrange-loop-analysis)
|
||||
ADD_CHECK_CXX_COMPILER_FLAG(CMAKE_CXX_FLAGS CXX_WARN_TAUTOLOGICAL_ZERO_COMPARE -Wtautological-unsigned-zero-compare)
|
||||
# Disabled due to problems compiling OpenSSL on macOS.
|
||||
# ADD_CHECK_CXX_COMPILER_FLAG(CMAKE_CXX_FLAGS CXX_WARN_DOCUMENTATION -Wdocumentation)
|
||||
|
||||
# Items below are not supported by ICC
|
||||
if (NOT MINGW)
|
||||
|
|
@ -103,35 +119,33 @@ else ()
|
|||
ADD_CHECK_CXX_COMPILER_FLAG(CMAKE_CXX_FLAGS CXX_WARN_REDUNDANT_DECLS -Wredundant-decls)
|
||||
endif ()
|
||||
ADD_CHECK_CXX_COMPILER_FLAG(CMAKE_CXX_FLAGS CXX_WARN_IGNORED_QUALIFIERS -Wignored-qualifiers)
|
||||
|
||||
|
||||
# -Wstrict-overflow is only active when -fstrict-overflow is enabled, but -fstrict-overflow
|
||||
# is enabled on -O2, -O3, -Os. This should help catch bugs locally before they reach Travis
|
||||
# As of 2a435bf -Wstrict-overflow=1 passes, but higher values do not.
|
||||
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fstrict-overflow")
|
||||
ADD_CHECK_CXX_COMPILER_FLAG(CMAKE_CXX_FLAGS CXX_WARN_STRICT_OVERFLOW -Wstrict-overflow=1)
|
||||
|
||||
|
||||
# Compiler flags
|
||||
set(DEBUG_LEVEL 0 CACHE STRING "Select debug level for compilation. Use value in range 0–3.")
|
||||
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fstrict-aliasing -Werror -Wundef -Wmissing-declarations -Winit-self -Wall -Wno-unknown-pragmas -Wno-missing-braces ")
|
||||
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-comment -Wshadow -Wnonnull")
|
||||
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DDEBUG=${DEBUG_LEVEL}")
|
||||
|
||||
|
||||
if(APPLE)
|
||||
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-error=objc-method-access")
|
||||
endif()
|
||||
|
||||
|
||||
# On mingw all code is already PIC, this will avoid compiler error on redefining this option
|
||||
if (NOT MINGW)
|
||||
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fPIC")
|
||||
set(CMAKE_POSITION_INDEPENDENT_CODE ON)
|
||||
endif ()
|
||||
|
||||
|
||||
if (APPLE AND NOT USE_MMAP)
|
||||
set(PIE_FLAG "-fno-pie")
|
||||
set(CMAKE_POSITION_INDEPENDENT_CODE OFF)
|
||||
else ()
|
||||
set(PIE_FLAG "-fpie")
|
||||
set(CMAKE_POSITION_INDEPENDENT_CODE ON)
|
||||
endif ()
|
||||
|
||||
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=gnu++17")
|
||||
endif ()
|
||||
|
||||
# Defines
|
||||
|
|
|
|||
|
|
@ -33,6 +33,11 @@
|
|||
9308DA03209908090079EE96 /* Surface.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9308D9FB209908080079EE96 /* Surface.cpp */; };
|
||||
9308DA04209908090079EE96 /* TileElement.h in Headers */ = {isa = PBXBuildFile; fileRef = 9308D9FC209908080079EE96 /* TileElement.h */; };
|
||||
9308DA05209908090079EE96 /* Surface.h in Headers */ = {isa = PBXBuildFile; fileRef = 9308D9FD209908090079EE96 /* Surface.h */; };
|
||||
933CBDB520CB1ACD00134678 /* Widget.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 933CBDB120CB1ACC00134678 /* Widget.cpp */; };
|
||||
933CBDB620CB1ACD00134678 /* Theme.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 933CBDB220CB1ACD00134678 /* Theme.cpp */; };
|
||||
933CBDBB20CB1B3F00134678 /* TitleSequencePlayer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 933CBDB920CB1B3F00134678 /* TitleSequencePlayer.cpp */; };
|
||||
933CBDBD20CB1BA900134678 /* ViewportInteraction.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 933CBDBC20CB1BA900134678 /* ViewportInteraction.cpp */; };
|
||||
933CBDBF20CB1BCA00134678 /* Window.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 933CBDBE20CB1BCA00134678 /* Window.cpp */; };
|
||||
933F2CB720935653001B33FD /* LocalisationService.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 933F2CB620935653001B33FD /* LocalisationService.cpp */; };
|
||||
933F2CB820935653001B33FD /* LocalisationService.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 933F2CB620935653001B33FD /* LocalisationService.cpp */; };
|
||||
933F2CB920935653001B33FD /* LocalisationService.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 933F2CB620935653001B33FD /* LocalisationService.cpp */; };
|
||||
|
|
@ -240,10 +245,7 @@
|
|||
C688789220289B140084B384 /* FontFamilies.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4C7B53E4200143C200A52E21 /* FontFamilies.cpp */; };
|
||||
C688789320289B140084B384 /* Fonts.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4C7B53E6200143C200A52E21 /* Fonts.cpp */; };
|
||||
C688789420289B140084B384 /* Screenshot.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4C7B53E8200143C200A52E21 /* Screenshot.cpp */; };
|
||||
C688789520289B140084B384 /* Theme.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4C7B53EA200143C200A52E21 /* Theme.cpp */; };
|
||||
C688789620289B140084B384 /* Viewport.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4C7B53EC200143C200A52E21 /* Viewport.cpp */; };
|
||||
C688789720289B140084B384 /* ViewportInteraction.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4C7B53EE200143C200A52E21 /* ViewportInteraction.cpp */; };
|
||||
C688789820289B140084B384 /* Widget.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4C7B53EF200143C200A52E21 /* Widget.cpp */; };
|
||||
C688789920289B140084B384 /* Window.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4C7B53F1200143C200A52E21 /* Window.cpp */; };
|
||||
C688789A20289B200084B384 /* ConversionTables.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4C7B53C61FFF94F900A52E21 /* ConversionTables.cpp */; };
|
||||
C688789B20289B200084B384 /* Convert.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4C7B53AA1FFF935B00A52E21 /* Convert.cpp */; };
|
||||
|
|
@ -476,7 +478,6 @@
|
|||
F76C87381EC4E88400FA49E2 /* TitleScreen.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F76C84FC1EC4E7CD00FA49E2 /* TitleScreen.cpp */; };
|
||||
F76C873A1EC4E88400FA49E2 /* TitleSequence.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F76C84FE1EC4E7CD00FA49E2 /* TitleSequence.cpp */; };
|
||||
F76C873C1EC4E88400FA49E2 /* TitleSequenceManager.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F76C85001EC4E7CD00FA49E2 /* TitleSequenceManager.cpp */; };
|
||||
F76C873E1EC4E88400FA49E2 /* TitleSequencePlayer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F76C85021EC4E7CD00FA49E2 /* TitleSequencePlayer.cpp */; };
|
||||
F76C87451EC4E88400FA49E2 /* Version.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F76C850B1EC4E7CD00FA49E2 /* Version.cpp */; };
|
||||
F76C88781EC5324E00FA49E2 /* AudioChannel.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F76C85821EC4E82600FA49E2 /* AudioChannel.cpp */; };
|
||||
F76C88791EC5324E00FA49E2 /* AudioContext.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F76C85831EC4E82600FA49E2 /* AudioContext.cpp */; };
|
||||
|
|
@ -674,12 +675,8 @@
|
|||
4C7B53E7200143C200A52E21 /* Fonts.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Fonts.h; sourceTree = "<group>"; };
|
||||
4C7B53E8200143C200A52E21 /* Screenshot.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Screenshot.cpp; sourceTree = "<group>"; };
|
||||
4C7B53E9200143C200A52E21 /* Screenshot.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Screenshot.h; sourceTree = "<group>"; };
|
||||
4C7B53EA200143C200A52E21 /* Theme.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Theme.cpp; sourceTree = "<group>"; };
|
||||
4C7B53EB200143C200A52E21 /* themes.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = themes.h; sourceTree = "<group>"; };
|
||||
4C7B53EC200143C200A52E21 /* Viewport.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Viewport.cpp; sourceTree = "<group>"; };
|
||||
4C7B53ED200143C200A52E21 /* Viewport.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Viewport.h; sourceTree = "<group>"; };
|
||||
4C7B53EE200143C200A52E21 /* ViewportInteraction.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ViewportInteraction.cpp; sourceTree = "<group>"; };
|
||||
4C7B53EF200143C200A52E21 /* Widget.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Widget.cpp; sourceTree = "<group>"; };
|
||||
4C7B53F0200143C200A52E21 /* Widget.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Widget.h; sourceTree = "<group>"; };
|
||||
4C7B53F1200143C200A52E21 /* Window.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Window.cpp; sourceTree = "<group>"; };
|
||||
4C7B53F2200143C200A52E21 /* Window.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Window.h; sourceTree = "<group>"; };
|
||||
|
|
@ -868,6 +865,13 @@
|
|||
9308D9FB209908080079EE96 /* Surface.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Surface.cpp; sourceTree = "<group>"; };
|
||||
9308D9FC209908080079EE96 /* TileElement.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TileElement.h; sourceTree = "<group>"; };
|
||||
9308D9FD209908090079EE96 /* Surface.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Surface.h; sourceTree = "<group>"; };
|
||||
933CBDB120CB1ACC00134678 /* Widget.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Widget.cpp; sourceTree = "<group>"; };
|
||||
933CBDB220CB1ACD00134678 /* Theme.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Theme.cpp; sourceTree = "<group>"; };
|
||||
933CBDB320CB1ACD00134678 /* Theme.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Theme.h; sourceTree = "<group>"; };
|
||||
933CBDB920CB1B3F00134678 /* TitleSequencePlayer.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = TitleSequencePlayer.cpp; sourceTree = "<group>"; };
|
||||
933CBDBA20CB1B3F00134678 /* TitleSequencePlayer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TitleSequencePlayer.h; sourceTree = "<group>"; };
|
||||
933CBDBC20CB1BA900134678 /* ViewportInteraction.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ViewportInteraction.cpp; sourceTree = "<group>"; };
|
||||
933CBDBE20CB1BCA00134678 /* Window.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Window.cpp; sourceTree = "<group>"; };
|
||||
933F2CB620935653001B33FD /* LocalisationService.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = LocalisationService.cpp; sourceTree = "<group>"; };
|
||||
933F2CBA20935668001B33FD /* LocalisationService.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LocalisationService.h; sourceTree = "<group>"; };
|
||||
9344BEF720C1E6180047D165 /* Crypt.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Crypt.h; sourceTree = "<group>"; };
|
||||
|
|
@ -1583,7 +1587,6 @@
|
|||
F76C84FF1EC4E7CD00FA49E2 /* TitleSequence.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = TitleSequence.h; sourceTree = "<group>"; };
|
||||
F76C85001EC4E7CD00FA49E2 /* TitleSequenceManager.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = TitleSequenceManager.cpp; sourceTree = "<group>"; };
|
||||
F76C85011EC4E7CD00FA49E2 /* TitleSequenceManager.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = TitleSequenceManager.h; sourceTree = "<group>"; };
|
||||
F76C85021EC4E7CD00FA49E2 /* TitleSequencePlayer.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = TitleSequencePlayer.cpp; sourceTree = "<group>"; };
|
||||
F76C85031EC4E7CD00FA49E2 /* TitleSequencePlayer.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = TitleSequencePlayer.h; sourceTree = "<group>"; };
|
||||
F76C85051EC4E7CD00FA49E2 /* UiContext.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = UiContext.h; sourceTree = "<group>"; };
|
||||
F76C850B1EC4E7CD00FA49E2 /* Version.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = Version.cpp; sourceTree = "<group>"; };
|
||||
|
|
@ -1703,6 +1706,16 @@
|
|||
path = thirdparty;
|
||||
sourceTree = "<group>";
|
||||
};
|
||||
933CBDB820CB1B3F00134678 /* title */ = {
|
||||
isa = PBXGroup;
|
||||
children = (
|
||||
933CBDB920CB1B3F00134678 /* TitleSequencePlayer.cpp */,
|
||||
933CBDBA20CB1B3F00134678 /* TitleSequencePlayer.h */,
|
||||
);
|
||||
name = title;
|
||||
path = "src/openrct2-ui/title";
|
||||
sourceTree = SOURCE_ROOT;
|
||||
};
|
||||
9350B44320B46E0800897BC5 /* unicode */ = {
|
||||
isa = PBXGroup;
|
||||
children = (
|
||||
|
|
@ -1985,8 +1998,13 @@
|
|||
4C3B4235205914F7000C5BB7 /* InGameConsole.h */,
|
||||
C68313D31FDB4F4C006DB3D8 /* LandTool.cpp */,
|
||||
C68313D41FDB4F4C006DB3D8 /* LandTool.h */,
|
||||
933CBDB220CB1ACD00134678 /* Theme.cpp */,
|
||||
933CBDB320CB1ACD00134678 /* Theme.h */,
|
||||
C67B28142002D67900109C93 /* Viewport.h */,
|
||||
933CBDBC20CB1BA900134678 /* ViewportInteraction.cpp */,
|
||||
933CBDB120CB1ACC00134678 /* Widget.cpp */,
|
||||
C67B28122002D67900109C93 /* Widget.h */,
|
||||
933CBDBE20CB1BCA00134678 /* Window.cpp */,
|
||||
C67B28132002D67900109C93 /* Window.h */,
|
||||
);
|
||||
path = interface;
|
||||
|
|
@ -2503,12 +2521,8 @@
|
|||
4C7B53E8200143C200A52E21 /* Screenshot.cpp */,
|
||||
4C7B53E9200143C200A52E21 /* Screenshot.h */,
|
||||
4C3B423720591513000C5BB7 /* StdInOutConsole.cpp */,
|
||||
4C7B53EA200143C200A52E21 /* Theme.cpp */,
|
||||
4C7B53EB200143C200A52E21 /* themes.h */,
|
||||
4C7B53EC200143C200A52E21 /* Viewport.cpp */,
|
||||
4C7B53ED200143C200A52E21 /* Viewport.h */,
|
||||
4C7B53EE200143C200A52E21 /* ViewportInteraction.cpp */,
|
||||
4C7B53EF200143C200A52E21 /* Widget.cpp */,
|
||||
4C7B53F0200143C200A52E21 /* Widget.h */,
|
||||
C67B28182002D7F200109C93 /* Window_internal.h */,
|
||||
4C7B53F1200143C200A52E21 /* Window.cpp */,
|
||||
|
|
@ -2952,7 +2966,6 @@
|
|||
F76C84FF1EC4E7CD00FA49E2 /* TitleSequence.h */,
|
||||
F76C85001EC4E7CD00FA49E2 /* TitleSequenceManager.cpp */,
|
||||
F76C85011EC4E7CD00FA49E2 /* TitleSequenceManager.h */,
|
||||
F76C85021EC4E7CD00FA49E2 /* TitleSequencePlayer.cpp */,
|
||||
F76C85031EC4E7CD00FA49E2 /* TitleSequencePlayer.h */,
|
||||
);
|
||||
path = title;
|
||||
|
|
@ -3056,6 +3069,7 @@
|
|||
F76C858D1EC4E82600FA49E2 /* drawing */,
|
||||
F7CB86451EEDA1200030C877 /* input */,
|
||||
C68313CF1FDB4F4C006DB3D8 /* interface */,
|
||||
933CBDB820CB1B3F00134678 /* title */,
|
||||
F7CB86401EEDA0E20030C877 /* windows */,
|
||||
F76C858A1EC4E82600FA49E2 /* CursorData.cpp */,
|
||||
F76C858B1EC4E82600FA49E2 /* CursorRepository.cpp */,
|
||||
|
|
@ -3422,7 +3436,7 @@
|
|||
);
|
||||
runOnlyForDeploymentPostprocessing = 0;
|
||||
shellPath = /bin/sh;
|
||||
shellScript = "version=\"1.0.2\"\nzipname=\"objects.zip\"\nliburl=\"https://github.com/OpenRCT2/objects/releases/download/v$version/$zipname\"\n\n[[ ! -d \"${SRCROOT}/data/object\" || ! -e \"${SRCROOT}/objectsversion\" || $(head -n 1 \"${SRCROOT}/objectsversion\") != $version ]]\noutdated=$?\n\nif [[ $outdated -eq 0 ]]; then\nif [[ -d \"${SRCROOT}/data/object\" ]]; then rm -r \"${SRCROOT}/data/object\"; fi\nmkdir -p \"${SRCROOT}/data/object\"\n\ncurl -L -o \"${SRCROOT}/data/object/$zipname\" \"$liburl\"\nunzip -uaq -d \"${SRCROOT}/data/object\" \"${SRCROOT}/data/object/$zipname\"\nrm \"${SRCROOT}/data/object/$zipname\"\n\necho $version > \"${SRCROOT}/objectsversion\"\nfi";
|
||||
shellScript = "version=\"1.0.6\"\nzipname=\"objects.zip\"\nliburl=\"https://github.com/OpenRCT2/objects/releases/download/v$version/$zipname\"\n\n[[ ! -d \"${SRCROOT}/data/object\" || ! -e \"${SRCROOT}/objectsversion\" || $(head -n 1 \"${SRCROOT}/objectsversion\") != $version ]]\noutdated=$?\n\nif [[ $outdated -eq 0 ]]; then\nif [[ -d \"${SRCROOT}/data/object\" ]]; then rm -r \"${SRCROOT}/data/object\"; fi\nmkdir -p \"${SRCROOT}/data/object\"\n\ncurl -L -o \"${SRCROOT}/data/object/$zipname\" \"$liburl\"\nunzip -uaq -d \"${SRCROOT}/data/object\" \"${SRCROOT}/data/object/$zipname\"\nrm \"${SRCROOT}/data/object/$zipname\"\n\necho $version > \"${SRCROOT}/objectsversion\"\nfi";
|
||||
};
|
||||
C68B2D471EC790710020651C /* Download Libraries */ = {
|
||||
isa = PBXShellScriptBuildPhase;
|
||||
|
|
@ -3468,7 +3482,8 @@
|
|||
);
|
||||
runOnlyForDeploymentPostprocessing = 0;
|
||||
shellPath = /bin/sh;
|
||||
shellScript = "echo \"#define\" OPENRCT2_BRANCH \\\"$(git rev-parse --abbrev-ref HEAD)\\\" > \"${DERIVED_FILE_DIR}/gitversion.h\"\necho \"#define\" OPENRCT2_COMMIT_SHA1 \\\"$(git rev-parse HEAD)\\\" >> \"${DERIVED_FILE_DIR}/gitversion.h\"\necho \"#define\" OPENRCT2_COMMIT_SHA1_SHORT \\\"$(git rev-parse --short HEAD)\\\" >> \"${DERIVED_FILE_DIR}/gitversion.h\"\ncp \"${SRCROOT}/distribution/macos/Info.plist\" \"${DERIVED_FILE_DIR}/Info.plist\"\nplutil -replace CFBundleVersion -string \"$(git rev-parse --short HEAD)\" \"${DERIVED_FILE_DIR}/Info.plist\"";
|
||||
shellScript = "echo \"#define\" OPENRCT2_VERSION_TAG \\\"$(git describe HEAD | sed -E 's/-g.+$//')\\\" > \"${DERIVED_FILE_DIR}/gitversion.h\"\n\nbranch=$(git rev-parse --abbrev-ref HEAD)\nif [ \"$branch\" != \"master\" ]; then\necho \"#define\" OPENRCT2_BRANCH \\\"$branch\\\" >> \"${DERIVED_FILE_DIR}/gitversion.h\"\nfi\n\nshortsha1=$(git rev-parse --short HEAD)\nif [ \"$shortsha1\" != \"HEAD\" ]; then\necho \"#define\" OPENRCT2_COMMIT_SHA1_SHORT \\\"$shortsha1\\\" >> \"${DERIVED_FILE_DIR}/gitversion.h\"\nfi\n\ncp \"${SRCROOT}/distribution/macos/Info.plist\" \"${DERIVED_FILE_DIR}/Info.plist\"\nplutil -replace CFBundleVersion -string \"$(git rev-parse --short HEAD)\" \"${DERIVED_FILE_DIR}/Info.plist\"";
|
||||
showEnvVarsInLog = 0;
|
||||
};
|
||||
D4E09E831E049C0600F53CE3 /* Download Title Sequences */ = {
|
||||
isa = PBXShellScriptBuildPhase;
|
||||
|
|
@ -3482,7 +3497,7 @@
|
|||
);
|
||||
runOnlyForDeploymentPostprocessing = 0;
|
||||
shellPath = /bin/sh;
|
||||
shellScript = "version=\"0.2.0\"\nzipname=\"title-sequence-v$version.zip\"\nliburl=\"https://github.com/OpenRCT2/title-sequences/releases/download/v$version/$zipname\"\n\n[[ ! -d \"${SRCROOT}/data/title\" || ! -e \"${SRCROOT}/sequencesversion\" || $(head -n 1 \"${SRCROOT}/sequencesversion\") != $version ]]\noutdated=$?\n\nif [[ $outdated -eq 0 ]]; then\nif [[ -d \"${SRCROOT}/data/title\" ]]; then rm -r \"${SRCROOT}/data/title\"; fi\nmkdir -p \"${SRCROOT}/data/title\"\n\ncurl -L -o \"${SRCROOT}/data/title/$zipname\" \"$liburl\"\nunzip -uaq -d \"${SRCROOT}/data/title\" \"${SRCROOT}/data/title/$zipname\"\nrm \"${SRCROOT}/data/title/$zipname\"\n\necho $version > \"${SRCROOT}/sequencesversion\"\nfi";
|
||||
shellScript = "version=\"0.1.2\"\nzipname=\"title-sequence-v$version.zip\"\nliburl=\"https://github.com/OpenRCT2/title-sequences/releases/download/v$version/$zipname\"\n\n[[ ! -d \"${SRCROOT}/data/title\" || ! -e \"${SRCROOT}/sequencesversion\" || $(head -n 1 \"${SRCROOT}/sequencesversion\") != $version ]]\noutdated=$?\n\nif [[ $outdated -eq 0 ]]; then\nif [[ -d \"${SRCROOT}/data/title\" ]]; then rm -r \"${SRCROOT}/data/title\"; fi\nmkdir -p \"${SRCROOT}/data/title\"\n\ncurl -L -o \"${SRCROOT}/data/title/$zipname\" \"$liburl\"\nunzip -uaq -d \"${SRCROOT}/data/title\" \"${SRCROOT}/data/title/$zipname\"\nrm \"${SRCROOT}/data/title/$zipname\"\n\necho $version > \"${SRCROOT}/sequencesversion\"\nfi";
|
||||
};
|
||||
D4EC012A1C25532B00DAFE69 /* Setup AppIcon */ = {
|
||||
isa = PBXShellScriptBuildPhase;
|
||||
|
|
@ -3529,7 +3544,8 @@
|
|||
);
|
||||
runOnlyForDeploymentPostprocessing = 0;
|
||||
shellPath = /bin/sh;
|
||||
shellScript = "echo \"#define\" OPENRCT2_BRANCH \\\"$(git rev-parse --abbrev-ref HEAD)\\\" > \"${DERIVED_FILE_DIR}/gitversion.h\"\necho \"#define\" OPENRCT2_COMMIT_SHA1 \\\"$(git rev-parse HEAD)\\\" >> \"${DERIVED_FILE_DIR}/gitversion.h\"\necho \"#define\" OPENRCT2_COMMIT_SHA1_SHORT \\\"$(git rev-parse --short HEAD)\\\" >> \"${DERIVED_FILE_DIR}/gitversion.h\"\ncp \"${SRCROOT}/distribution/macos/Info.plist\" \"${DERIVED_FILE_DIR}/Info.plist\"\nplutil -replace CFBundleVersion -string \"$(git rev-parse --short HEAD)\" \"${DERIVED_FILE_DIR}/Info.plist\"";
|
||||
shellScript = "echo \"#define\" OPENRCT2_VERSION_TAG \\\"$(git describe HEAD | sed -E 's/-g.+$//')\\\" > \"${DERIVED_FILE_DIR}/gitversion.h\"\n\nbranch=$(git rev-parse --abbrev-ref HEAD)\nif [ \"$branch\" != \"master\" ]; then\necho \"#define\" OPENRCT2_BRANCH \\\"$branch\\\" >> \"${DERIVED_FILE_DIR}/gitversion.h\"\nfi\n\nshortsha1=$(git rev-parse --short HEAD)\nif [ \"$shortsha1\" != \"HEAD\" ]; then\necho \"#define\" OPENRCT2_COMMIT_SHA1_SHORT \\\"$shortsha1\\\" >> \"${DERIVED_FILE_DIR}/gitversion.h\"\nfi\n\ncp \"${SRCROOT}/distribution/macos/Info.plist\" \"${DERIVED_FILE_DIR}/Info.plist\"\nplutil -replace CFBundleVersion -string \"$(git rev-parse --short HEAD)\" \"${DERIVED_FILE_DIR}/Info.plist\"";
|
||||
showEnvVarsInLog = 0;
|
||||
};
|
||||
F7D7748C1EC66E9300BE6EBC /* Get Git Variables */ = {
|
||||
isa = PBXShellScriptBuildPhase;
|
||||
|
|
@ -3545,7 +3561,8 @@
|
|||
);
|
||||
runOnlyForDeploymentPostprocessing = 0;
|
||||
shellPath = /bin/sh;
|
||||
shellScript = "echo \"#define\" OPENRCT2_BRANCH \\\"$(git rev-parse --abbrev-ref HEAD)\\\" > \"${DERIVED_FILE_DIR}/gitversion.h\"\necho \"#define\" OPENRCT2_COMMIT_SHA1 \\\"$(git rev-parse HEAD)\\\" >> \"${DERIVED_FILE_DIR}/gitversion.h\"\necho \"#define\" OPENRCT2_COMMIT_SHA1_SHORT \\\"$(git rev-parse --short HEAD)\\\" >> \"${DERIVED_FILE_DIR}/gitversion.h\"\ncp \"${SRCROOT}/distribution/macos/Info.plist\" \"${DERIVED_FILE_DIR}/Info.plist\"\nplutil -replace CFBundleVersion -string \"$(git rev-parse --short HEAD)\" \"${DERIVED_FILE_DIR}/Info.plist\"";
|
||||
shellScript = "echo \"#define\" OPENRCT2_VERSION_TAG \\\"$(git describe HEAD | sed -E 's/-g.+$//')\\\" > \"${DERIVED_FILE_DIR}/gitversion.h\"\n\nbranch=$(git rev-parse --abbrev-ref HEAD)\nif [ \"$branch\" != \"master\" ]; then\necho \"#define\" OPENRCT2_BRANCH \\\"$branch\\\" >> \"${DERIVED_FILE_DIR}/gitversion.h\"\nfi\n\nshortsha1=$(git rev-parse --short HEAD)\nif [ \"$shortsha1\" != \"HEAD\" ]; then\necho \"#define\" OPENRCT2_COMMIT_SHA1_SHORT \\\"$shortsha1\\\" >> \"${DERIVED_FILE_DIR}/gitversion.h\"\nfi\n\ncp \"${SRCROOT}/distribution/macos/Info.plist\" \"${DERIVED_FILE_DIR}/Info.plist\"\nplutil -replace CFBundleVersion -string \"$(git rev-parse --short HEAD)\" \"${DERIVED_FILE_DIR}/Info.plist\"";
|
||||
showEnvVarsInLog = 0;
|
||||
};
|
||||
/* End PBXShellScriptBuildPhase section */
|
||||
|
||||
|
|
@ -3571,6 +3588,7 @@
|
|||
C666EE7F1F37ACB10061AA04 /* Viewport.cpp in Sources */,
|
||||
C632C81F1F8A445700781F6D /* RideList.cpp in Sources */,
|
||||
C68878C420289B710084B384 /* OpenGLAPI.cpp in Sources */,
|
||||
933CBDBB20CB1B3F00134678 /* TitleSequencePlayer.cpp in Sources */,
|
||||
C654DF3C1F69C0430040F43D /* TrackDesignManage.cpp in Sources */,
|
||||
C654DF3B1F69C0430040F43D /* TitleScenarioSelect.cpp in Sources */,
|
||||
C64645001F3FA4120026AC2D /* ViewClipping.cpp in Sources */,
|
||||
|
|
@ -3596,10 +3614,12 @@
|
|||
C666EE721F37ACB10061AA04 /* Multiplayer.cpp in Sources */,
|
||||
C654DF371F69C0430040F43D /* Sign.cpp in Sources */,
|
||||
93CBA4C920A7504500867D56 /* ImageImporter.cpp in Sources */,
|
||||
933CBDB620CB1ACD00134678 /* Theme.cpp in Sources */,
|
||||
93CBA4C020A74FF200867D56 /* BitmapReader.cpp in Sources */,
|
||||
C68878CC20289B710084B384 /* SoftwareDrawingEngine.cpp in Sources */,
|
||||
C67CCD681FBBD138004FAE4C /* EditorMain.cpp in Sources */,
|
||||
C6E415511FAFD6DC00D4A52A /* RideConstruction.cpp in Sources */,
|
||||
933CBDBD20CB1BA900134678 /* ViewportInteraction.cpp in Sources */,
|
||||
C685E51B1F8907850090598F /* Guest.cpp in Sources */,
|
||||
C64644F91F3FA4120026AC2D /* EditorInventionsList.cpp in Sources */,
|
||||
C68878C720289B710084B384 /* OpenGLShaderProgram.cpp in Sources */,
|
||||
|
|
@ -3642,6 +3662,7 @@
|
|||
C68878C620289B710084B384 /* OpenGLFramebuffer.cpp in Sources */,
|
||||
C654DF301F69C0430040F43D /* Finances.cpp in Sources */,
|
||||
9308DA01209908090079EE96 /* Surface.cpp in Sources */,
|
||||
933CBDBF20CB1BCA00134678 /* Window.cpp in Sources */,
|
||||
C68878C320289B710084B384 /* DrawRectShader.cpp in Sources */,
|
||||
C666EE751F37ACB10061AA04 /* NewsOptions.cpp in Sources */,
|
||||
C654DF311F69C0430040F43D /* GuestList.cpp in Sources */,
|
||||
|
|
@ -3665,6 +3686,7 @@
|
|||
C685E51A1F8907850090598F /* Staff.cpp in Sources */,
|
||||
F76C888C1EC5324E00FA49E2 /* UiContext.cpp in Sources */,
|
||||
C666EE7D1F37ACB10061AA04 /* TitleMenu.cpp in Sources */,
|
||||
933CBDB520CB1ACD00134678 /* Widget.cpp in Sources */,
|
||||
9308D9FE209908090079EE96 /* TileElement.cpp in Sources */,
|
||||
F76C888D1EC5324E00FA49E2 /* UiContext.Linux.cpp in Sources */,
|
||||
9346F9D8208A191900C77D91 /* Guest.cpp in Sources */,
|
||||
|
|
@ -3714,7 +3736,6 @@
|
|||
F76C85BD1EC4E88300FA49E2 /* RootCommands.cpp in Sources */,
|
||||
C688791320289B9B0084B384 /* HauntedHouse.cpp in Sources */,
|
||||
C688786E20289A6F0084B384 /* Vehicle.cpp in Sources */,
|
||||
C688789520289B140084B384 /* Theme.cpp in Sources */,
|
||||
F76C85BE1EC4E88300FA49E2 /* ScreenshotCommands.cpp in Sources */,
|
||||
C688786320289A0A0084B384 /* MapHelpers.cpp in Sources */,
|
||||
F76C85BF1EC4E88300FA49E2 /* SpriteCommands.cpp in Sources */,
|
||||
|
|
@ -3864,7 +3885,6 @@
|
|||
C688788F20289B140084B384 /* Chat.cpp in Sources */,
|
||||
C688789A20289B200084B384 /* ConversionTables.cpp in Sources */,
|
||||
C688791020289B9B0084B384 /* FerrisWheel.cpp in Sources */,
|
||||
C688789820289B140084B384 /* Widget.cpp in Sources */,
|
||||
C688791120289B9B0084B384 /* FlyingSaucers.cpp in Sources */,
|
||||
C688784A202899B40084B384 /* input.cpp in Sources */,
|
||||
F76C867D1EC4E88400FA49E2 /* StringTable.cpp in Sources */,
|
||||
|
|
@ -3929,7 +3949,6 @@
|
|||
C688789920289B140084B384 /* Window.cpp in Sources */,
|
||||
F76C87351EC4E88400FA49E2 /* ScenarioSources.cpp in Sources */,
|
||||
F76C87381EC4E88400FA49E2 /* TitleScreen.cpp in Sources */,
|
||||
C688789720289B140084B384 /* ViewportInteraction.cpp in Sources */,
|
||||
F76C873A1EC4E88400FA49E2 /* TitleSequence.cpp in Sources */,
|
||||
C6887852202899ED0084B384 /* TileInspector.cpp in Sources */,
|
||||
F76C873C1EC4E88400FA49E2 /* TitleSequenceManager.cpp in Sources */,
|
||||
|
|
@ -3942,7 +3961,6 @@
|
|||
C688786620289A430084B384 /* Intent.cpp in Sources */,
|
||||
C68878E520289B9B0084B384 /* Platform.Android.cpp in Sources */,
|
||||
C68878EA20289B9B0084B384 /* Shared.cpp in Sources */,
|
||||
F76C873E1EC4E88400FA49E2 /* TitleSequencePlayer.cpp in Sources */,
|
||||
F76C87451EC4E88400FA49E2 /* Version.cpp in Sources */,
|
||||
9346F9D9208A191900C77D91 /* Guest.cpp in Sources */,
|
||||
C688789C20289B200084B384 /* Currency.cpp in Sources */,
|
||||
|
|
|
|||
|
|
@ -111,6 +111,8 @@ The following people are not part of the development team, but have been contrib
|
|||
* Toby Hinloopen (tobyhinloopen)
|
||||
* Patrick Martinez (martip23)
|
||||
* Andy Ford (AndyTWF)
|
||||
* Matthew Beaudin (mattbeaudin)
|
||||
* Øystein Dale (oystedal)
|
||||
|
||||
## Toolchain
|
||||
* (Balletie) - macOS
|
||||
|
|
@ -139,7 +141,7 @@ The following people are not part of the development team, but have been contrib
|
|||
* English (UK) - Ted John (IntelOrca), (Tinytimrob)
|
||||
* English (US) - Ted John (IntelOrca), Michael Steenbeek (Gymnasiast); small fixes: (LRFLEW), (mike-koch), Harry Lam (daihakken)
|
||||
* Catalan - Joan Josep (J0anJosep)
|
||||
* Chinese (Simplified) - Naiji Ma (naijim), (izhangfei), Eric Zhao (sczyh30)
|
||||
* Chinese (Simplified) - Naiji Ma (naijim), (izhangfei), Eric Zhao (sczyh30), (Muhhan)
|
||||
* Chinese (Traditional) - Harry Lam (daihakken)
|
||||
* Czech - Martin Černáč (octaroot), (Clonewayx), Tomáš Pazdiora (Aroidzap)
|
||||
* Dutch - Michael Steenbeek (Gymnasiast), Yannic Geurts (xzbobzx), (mrtnptrs), Thomas den Hollander (ThomasdenH), (hostbrute), Marijn van der Werf (marijnvdwerf), Tom Kroes (ThePsionic); reviewing and discussion: Aaron van Geffen (AaronVanGeffen), (Balletie) and Sijmen Schoon (SijmenSchoon).
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
|
|
@ -16,9 +16,6 @@ STR_0529 :Mine train themed roller coaster trains career along steel roller c
|
|||
STR_0534 :Self-driven gas-engined go karts
|
||||
STR_0555 :Guests ride in an elevator up or down a vertical tower to get from one level to another
|
||||
|
||||
STR_0835 :Game initialization failed
|
||||
STR_0836 :Unable to start game in a minimized state
|
||||
STR_0837 :Unable to initialize graphics system
|
||||
|
||||
STR_0976 :Restrooms and Information Kiosks
|
||||
|
||||
|
|
@ -328,8 +325,6 @@ STR_1648 :{SMALLFONT}{OPENQUOTES}Help! Put me down!{ENDQUOTES}
|
|||
STR_1649 :{SMALLFONT}{OPENQUOTES}I'm running out of cash!{ENDQUOTES}
|
||||
STR_1650 :{SMALLFONT}{OPENQUOTES}Wow! A new ride being built!{ENDQUOTES}
|
||||
# Two removed inside jokes about Intamin and Phoenix
|
||||
STR_1651 :<removed string - do not use>
|
||||
STR_1652 :<removed string - do not use>
|
||||
STR_1653 :{SMALLFONT}{OPENQUOTES}...and here we are on {STRINGID}!{ENDQUOTES}
|
||||
STR_1654 :{WINDOW_COLOUR_2}Recent thoughts:
|
||||
STR_1655 :{SMALLFONT}{BLACK}Construct footpath on land
|
||||
|
|
@ -414,20 +409,17 @@ STR_1733 :Mode
|
|||
STR_1734 :{WINDOW_COLOUR_2}Number of laps:
|
||||
STR_1735 :{SMALLFONT}{BLACK}Number of laps of circuit
|
||||
STR_1736 :{POP16}{POP16}{POP16}{POP16}{POP16}{POP16}{POP16}{POP16}{POP16}{COMMA16}
|
||||
STR_1737 :{COMMA16}
|
||||
STR_1738 :Can't change number of laps...
|
||||
STR_1739 :Race won by guest {INT32}
|
||||
STR_1740 :Race won by {STRINGID}
|
||||
STR_1741 :Not yet constructed !
|
||||
STR_1741 :Not yet constructed!
|
||||
STR_1742 :{WINDOW_COLOUR_2}Max. people on ride:
|
||||
STR_1743 :{SMALLFONT}{BLACK}Maximum number of people allowed on this ride at one time
|
||||
STR_1744 :{POP16}{POP16}{POP16}{POP16}{POP16}{POP16}{POP16}{POP16}{POP16}{COMMA16}
|
||||
STR_1745 :{COMMA16}
|
||||
STR_1746 :Can't change this...
|
||||
STR_1747 :{WINDOW_COLOUR_2}Time limit:
|
||||
STR_1748 :{SMALLFONT}{BLACK}Time limit for ride
|
||||
STR_1749 :{POP16}{POP16}{POP16}{POP16}{POP16}{POP16}{POP16}{POP16}{POP16}{DURATION}
|
||||
STR_1750 :{DURATION}
|
||||
STR_1751 :Can't change time limit for ride...
|
||||
STR_1752 :{SMALLFONT}{BLACK}Show list of individual guests in park
|
||||
STR_1753 :{SMALLFONT}{BLACK}Show summarized list of guests in park
|
||||
|
|
@ -457,7 +449,6 @@ STR_1793 :Heading to {STRINGID} for an inspection
|
|||
STR_1794 :Fixing {STRINGID}
|
||||
STR_1795 :Answering radio call
|
||||
STR_1796 :Has broken down and requires fixing
|
||||
STR_1797 :This option cannot be changed for this ride
|
||||
STR_1798 :Whirlpool
|
||||
STR_1799 :{POP16}{POP16}{POP16}{POP16}{POP16}{CURRENCY2DP}
|
||||
STR_1800 :Safety cut-out
|
||||
|
|
@ -532,7 +523,6 @@ STR_1868 :Can't change number of rotations...
|
|||
STR_1869 :{WINDOW_COLOUR_2}Number of rotations:
|
||||
STR_1870 :{SMALLFONT}{BLACK}Number of complete rotations
|
||||
STR_1871 :{POP16}{POP16}{POP16}{POP16}{POP16}{POP16}{POP16}{POP16}{POP16}{COMMA16}
|
||||
STR_1872 :{COMMA16}
|
||||
STR_1873 :{WINDOW_COLOUR_2}Income: {BLACK}{CURRENCY2DP} per hour
|
||||
STR_1874 :{WINDOW_COLOUR_2}Profit: {BLACK}{CURRENCY2DP} per hour
|
||||
STR_1875 :{BLACK} {SPRITE}{BLACK} {STRINGID}
|
||||
|
|
@ -758,9 +748,6 @@ STR_2096 :Fried Chicken
|
|||
STR_2097 :Lemonade
|
||||
STR_2098 :Empty Box
|
||||
STR_2099 :Empty Bottle
|
||||
STR_2100 :{WINDOW_COLOUR_2}On-Ride Photo price:
|
||||
STR_2101 :{WINDOW_COLOUR_2}On-Ride Photo price:
|
||||
STR_2102 :{WINDOW_COLOUR_2}On-Ride Photo price:
|
||||
STR_2103 :{WINDOW_COLOUR_2}Pretzel price:
|
||||
STR_2104 :{WINDOW_COLOUR_2}Hot Chocolate price:
|
||||
STR_2105 :{WINDOW_COLOUR_2}Iced Tea price:
|
||||
|
|
@ -780,9 +767,6 @@ STR_2118 :{WINDOW_COLOUR_2}
|
|||
STR_2119 :{WINDOW_COLOUR_2}
|
||||
STR_2120 :{WINDOW_COLOUR_2}Roast Sausage price:
|
||||
STR_2121 :{WINDOW_COLOUR_2}
|
||||
STR_2122 :On-Ride Photo
|
||||
STR_2123 :On-Ride Photo
|
||||
STR_2124 :On-Ride Photo
|
||||
STR_2125 :Pretzel
|
||||
STR_2126 :Hot Chocolate
|
||||
STR_2127 :Iced Tea
|
||||
|
|
@ -802,9 +786,6 @@ STR_2140 :Empty Drink Carton
|
|||
STR_2141 :Empty Juice Cup
|
||||
STR_2142 :Roast Sausage
|
||||
STR_2143 :Empty Bowl
|
||||
STR_2144 :On-Ride Photos
|
||||
STR_2145 :On-Ride Photos
|
||||
STR_2146 :On-Ride Photos
|
||||
STR_2147 :Pretzels
|
||||
STR_2148 :Hot Chocolates
|
||||
STR_2149 :Iced Teas
|
||||
|
|
@ -824,9 +805,6 @@ STR_2162 :Empty Drink Cartons
|
|||
STR_2163 :Empty Juice cups
|
||||
STR_2164 :Roast Sausages
|
||||
STR_2165 :Empty Bowls
|
||||
STR_2166 :an On-Ride Photo
|
||||
STR_2167 :an On-Ride Photo
|
||||
STR_2168 :an On-Ride Photo
|
||||
STR_2169 :a Pretzel
|
||||
STR_2170 :a Hot Chocolate
|
||||
STR_2171 :an Iced Tea
|
||||
|
|
@ -846,9 +824,6 @@ STR_2184 :an Empty Drink Carton
|
|||
STR_2185 :an Empty Juice Cup
|
||||
STR_2186 :a Roast Sausage
|
||||
STR_2187 :an Empty Bowl
|
||||
STR_2188 :On-Ride Photo of {STRINGID}
|
||||
STR_2189 :On-Ride Photo of {STRINGID}
|
||||
STR_2190 :On-Ride Photo of {STRINGID}
|
||||
STR_2191 :Pretzel
|
||||
STR_2192 :Hot Chocolate
|
||||
STR_2193 :Iced Tea
|
||||
|
|
@ -917,6 +892,7 @@ STR_5817 :{SMALLFONT}{BLACK}Sets UI scaling type. Requires hardware display t
|
|||
STR_5827 :{SMALLFONT}{BLACK}Sets the color scheme used for the GUI
|
||||
STR_5843 :{SMALLFONT}{BLACK}Enables progressive unlocking of scenarios (RCT1 behavior)
|
||||
STR_5907 :{SMALLFONT}{BLACK}When enabled, zooming in will center around the cursor, as opposed to the screen center.
|
||||
STR_5921 :{SMALLFONT}{BLACK}If enabled, rain and gloomy colors will be rendered during storms.
|
||||
STR_6046 :Normalize height map
|
||||
STR_6053 :The heightmap cannot be normalized
|
||||
STR_6159 :Smooth Nearest Neighbor
|
||||
|
|
@ -1145,7 +1121,7 @@ STR_DTLS :Build a park to appeal to the high-intensity thrill-seeking local p
|
|||
|
||||
<Utopia Park>
|
||||
STR_SCNR :Utopia Park
|
||||
STR_PARK :Utopia Park
|
||||
STR_PARK :Utopia
|
||||
STR_DTLS :An oasis in the middle of the desert provides an unusual opportunity to build an amusement park
|
||||
|
||||
<Rotting Heights>
|
||||
|
|
@ -1554,7 +1530,7 @@ STR_SCNR :Europe - Renovation
|
|||
STR_PARK :From The Ashes
|
||||
STR_DTLS :An old park has fallen into disrepair. You gain a European Union grant to return this deprived area to its former glory! You need to renovate the park and repay the grant.
|
||||
|
||||
<N America - Extreme Hawaiian Island>
|
||||
<N. America - Extreme Hawaiian Island>
|
||||
STR_SCNR :N. America - Extreme Hawaiian Island
|
||||
STR_PARK :Wacky Waikiki
|
||||
STR_DTLS :The people of Hawaii are bored of surfing and are looking for something more intense. You need to build a park with this in mind to keep the area's tourist attraction rating high.
|
||||
|
|
@ -1562,7 +1538,7 @@ STR_DTLS :The people of Hawaii are bored of surfing and are looking for somet
|
|||
<North America - Grand Canyon>
|
||||
STR_SCNR :North America - Grand Canyon
|
||||
STR_PARK :Canyon Calamities
|
||||
STR_DTLS :You have to build a park on limited land either side of this natural treasure - you do have the opportunity to buy neighbouring land from the Native American Indians. You need to complete the objective to sustain the local town's population.
|
||||
STR_DTLS :You have to build a park on limited land either side of this natural treasure - you do have the opportunity to buy neighboring land from the Native American Indians. You need to complete the objective to sustain the local town's population.
|
||||
|
||||
<North America - Rollercoaster Heaven>
|
||||
STR_SCNR :North America - Rollercoaster Heaven
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
|
|
@ -6,180 +6,11 @@ STR_0054 :Fa hullámvasút
|
|||
STR_0056 :Vad egér
|
||||
STR_0065 :Felfüggesztett egysínű
|
||||
STR_0089 :Mini hullámvasút
|
||||
STR_0603 :{INT32}. vendég
|
||||
STR_0604 :{INT32}. vendég
|
||||
STR_0605 :{INT32}. vendég
|
||||
STR_0606 :{INT32}. vendég
|
||||
STR_0607 :{INT32}. vendég
|
||||
STR_0608 :{INT32}. vendég
|
||||
STR_0609 :{INT32}. vendég
|
||||
STR_0610 :{INT32}. vendég
|
||||
STR_0611 :{INT32}. vendég
|
||||
STR_0612 :{INT32}. vendég
|
||||
STR_0613 :{INT32}. vendég
|
||||
STR_0614 :{INT32}. vendég
|
||||
STR_0615 :{INT32}. vendég
|
||||
STR_0616 :{INT32}. vendég
|
||||
STR_0617 :{INT32}. vendég
|
||||
STR_0618 :{INT32}. vendég
|
||||
STR_0619 :{INT32}. vendég
|
||||
STR_0620 :{INT32}. vendég
|
||||
STR_0621 :{INT32}. vendég
|
||||
STR_0622 :{INT32}. vendég
|
||||
STR_0623 :{INT32}. vendég
|
||||
STR_0624 :{INT32}. vendég
|
||||
STR_0625 :{INT32}. vendég
|
||||
STR_0626 :{INT32}. vendég
|
||||
STR_0627 :{INT32}. vendég
|
||||
STR_0628 :{INT32}. vendég
|
||||
STR_0629 :{INT32}. vendég
|
||||
STR_0630 :{INT32}. vendég
|
||||
STR_0631 :{INT32}. vendég
|
||||
STR_0632 :{INT32}. vendég
|
||||
STR_0633 :{INT32}. vendég
|
||||
STR_0634 :{INT32}. vendég
|
||||
STR_0635 :{INT32}. vendég
|
||||
STR_0636 :{INT32}. vendég
|
||||
STR_0637 :{INT32}. vendég
|
||||
STR_0638 :{INT32}. vendég
|
||||
STR_0639 :{INT32}. vendég
|
||||
STR_0640 :{INT32}. vendég
|
||||
STR_0641 :{INT32}. vendég
|
||||
STR_0642 :{INT32}. vendég
|
||||
STR_0643 :{INT32}. vendég
|
||||
STR_0644 :{INT32}. vendég
|
||||
STR_0645 :{INT32}. vendég
|
||||
STR_0646 :{INT32}. vendég
|
||||
STR_0647 :{INT32}. vendég
|
||||
STR_0648 :{INT32}. vendég
|
||||
STR_0649 :{INT32}. vendég
|
||||
STR_0650 :{INT32}. vendég
|
||||
STR_0651 :{INT32}. vendég
|
||||
STR_0652 :{INT32}. vendég
|
||||
STR_0653 :{INT32}. vendég
|
||||
STR_0654 :{INT32}. vendég
|
||||
STR_0655 :{INT32}. vendég
|
||||
STR_0656 :{INT32}. vendég
|
||||
STR_0657 :{INT32}. vendég
|
||||
STR_0658 :{INT32}. vendég
|
||||
STR_0659 :{INT32}. vendég
|
||||
STR_0660 :{INT32}. vendég
|
||||
STR_0661 :{INT32}. vendég
|
||||
STR_0662 :{INT32}. vendég
|
||||
STR_0663 :{INT32}. vendég
|
||||
STR_0664 :{INT32}. vendég
|
||||
STR_0665 :{INT32}. vendég
|
||||
STR_0666 :{INT32}. vendég
|
||||
STR_0667 :{INT32}. vendég
|
||||
STR_0668 :{INT32}. vendég
|
||||
STR_0669 :{INT32}. vendég
|
||||
STR_0670 :{INT32}. vendég
|
||||
STR_0671 :{INT32}. vendég
|
||||
STR_0672 :{INT32}. vendég
|
||||
STR_0673 :{INT32}. vendég
|
||||
STR_0674 :{INT32}. vendég
|
||||
STR_0675 :{INT32}. vendég
|
||||
STR_0676 :{INT32}. vendég
|
||||
STR_0677 :{INT32}. vendég
|
||||
STR_0678 :{INT32}. vendég
|
||||
STR_0679 :{INT32}. vendég
|
||||
STR_0680 :{INT32}. vendég
|
||||
STR_0681 :{INT32}. vendég
|
||||
STR_0682 :{INT32}. vendég
|
||||
STR_0683 :{INT32}. vendég
|
||||
STR_0684 :{INT32}. vendég
|
||||
STR_0685 :{INT32}. vendég
|
||||
STR_0686 :{INT32}. vendég
|
||||
STR_0687 :{INT32}. vendég
|
||||
STR_0688 :{INT32}. vendég
|
||||
STR_0689 :{INT32}. vendég
|
||||
STR_0690 :{INT32}. vendég
|
||||
STR_0691 :{INT32}. vendég
|
||||
STR_0692 :{INT32}. vendég
|
||||
STR_0693 :{INT32}. vendég
|
||||
STR_0694 :{INT32}. vendég
|
||||
STR_0695 :{INT32}. vendég
|
||||
STR_0696 :{INT32}. vendég
|
||||
STR_0697 :{INT32}. vendég
|
||||
STR_0698 :{INT32}. vendég
|
||||
STR_0699 :{INT32}. vendég
|
||||
STR_0700 :{INT32}. vendég
|
||||
STR_0701 :{INT32}. vendég
|
||||
STR_0702 :{INT32}. vendég
|
||||
STR_0703 :{INT32}. vendég
|
||||
STR_0704 :{INT32}. vendég
|
||||
STR_0705 :{INT32}. vendég
|
||||
STR_0706 :{INT32}. vendég
|
||||
STR_0707 :{INT32}. vendég
|
||||
STR_0708 :{INT32}. vendég
|
||||
STR_0709 :{INT32}. vendég
|
||||
STR_0710 :{INT32}. vendég
|
||||
STR_0711 :{INT32}. vendég
|
||||
STR_0712 :{INT32}. vendég
|
||||
STR_0713 :{INT32}. vendég
|
||||
STR_0714 :{INT32}. vendég
|
||||
STR_0715 :{INT32}. vendég
|
||||
STR_0716 :{INT32}. vendég
|
||||
STR_0717 :{INT32}. vendég
|
||||
STR_0718 :{INT32}. vendég
|
||||
STR_0719 :{INT32}. vendég
|
||||
STR_0720 :{INT32}. vendég
|
||||
STR_0721 :{INT32}. vendég
|
||||
STR_0722 :{INT32}. vendég
|
||||
STR_0723 :{INT32}. vendég
|
||||
STR_0724 :{INT32}. vendég
|
||||
STR_0725 :{INT32}. vendég
|
||||
STR_0726 :{INT32}. vendég
|
||||
STR_0727 :{INT32}. vendég
|
||||
STR_0728 :{INT32}. vendég
|
||||
STR_0729 :{INT32}. vendég
|
||||
STR_0730 :{INT32}. vendég
|
||||
STR_0731 :{INT32}. vendég
|
||||
STR_0732 :{INT32}. vendég
|
||||
STR_0733 :{INT32}. vendég
|
||||
STR_0734 :{INT32}. vendég
|
||||
STR_0735 :{INT32}. vendég
|
||||
STR_0736 :{INT32}. vendég
|
||||
STR_0737 :{INT32}. vendég
|
||||
STR_0738 :{INT32}. vendég
|
||||
STR_0739 :{INT32}. vendég
|
||||
STR_0740 :{INT32}. vendég
|
||||
STR_0741 :{INT32}. vendég
|
||||
STR_0742 :{INT32}. vendég
|
||||
STR_0743 :{INT32}. vendég
|
||||
STR_0744 :{INT32}. vendég
|
||||
STR_0745 :{INT32}. vendég
|
||||
STR_0746 :{INT32}. vendég
|
||||
STR_0747 :{INT32}. vendég
|
||||
STR_0748 :{INT32}. vendég
|
||||
STR_0749 :{INT32}. vendég
|
||||
STR_0750 :{INT32}. vendég
|
||||
STR_0751 :{INT32}. vendég
|
||||
STR_0752 :{INT32}. vendég
|
||||
STR_0753 :{INT32}. vendég
|
||||
STR_0754 :{INT32}. vendég
|
||||
STR_0755 :{INT32}. vendég
|
||||
STR_0756 :{INT32}. vendég
|
||||
STR_0757 :{INT32}. vendég
|
||||
STR_0758 :{INT32}. vendég
|
||||
STR_0759 :{INT32}. vendég
|
||||
STR_0760 :{INT32}. vendég
|
||||
STR_0761 :{INT32}. vendég
|
||||
STR_0762 :{INT32}. vendég
|
||||
STR_0763 :{INT32}. vendég
|
||||
STR_0764 :{INT32}. vendég
|
||||
STR_0765 :{INT32}. vendég
|
||||
STR_0766 :{INT32}. vendég
|
||||
STR_0767 :{INT32}. vendég
|
||||
STR_0768 :{INT32}. mindenes
|
||||
STR_0769 :{INT32}. szerelő
|
||||
STR_0770 :{INT32}. biztonsági őr
|
||||
STR_0771 :{INT32}. szórakoztató
|
||||
STR_0772 :Névtelen park{POP16}{POP16}
|
||||
STR_0773 :Névtelen park{POP16}{POP16}
|
||||
STR_0774 :Névtelen park{POP16}{POP16}
|
||||
STR_0775 :Névtelen park{POP16}{POP16}
|
||||
STR_0776 :Névtelen park{POP16}{POP16}
|
||||
STR_0777 :Névtelen park{POP16}{POP16}
|
||||
STR_0779 :1.
|
||||
STR_0780 :2.
|
||||
|
|
@ -234,13 +65,11 @@ STR_0830 :{SMALLFONT}{BLACK}Nagyítás
|
|||
STR_0831 :{SMALLFONT}{BLACK}KicsinyítésZoom view out
|
||||
STR_0832 :{SMALLFONT}{BLACK}Forgatás 90{DEGREE}-kal órajárás szerint
|
||||
STR_0833 :{SMALLFONT}{BLACK}Játék megállítása
|
||||
STR_0835 :Nem sikerült inicializálni a játékot
|
||||
STR_0877 :Túl alacsony !
|
||||
STR_0878 :Túl magas !
|
||||
STR_0881 :Egy tárgy van az útba
|
||||
STR_0882 :Játék betöltése
|
||||
STR_0883 :Játék mentése
|
||||
STR_0886 :Kilépés
|
||||
STR_0944 :Mentés
|
||||
STR_0945 :Nincs mentés
|
||||
STR_0946 :Mégse
|
||||
|
|
@ -366,7 +195,7 @@ STR_2337 :Német márka (DM)
|
|||
STR_2338 :Jen ({YEN})
|
||||
STR_2339 :Pezeta (Pts)
|
||||
STR_2340 :Líra (L)
|
||||
STR_2341 :Gulden (fl.)
|
||||
STR_2341 :Gulden (ƒ)
|
||||
STR_2342 :Korona (kr)
|
||||
STR_2343 :Euró ({EURO})
|
||||
STR_2344 :Birodalmi
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
|
|
@ -4,7 +4,7 @@ Section: misc
|
|||
Priority: optional
|
||||
Standards-Version: 3.9.2
|
||||
Multi-Arch: same
|
||||
Build-Depends: debhelper (>= 9), cmake, libsdl2-dev, gcc (>= 7), pkg-config, libjansson4 (>= 2.3), libjansson-dev (>= 2.3), libspeex-dev, libspeexdsp-dev, libcurl4-openssl-dev, libcrypto++-dev, libfontconfig1-dev, libfreetype6-dev, libpng-dev, libssl-dev, libzip-dev (>= 1.0.0), libicu-dev (>= 59.0)
|
||||
Build-Depends: debhelper (>= 9), cmake, libsdl2-dev, gcc (>= 7), pkg-config, libjansson4 (>= 2.5), libjansson-dev (>= 2.3), libspeex-dev, libspeexdsp-dev, libcurl4-openssl-dev, libcrypto++-dev, libfontconfig1-dev, libfreetype6-dev, libpng-dev, libssl-dev, libzip-dev (>= 1.0.0), libicu-dev (>= 59.0)
|
||||
|
||||
Package: openrct2
|
||||
Architecture: any
|
||||
|
|
|
|||
|
|
@ -1,8 +1,52 @@
|
|||
0.2.0+ (in development)
|
||||
------------------------------------------------------------------------
|
||||
- Feature: [#5993] Ride window prices can now be set via text input.
|
||||
- Feature: [#6998] Guests now wait for passing vehicles before crossing railway tracks.
|
||||
- Feature: [#7658] Add option to always use system file browsing window.
|
||||
- Feature: [#7694] Debug option to visualize paths that the game detects as wide.
|
||||
- Feature: [#7713] The virtual floor now takes land ownership rights into account.
|
||||
- Feature: [#7771] Danish translation.
|
||||
- Feature: [#7797, #7802, #7821, #7830] Add sprite font glyphs for Danish, Norwegian, Russian, Turkish, Catalan and Romanian.
|
||||
- Feature: [#7848] Add a master volume slider to audio options screen.
|
||||
- Feature: [#7868] Placing scenery while holding shift now scales appropriately with zoom levels.
|
||||
- Feature: [#7882] Auto-detect Steam and GOG installations of RCT1.
|
||||
- Feature: [#7885] Turkish translation.
|
||||
- Fix: [#3177] Wrong keys displayed in shortcut menu.
|
||||
- Fix: [#4039] No sprite font glyph for German opening quotation mark.
|
||||
- Fix: [#5548] platform_get_locale_date_format is not implemented for Linux.
|
||||
- Fix: [#7204] Object source filters do not work for RCT1, AA and LL.
|
||||
- Fix: [#7440] Memory leak. All system memory used.
|
||||
- Fix: [#7462] Guest window goes beyond the map edge on a spiral slide.
|
||||
- Fix: [#7533] Screenshot is incorrectly named/file is not generated in CJK language.
|
||||
- Fix: [#7628] Always-researched items can be modified in the inventory list.
|
||||
- Fix: [#7643] No Money scenarios with funding set to zero.
|
||||
- Fix: [#7653] Finances money spinner is too narrow for big loans.
|
||||
- Fix: [#7673] Vehicle names are cut off in invention list.
|
||||
- Fix: [#7674] Rides show up as random numbers in guest's ride list.
|
||||
- Fix: [#7678] Crash when loading or starting a new game while having object selection window open.
|
||||
- Fix: [#7683] 'Arbitrary ride type' dropdown state is shared between windows.
|
||||
- Fix: [#7697] Some scenery groups in RCT1 saves are never invented.
|
||||
- Fix: [#7711] Inverted Hairpin Coaster allows building invisible banked pieces.
|
||||
- Fix: [#7734] Title sequence not included in macOS builds as of 0.2.0 release.
|
||||
- Fix: [#7756] Steam RCT2 path not correctly checked on macOS and Linux.
|
||||
- Fix: [#7765] Crash when opening ride list window on Windows Vista.
|
||||
- Fix: [#7773] Once research has been completed, player is still charged for research.
|
||||
- Fix: [#7786] Crash when importing a track design.
|
||||
- Fix: [#7793] Duplicate private keys generated.
|
||||
- Fix: [#7817] No sprite font glyph for interpunct.
|
||||
- Fix: [#7823] You can build mazes in pause mode.
|
||||
- Fix: [#7804] Russian ride descriptions are cut off.
|
||||
- Fix: [#7872] CJK tooltips are often cut off.
|
||||
- Fix: [#7895] Import of Mega Park and the RCT1 title music do not work on some RCT1 sources.
|
||||
- Improved: [#7899] Timestamps in the load/save screen are now displayed using local timezone instead of GMT.
|
||||
- Improved: [#7918] Better RCT2 detection if both disc and GOG/Steam versions are installed.
|
||||
|
||||
0.2.0 (2018-06-10)
|
||||
------------------------------------------------------------------------
|
||||
- Feature: [#1417] Allow saving track designs for flat rides.
|
||||
- Feature: [#1675] Auto-rotate shops to face footpaths.
|
||||
- Feature: [#3473] Add button in ride window's maintainance tab to refurbish the ride.
|
||||
- Feature: [#4143] New horizontal +/- spinner widgets to make adjusting values easier.
|
||||
- Feature: [#6510] Ability to select edges or a row of tiles by holding down Ctrl using the land tool.
|
||||
- Feature: [#7187] Option for early scenario completion.
|
||||
- Feature: [#7266] Make headless instances use an interactive terminal with access to the in-game console API.
|
||||
|
|
@ -11,7 +55,6 @@
|
|||
- Feature: [#7332] Keyboard shortcuts for view path issues and cutaway view.
|
||||
- Feature: [#7348] Add large half loops to the Vertical Drop Roller Coaster.
|
||||
- Feature: [#7459] Allow opening and closing of parks that use no money.
|
||||
- Feature: [#7579] New horizontal +/- spinner widgets to make adjusting values easier.
|
||||
- Fix: [#2053] When clearance checks are disabled, a track piece ghost can remove non-ghost track pieces.
|
||||
- Fix: [#2611] Some objects show (undefined string) instead of a description in Korean.
|
||||
- Fix: [#3596] Saving parks, landscapes and tracks with a period in the filenames don't get their extension.
|
||||
|
|
@ -22,7 +65,7 @@
|
|||
- Fix: [#6938] Banner do not correctly capitalise non-ASCII characters.
|
||||
- Fix: [#7176] Mechanics sometimes fall down from rides.
|
||||
- Fix: [#7303] Visual glitch with virtual floor near map edges.
|
||||
- Fix: [#7313] Loading an invalid path with openrct2 produces results different than expected.
|
||||
- Fix: [#7313] Loading an invalid path with OpenRCT2 produces results different than expected.
|
||||
- Fix: [#7327] Abstract scenery and stations don't get fully See-Through when hiding them (original bug).
|
||||
- Fix: [#7331] Invention list in scenario editor crashes upon removing previously-enabled ride/stall entries.
|
||||
- Fix: [#7341] Staff may auto-spawn on guests walking outside of paths.
|
||||
|
|
|
|||
|
|
@ -24,6 +24,7 @@
|
|||
<comment xml:lang="zh-TW">OpenRCT2 遊戲存檔</comment>
|
||||
<glob weight="60" pattern="*.sv6"/>
|
||||
<glob weight="60" pattern="*.sv4"/>
|
||||
<glob weight="60" pattern="*.sv7"/>
|
||||
</mime-type>
|
||||
|
||||
<mime-type type="application/x-openrct2-scenario">
|
||||
|
|
|
|||
|
|
@ -13,6 +13,7 @@ GenericName[de]=Freizeitpark-Simulation
|
|||
GenericName[es]=Simulación de parque de atracciones.
|
||||
GenericName[fr]=Jeu de gestion de parcs d'attractions.
|
||||
GenericName[it]=Gioco di simulazione e gestione di parchi a tema
|
||||
GenericName[ja]=テーマパーク経営シミュレーションゲーム
|
||||
GenericName[nb]=Fornøyelsespark-simuleringsspill
|
||||
GenericName[nl]=Pretparksimulator
|
||||
GenericName[pt]=Jogo de gerenciamento de parque temático
|
||||
|
|
@ -28,11 +29,12 @@ Comment[de]=Quelloffene Neuimplementierung von RollerCoaster Tycoon 2.
|
|||
Comment[es]=Re-implementación de código abierto de RollerCoaster Tycoon 2.
|
||||
Comment[fr]=Ré-implémentation libre (Open Source) de RollerCoaster Tycoon 2.
|
||||
Comment[it]=Versione Open Source di RollerCoaster.
|
||||
Comment[ja]=ローラーコースタータイクーン２のオープンソース版。
|
||||
Comment[nb]=Open Source re-implementasjon av RollerCoaster Tycoon 2.
|
||||
Comment[nl]=Een opensource-versie van RollerCoaster Tycoon 2.
|
||||
Comment[pt]=Reimplementação em código aberto do RollerCoaster Tycoon 2.
|
||||
Comment[ru]=Ремейк с открытым исходным кодом игры RollerCoaster Tycoon 2.
|
||||
Comment[sv]=Open Source om-implementation av RollerCoaster Tycoon 2.
|
||||
Comment[zh_CN]=过山车大亨2(RollerCoaster Tycoon 2)的开源重新开发版
|
||||
Comment[zh_CN]=过山车大亨2(RollerCoaster Tycoon 2)的开源重新开发版。
|
||||
Comment[zh_TW]=重新開發並開放源碼的模擬樂園2 (RollerCoaster Tycoon 2)。
|
||||
Categories=Game;Simulation;
|
||||
|
|
|
|||
|
|
@ -53,12 +53,12 @@
|
|||
C4549: 'operator': operator before comma has no effect; did you intend 'operator'?
|
||||
C4555: expression has no effect; expected expression with side-effect
|
||||
-->
|
||||
<PreprocessorDefinitions>__AVX2__;__SSE4_1__;OPENGL_NO_LINK;_CRT_SECURE_NO_WARNINGS;_USE_MATH_DEFINES;CURL_STATICLIB;SDL_MAIN_HANDLED;_WINSOCK_DEPRECATED_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||
<PreprocessorDefinitions>__AVX2__;__SSE4_1__;OPENGL_NO_LINK;_CRT_SECURE_NO_WARNINGS;_USE_MATH_DEFINES;CURL_STATICLIB;SDL_MAIN_HANDLED;_WINSOCK_DEPRECATED_NO_WARNINGS;NOMINMAX;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||
<RuntimeLibrary Condition="'$(UseSharedLibs)'!='true'">MultiThreaded</RuntimeLibrary>
|
||||
<RuntimeLibrary Condition="'$(UseSharedLibs)'=='true'">MultiThreadedDLL</RuntimeLibrary>
|
||||
<MultiProcessorCompilation>true</MultiProcessorCompilation>
|
||||
<TreatWarningAsError>true</TreatWarningAsError>
|
||||
<AdditionalOptions>/utf-8 /std:c++latest /permissive- /Zc:externConstexpr</AdditionalOptions>
|
||||
<AdditionalOptions>/utf-8 /std:c++17 /permissive- /Zc:externConstexpr</AdditionalOptions>
|
||||
</ClCompile>
|
||||
<Link>
|
||||
<AdditionalDependencies>imm32.lib;version.lib;winmm.lib;crypt32.lib;wldap32.lib;%(AdditionalDependencies)</AdditionalDependencies>
|
||||
|
|
@ -76,7 +76,7 @@
|
|||
</ClCompile>
|
||||
<Link>
|
||||
<GenerateDebugInformation>DebugFull</GenerateDebugInformation>
|
||||
<AdditionalDependencies>bz2d.lib;discord-rpc.lib;freetyped.lib;jansson_d.lib;libcurl.lib;libeay32.lib;libpng16d.lib;libspeexdsp.lib;SDL2d.lib;ssleay32.lib;zip.lib;zlibd.lib;%(AdditionalDependencies)</AdditionalDependencies>
|
||||
<AdditionalDependencies>bz2d.lib;discord-rpc.lib;freetyped.lib;jansson_d.lib;libcurl.lib;libeay32.lib;libpng16d.lib;libspeexdsp.lib;SDL2d.lib;ssleay32.lib;zip.lib;zlibd.lib;libbreakpadd.lib;libbreakpad_clientd.lib;%(AdditionalDependencies)</AdditionalDependencies>
|
||||
</Link>
|
||||
</ItemDefinitionGroup>
|
||||
<ItemDefinitionGroup Condition="'$(Configuration)'=='Release'">
|
||||
|
|
@ -94,7 +94,7 @@
|
|||
<GenerateDebugInformation>DebugFull</GenerateDebugInformation>
|
||||
<EnableCOMDATFolding>true</EnableCOMDATFolding>
|
||||
<OptimizeReferences>true</OptimizeReferences>
|
||||
<AdditionalDependencies>bz2.lib;discord-rpc.lib;freetype.lib;jansson.lib;libcurl.lib;libeay32.lib;libpng16.lib;libspeexdsp.lib;SDL2.lib;ssleay32.lib;zip.lib;zlib.lib;%(AdditionalDependencies)</AdditionalDependencies>
|
||||
<AdditionalDependencies>bz2.lib;discord-rpc.lib;freetype.lib;jansson.lib;libcurl.lib;libeay32.lib;libpng16.lib;libspeexdsp.lib;SDL2.lib;ssleay32.lib;zip.lib;zlib.lib;libbreakpad.lib;libbreakpad_client.lib;%(AdditionalDependencies)</AdditionalDependencies>
|
||||
</Link>
|
||||
</ItemDefinitionGroup>
|
||||
|
||||
|
|
|
|||
|
|
@ -5,6 +5,7 @@
|
|||
- GIT_TAG
|
||||
- GIT_BRANCH
|
||||
- GIT_COMMIT_SHA1
|
||||
- GIT_DESCRIBE
|
||||
- SIGN_PASSWORD
|
||||
- OPENRCT2_ORG_TOKEN
|
||||
- NO_NSIS: set to true to prevent the NSIS installer building
|
||||
|
|
@ -28,6 +29,8 @@
|
|||
<OPENRCT2_CL_ADDITIONALOPTIONS Condition="'$(GIT_BRANCH)'!=''">/D "OPENRCT2_BRANCH=\"$(GIT_BRANCH)\"" $(OPENRCT2_CL_ADDITIONALOPTIONS)</OPENRCT2_CL_ADDITIONALOPTIONS>
|
||||
<OPENRCT2_CL_ADDITIONALOPTIONS Condition="'$(GIT_COMMIT_SHA1)'!=''">/D "OPENRCT2_COMMIT_SHA1=\"$(GIT_COMMIT_SHA1)\"" $(OPENRCT2_CL_ADDITIONALOPTIONS)</OPENRCT2_CL_ADDITIONALOPTIONS>
|
||||
<OPENRCT2_CL_ADDITIONALOPTIONS Condition="'$(GIT_COMMIT_SHA1_SHORT)'!=''">/D "OPENRCT2_COMMIT_SHA1_SHORT=\"$(GIT_COMMIT_SHA1_SHORT)\"" $(OPENRCT2_CL_ADDITIONALOPTIONS)</OPENRCT2_CL_ADDITIONALOPTIONS>
|
||||
<OPENRCT2_CL_ADDITIONALOPTIONS Condition="'$(GIT_DESCRIBE)'!=''">/D "OPENRCT2_VERSION_TAG=\"$(GIT_DESCRIBE)\"" $(OPENRCT2_CL_ADDITIONALOPTIONS)</OPENRCT2_CL_ADDITIONALOPTIONS>
|
||||
<OPENRCT2_CL_ADDITIONALOPTIONS Condition="'$(Configuration)'=='Release'">/D "USE_BREAKPAD" $(OPENRCT2_CL_ADDITIONALOPTIONS)</OPENRCT2_CL_ADDITIONALOPTIONS>
|
||||
|
||||
<RootDir>$(MsBuildThisFileDirectory)</RootDir>
|
||||
<DistDir>$(RootDir)distribution\</DistDir>
|
||||
|
|
@ -62,17 +65,17 @@
|
|||
<!-- 3rd party libraries / dependencies -->
|
||||
<PropertyGroup>
|
||||
<DependenciesCheckFile>$(RootDir).dependencies</DependenciesCheckFile>
|
||||
<LibsUrl Condition="'$(Platform)'=='Win32'">https://github.com/OpenRCT2/Dependencies/releases/download/v17/openrct2-libs-v17-x86-windows-static-winssl.zip</LibsUrl>
|
||||
<LibsSha1 Condition="'$(Platform)'=='Win32'">4f9fb5feebe4a4ed461b2a545b2fd1c91ef6527b</LibsSha1>
|
||||
<LibsUrl Condition="'$(Platform)'=='x64'">https://github.com/OpenRCT2/Dependencies/releases/download/v17/openrct2-libs-v17-x64-windows-static-winssl.zip</LibsUrl>
|
||||
<LibsSha1 Condition="'$(Platform)'=='x64'">5aab386f9eeaad102b330fcddea2b4cc9e3c7067</LibsSha1>
|
||||
<LibsUrl Condition="'$(Platform)'=='Win32'">https://github.com/OpenRCT2/Dependencies/releases/download/v18/openrct2-libs-v18-x86-windows-static-winssl.zip</LibsUrl>
|
||||
<LibsSha1 Condition="'$(Platform)'=='Win32'">5266545ca3034f9718729c7841d0352ed866db39</LibsSha1>
|
||||
<LibsUrl Condition="'$(Platform)'=='x64'">https://github.com/OpenRCT2/Dependencies/releases/download/v18/openrct2-libs-v18-x64-windows-static-winssl.zip</LibsUrl>
|
||||
<LibsSha1 Condition="'$(Platform)'=='x64'">4a122221e000b26067c8a4d06d2f053f27fe3f39</LibsSha1>
|
||||
<GtestVersion>1.8.0</GtestVersion>
|
||||
<GtestUrl>https://github.com/google/googletest/archive/release-1.8.0.zip</GtestUrl>
|
||||
<GtestSha1>667f873ab7a4d246062565fad32fb6d8e203ee73</GtestSha1>
|
||||
<TitleSequencesUrl>https://github.com/OpenRCT2/title-sequences/releases/download/v0.1.2/title-sequence-v0.1.2.zip</TitleSequencesUrl>
|
||||
<TitleSequencesSha1>1136ef92bfb05cd1cba9831ba6dc4a653d87a246</TitleSequencesSha1>
|
||||
<ObjectsUrl>https://github.com/OpenRCT2/objects/releases/download/v1.0.2/objects.zip</ObjectsUrl>
|
||||
<ObjectsSha1>acf853ff6fa4285cea94cc9d8f74730e57202d06</ObjectsSha1>
|
||||
<ObjectsUrl>https://github.com/OpenRCT2/objects/releases/download/v1.0.6/objects.zip</ObjectsUrl>
|
||||
<ObjectsSha1>61c70237814dc0f5aee5e9219f2ff232ea1a6111</ObjectsSha1>
|
||||
</PropertyGroup>
|
||||
|
||||
<ItemGroup>
|
||||
|
|
@ -161,6 +164,7 @@
|
|||
<PropertyGroup>
|
||||
<BuildString Condition="'$(GIT_COMMIT_SHA1_SHORT)'!=''">$(GIT_COMMIT_SHA1_SHORT)</BuildString>
|
||||
<BuildString Condition="'$(GIT_BRANCH)'!=''">$(BuildString) ($(GIT_BRANCH))</BuildString>
|
||||
<BuildString Condition="'$(GIT_DESCRIBE)'!=''">$(BuildString) ($(GIT_DESCRIBE))</BuildString>
|
||||
</PropertyGroup>
|
||||
<ItemGroup>
|
||||
<DataItems Include="$(RootDir)data\**\*" />
|
||||
|
|
|
|||
|
|
@ -199,7 +199,7 @@ You can translate the game into other languages by editing the language files in
|
|||
|
||||
| [OpenLoco](https://github.com/OpenRCT2/OpenLoco) | [OpenTTD](https://github.com/OpenTTD/OpenTTD) | [openage](https://github.com/SFTtech/openage) | [OpenRA](https://github.com/OpenRA/OpenRA) |
|
||||
|:------------------------------------------------:|:----------------------------------------------------------------------------------------------------------:|:-------------------------------------------------------------------------------------------------------:|:-------------------------------------------------------------------------------------------------------------:|
|
||||
| [](https://user-images.githubusercontent.com/550290/36566661-6a541128-1824-11e8-9633-8521d1a67d7e.png) |  |  |  |
|
||||
| [](https://github.com/OpenRCT2/OpenLoco) | [](https://github.com/OpenTTD/OpenTTD) | [](https://github.com/SFTtech/openage) | [](https://github.com/OpenRA/OpenRA) |
|
||||
| Chris Sawyer's Locomotion | Transport Tycoon Deluxe | Age of Empires 2 | Red Alert |
|
||||
|
||||
# 7. Sponsors
|
||||
|
|
|
|||
Binary file not shown.
|
After Width: | Height: | Size: 187 B |
Binary file not shown.
|
After Width: | Height: | Size: 186 B |
Binary file not shown.
|
After Width: | Height: | Size: 169 B |
Binary file not shown.
|
After Width: | Height: | Size: 242 B |
Binary file not shown.
|
After Width: | Height: | Size: 185 B |
Binary file not shown.
|
After Width: | Height: | Size: 173 B |
Binary file not shown.
|
After Width: | Height: | Size: 205 B |
Binary file not shown.
|
After Width: | Height: | Size: 194 B |
Binary file not shown.
|
After Width: | Height: | Size: 171 B |
Binary file not shown.
|
After Width: | Height: | Size: 891 B |
Binary file not shown.
|
After Width: | Height: | Size: 891 B |
Binary file not shown.
|
After Width: | Height: | Size: 174 B |
Binary file not shown.
|
After Width: | Height: | Size: 883 B |
Binary file not shown.
|
After Width: | Height: | Size: 881 B |
Binary file not shown.
|
After Width: | Height: | Size: 173 B |
Binary file not shown.
|
After Width: | Height: | Size: 892 B |
Binary file not shown.
|
After Width: | Height: | Size: 894 B |
Binary file not shown.
|
After Width: | Height: | Size: 173 B |
Binary file not shown.
|
After Width: | Height: | Size: 889 B |
Binary file not shown.
|
After Width: | Height: | Size: 897 B |
Binary file not shown.
|
After Width: | Height: | Size: 182 B |
Binary file not shown.
|
After Width: | Height: | Size: 901 B |
Binary file not shown.
|
After Width: | Height: | Size: 895 B |
Binary file not shown.
|
After Width: | Height: | Size: 171 B |
Binary file not shown.
|
After Width: | Height: | Size: 891 B |
Binary file not shown.
|
After Width: | Height: | Size: 887 B |
Binary file not shown.
|
After Width: | Height: | Size: 176 B |
Binary file not shown.
|
After Width: | Height: | Size: 897 B |
Binary file not shown.
|
After Width: | Height: | Size: 893 B |
Binary file not shown.
|
After Width: | Height: | Size: 179 B |
Binary file not shown.
|
After Width: | Height: | Size: 891 B |
Binary file not shown.
|
After Width: | Height: | Size: 880 B |
Binary file not shown.
|
After Width: | Height: | Size: 167 B |
Binary file not shown.
|
After Width: | Height: | Size: 882 B |
Binary file not shown.
|
After Width: | Height: | Size: 881 B |
Binary file not shown.
|
After Width: | Height: | Size: 167 B |
Binary file not shown.
|
After Width: | Height: | Size: 891 B |
Binary file not shown.
|
After Width: | Height: | Size: 894 B |
Binary file not shown.
|
After Width: | Height: | Size: 170 B |
Binary file not shown.
|
After Width: | Height: | Size: 902 B |
Binary file not shown.
|
After Width: | Height: | Size: 895 B |
Binary file not shown.
|
After Width: | Height: | Size: 170 B |
Binary file not shown.
|
After Width: | Height: | Size: 886 B |
Binary file not shown.
|
After Width: | Height: | Size: 878 B |
Binary file not shown.
|
After Width: | Height: | Size: 171 B |
Binary file not shown.
|
After Width: | Height: | Size: 890 B |
Binary file not shown.
|
After Width: | Height: | Size: 887 B |
Binary file not shown.
|
After Width: | Height: | Size: 174 B |
Binary file not shown.
|
After Width: | Height: | Size: 888 B |
Binary file not shown.
|
After Width: | Height: | Size: 877 B |
Binary file not shown.
|
After Width: | Height: | Size: 168 B |
Binary file not shown.
|
After Width: | Height: | Size: 887 B |
Binary file not shown.
|
After Width: | Height: | Size: 878 B |
Binary file not shown.
|
After Width: | Height: | Size: 171 B |
Binary file not shown.
|
After Width: | Height: | Size: 895 B |
Binary file not shown.
|
After Width: | Height: | Size: 890 B |
Binary file not shown.
|
After Width: | Height: | Size: 176 B |
Binary file not shown.
|
After Width: | Height: | Size: 899 B |
Binary file not shown.
|
After Width: | Height: | Size: 895 B |
Binary file not shown.
|
After Width: | Height: | Size: 174 B |
Binary file not shown.
|
After Width: | Height: | Size: 895 B |
Binary file not shown.
|
After Width: | Height: | Size: 888 B |
Binary file not shown.
|
After Width: | Height: | Size: 173 B |
Binary file not shown.
|
After Width: | Height: | Size: 902 B |
Binary file not shown.
|
After Width: | Height: | Size: 897 B |
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue