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

15118 Commits

Author SHA1 Message Date
Hielke Morsink
ce59ed0ba2 Fix include order and defines for Windows builds 2018-07-23 15:57:59 +02:00
OpenRCT2 git bot
79f1cf5a5c Merge Localisation/master into OpenRCT2/develop. 2018-07-22 04:00:27 +00:00
Michał Janiszewski
b278dce717 Merge pull request #7792 from oystedal/oystedal/string-memleaks
Fix memory leaks related to pointer assignment to std::string
2018-07-21 19:56:55 +02:00
Michael Steenbeek
193c57a3e0 Fix small Ø glyph 2018-07-20 22:03:44 +02:00
Michael Steenbeek
8cb7cc424c Merge pull request #7797 from Gymnasiast/extra-letters
Add sprite font glyphs for Æ and Ø
2018-07-20 18:39:58 +02:00
Michael Steenbeek
5fdc4637cd Add drawing code for new sprite glyphs 2018-07-20 17:33:20 +02:00
Michael Steenbeek
c3ed52ffe9 Add sprite font glyphs for Æ and Ø 2018-07-20 17:32:42 +02:00
Michael Steenbeek
136b1e7456 Add sprite file option to force BMP encoding 2018-07-20 17:29:34 +02:00
Michael Steenbeek
a9a9f3b517 Merge pull request #7801 from Gymnasiast/refactor/sprite-font
Refactor sprite font code
2018-07-20 16:21:11 +02:00
Michael Steenbeek
93bc11a93a Refactor _spriteFontCharacterWidths 2018-07-20 15:56:21 +02:00
Michael Steenbeek
41dcae581a Remove support for the unused big font 2018-07-20 15:56:21 +02:00
Michael Steenbeek
b2873d2f86 Use more constants 2018-07-20 15:08:25 +02:00
OpenRCT2 git bot
6c66130c73 Merge Localisation/master into OpenRCT2/develop. 2018-07-20 04:00:29 +00:00
Michael Steenbeek
8530d56a66 Add Danish translation (#7771) 2018-07-19 21:15:54 +02:00
OpenRCT2 git bot
9c46187b91 Merge Localisation/master into OpenRCT2/develop. 2018-07-19 04:00:26 +00:00
Øystein Dale
de464e2783 Use a better constructor in StringBuilder::GetStdString 2018-07-18 23:57:11 +02:00
Michał Janiszewski
4a77801cb3 Increase the allowed aspect ratio epsilon (#7775) 2018-07-18 22:33:20 +01:00
Michał Janiszewski
10f6059f09 Fix #7793: Duplicate private keys generated (#7794) 2018-07-18 22:11:34 +01:00
Ted John
3d85ec4ea1 Fix #7786: Crash when importing a track design (#7790) 2018-07-18 21:19:25 +01:00
OpenRCT2 git bot
1a27fbb794 Merge Localisation/master into OpenRCT2/develop. 2018-07-18 04:00:25 +00:00
Øystein Dale
5744509b87 Fix memory leak in config
Assigning a pointer to std::string appears to only perform a copy and
does not transfer ownership of the pointer, thus the allocated memory is
will never be freed. Use StringBuilder::GetStdString() to avoid the
memory leak.
2018-07-18 00:57:37 +02:00
Øystein Dale
934e53869c Fix memory leaks in localisation
Assigning a pointer to std::string appears to only perform a copy and
does not transfer ownership of the pointer, thus the allocated memory is
will never be freed.

Implement a method to construct an std::string from a StringBuilder to
avoid memory leaks when retreiving the contents of a StringBuilder and
storing it in a std::string.
2018-07-18 00:07:48 +02:00
Øystein Dale
34cf068650 Fix memory leak when deserialising objects
Assigning a pointer to std::string appears to only perform a copy and
does not transfer ownership of the pointer, thus the allocated memory is
will never be freed. Use IStream::ReadStdString instead to return a
std::string directly, thus transferring ownership correctly.
2018-07-18 00:07:48 +02:00
Øystein Dale
45aad7ce77 Add self to contributors.md 2018-07-18 00:07:48 +02:00
Matthew Beaudin
183411aa54 Fix #7773: Once research has been completed, player is still charged for research 2018-07-17 21:54:42 +02:00
Michał Janiszewski
ab20dcde9f Use "secure version" of swcanf (#7774)
This makes mingw builds usable again
2018-07-16 07:38:57 +01:00
OpenRCT2 git bot
97e50d56ab Merge Localisation/master into OpenRCT2/develop. 2018-07-16 04:00:47 +00:00
Ted John
f728a5074a Fix #7765: Crash when opening ride list window on Windows Vista (#7781)
It has been reported that Windows Vista crashes in LCMapStringEx when
using LOCALE_NAME_INVARIANT even though it is documented as supported.

As a counter measure, use LOCALE_NAME_USER_DEFAULT for the time being.
2018-07-14 08:52:12 +01:00
Christian F. Coors
54c0eff6a6 Show command descriptions even if only -a is passed (#7780) 2018-07-13 21:02:19 +02:00
OpenRCT2 git bot
b2f6e2312f Merge Localisation/master into OpenRCT2/develop. 2018-07-12 04:01:45 +00:00
Simmo Saan
3f8c3c32ea Fix #7766: Found ICU include directories being unused (#7767)
When ICU is installed separately from the system and paths configured in
CMake then the detected include directories should also be used for
compilation instead of blindly using unconfigured system includes.
SYSTEM flag ignores suggest-override warnings in ICU headers.
2018-07-08 22:16:27 +02:00
Brian Callahan
66bfd42551 Do not print which(1) errors to the console
On first launch of the game, OpenRCT2 tries to find Gnome or KDE eyecandy dialog programs zenity and kdialog to inform the user to set the `game_path`. It will fall back to an SDL popup with manual instructions if neither is found, which looks fine. However, if OpenRCT2 is launched from the command line, which will print "file not found" errors if you don't have zenity and/or kdialog installed, which might potentially confuse the user.

This patch routes the error messages to `/dev/null`, as we don't really care if those programs are not found.

See this thread on the OpenBSD mailing list: https://marc.info/?l=openbsd-ports&m=153020454402268&w=2
2018-07-07 20:53:50 +02:00
Michael Steenbeek
9e559d577a Fix Steam path for Linux and macOS
While OpenRCT2 already had code to look up the Steam path on macOS and Linux, it didn't look in the correct directory. This meant that it wouldn't detect the presence of RCT2, even if the user had downloaded it via the Steam Console.
2018-07-05 09:42:52 +02:00
muemart
6365eaba66 Fix #3177: Wrong keys displayed in shortcut menu
SDL_GetScancodeName doesn't actually translate the scancode to the physical key, so first we need to convert the scancode to a keycode and then turn the keycode into a string.
2018-07-03 20:48:28 +02:00
Michał Janiszewski
f370d3f0e9 Update debian control file for jansson 2.5 (#7754) 2018-07-03 12:07:29 +01:00
Michał Janiszewski
1135cbb5d0 Use C++17 explicitly in MSVC project (#7751)
Use C++17 explicitly instead of relying on the moving target of
"latest" to match all other compiler settings.
2018-07-03 12:07:14 +01:00
Michał Janiszewski
ffc285497a Merge pull request #7750 from TheAssassin/patch-1
Make CMake require C++17
2018-06-30 21:55:55 +02:00
TheAssassin
3ffc3fa6d8 Remove redundant VS C++ flag 2018-06-30 21:31:05 +02:00
TheAssassin
c01a669ca4 Replace more custom flags with CMake options 2018-06-30 21:25:23 +02:00
TheAssassin
73c158fc63 Remove redundant and unnecessary CMake CXX flag 2018-06-30 21:24:48 +02:00
TheAssassin
843f3a61ae Make CMake require C++17
Requires CMake 3.8+ which is the first version to support C++17 (see https://cmake.org/cmake/help/v3.8/prop_tgt/CXX_STANDARD.html).

Fixes #7749.
2018-06-30 15:13:25 +02:00
Michał Janiszewski
13224104e4 Ensure HTTP request variables lives till it is used (#7744)
Solves https://www.reddit.com/r/openrct2/comments/8uftdh/
2018-06-28 22:23:21 +02:00
Ted John
fe76c807aa Fix #7707: Opening scenario editor closes game
Ensure w is updated after closing the dropdown window.
2018-06-27 11:11:50 +02:00
Aaron van Geffen
84e973fa55 Xcode: revert title sequence version number change (#7735) 2018-06-26 20:54:05 +02:00
Aaron van Geffen
f963f969c1 Fix compilation on Linux, macOS. (#7732) 2018-06-26 11:16:03 +02:00
Ted John
0f2ccebfe7 Fix #7533: Screenshot is incorrectly named in CJK
For Windows, convert path to UTF-16 before passing to fstream constructor.
2018-06-25 18:14:55 +01:00
Michael Steenbeek
9e052c752b Merge pull request #7722 from spacek531/patch-4
Update ride flags 7, 16, 18
2018-06-25 12:41:09 +02:00
Gymnasiast
2172902b47 Update required objects version 2018-06-23 17:39:38 +02:00
Gymnasiast
5128737666 Rename some flags, move FLAG_16 to ride groups 2018-06-23 17:39:38 +02:00
spacek531
0861481cb6 First iteration 2018-06-23 16:24:01 +02:00