mirrors/OpenRCT2
2
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2.git synced 2024-08-29 21:46:05 +02:00
Code Issues Projects Releases Wiki Activity
15187 commits 9 branches 41 tags 334 MiB
Commit graph

15187 commits

This branch
This branch
All branches
Author SHA1 Message Date
clang-format
0b3edc70f2 clang-format platform 2018-07-23 16:00:07 +02:00
clang-format
bb3561f70b clang-format peep 2018-07-23 16:00:07 +02:00
clang-format
191973b202 clang-format paint 2018-07-23 16:00:06 +02:00
clang-format
a6a12af1ec clang-format object 2018-07-23 16:00:06 +02:00
clang-format
e32189fd98 clang-format network 2018-07-23 16:00:05 +02:00
clang-format
f514c223cb clang-format management 2018-07-23 16:00:05 +02:00
clang-format
737d2c490c clang-format localisation 2018-07-23 16:00:05 +02:00
clang-format
17d2693422 clang-format interface 2018-07-23 16:00:04 +02:00
clang-format
602aac47ba clang-format drawing 2018-07-23 16:00:04 +02:00
clang-format
3a4a11f738 clang-format core 2018-07-23 16:00:03 +02:00
clang-format
6f2e84e593 clang-format config 2018-07-23 15:58:02 +02:00
clang-format
41bf62fd9c clang-format cmdline 2018-07-23 15:58:02 +02:00
clang-format
77f3513cba clang-format audio 2018-07-23 15:58:02 +02:00
clang-format
90f1a328ab clang-format game actions 2018-07-23 15:58:01 +02:00
clang-format
42fa1b0f63 clang-format tests 2018-07-23 15:58:01 +02:00
Hielke Morsink
4d38475f12 Undefine keywords to fix macOS build 2018-07-23 15:58:01 +02:00
Hielke Morsink
02ce0b0b88 Fix #7670 Include header for types instead of common.h 2018-07-23 15:58:01 +02:00
Hielke Morsink
5e0aa9039f Update clang-format rules 
Indent namespaces
disallowing short case blocks on a single line
enable for Objective C files too
 2018-07-23 15:58:00 +02:00
Hielke Morsink
c5ac6ffb08 Add run-clang-format to be run by Travis CI 2018-07-23 15:58:00 +02:00
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