Michał Janiszewski
6695a4ce13
Fix #6497 : Boat hire boats do not return to station
...
Credit goes to @duncanspumpkin
2017-10-17 10:17:39 +02:00
OpenRCT2 git bot
2ec1c71c9f
Merge Localisation/master into OpenRCT2/develop.
2017-10-17 04:00:34 +00:00
Arnav Borborah
8271da85a2
Fix arguments to main()
2017-10-17 00:04:40 +02:00
Michael Steenbeek
6a66ef8668
Merge pull request #6442 from janisozaur/vehicle-cpp
...
Compile vehicle.c as C++
2017-10-16 17:15:43 +02:00
Michał Janiszewski
9ca73ffde2
Compact the switch statement
2017-10-16 10:42:40 +02:00
Michał Janiszewski
5843d72ece
Add comment explaining commented out code
...
[ci skip]
2017-10-16 10:19:47 +02:00
Robert Jordan
9d5c6a4127
Use proper names for predefined themes
...
Predefined themes *RCT1* and *RCT2* will now be called their respective
game name*RollerCoaster Tycoon 1* or *RollerCoaster Tycoon 2* in the
current language.
Predefined themes in the config file now are prefixed with an asterisk
like they are supposed to be. AKA `*RCT1` instead of `RCT1`.
This will invalidate the user's currently selected theme in the config
file, but only if they were using RCT1's theme.
2017-10-16 10:04:09 +02:00
Christian F. Coors
e1d24641a4
Fix saving without dialog in new scenario
2017-10-16 08:07:10 +02:00
OpenRCT2 git bot
a31add2141
Merge Localisation/master into OpenRCT2/develop.
2017-10-16 04:00:30 +00:00
Aaron van Geffen
08f7aba817
Rename 'blend' function to 'blendColours'.
2017-10-15 22:31:11 +02:00
Aaron van Geffen
346d1a6fbf
Add changelog entry.
2017-10-15 22:31:11 +02:00
Aaron van Geffen
551fdabc7f
Make the hinting threshold configurable per font.
...
This addresses the issue that tofu would not show up in Arial on macOS if the
threshold was set to 60. It being the fallback font, it is important that they
do, which requires lowering to at most 43.
However, it is even more important that the threshold is left at 60 for kanji
in e.g. Japanese to render properly.
Hence, for the moment, Arial is the only font now using a hinting threshold
of 40, for now.
2017-10-15 22:31:11 +02:00
Aaron van Geffen
899c859948
Use light hinting mode iff hinting is enabled.
...
This makes use of TTF_SetFontHinting, which was ported from SDL_ttf for the occasion.
2017-10-15 22:31:11 +02:00
Marijn van der Werf
4213a66069
Improve colour blending
2017-10-15 22:31:11 +02:00
Aaron van Geffen
579c578777
Address regression: do not blend to remappable colour areas.
2017-10-15 22:31:11 +02:00
Aaron van Geffen
5e7f9c4762
Allow enabling/disabling hinting through console.
2017-10-15 22:31:11 +02:00
Aaron van Geffen
d4c5218ba2
Move blending code to colour.c.
2017-10-15 22:31:11 +02:00
Marijn van der Werf
d6349d0095
Calculate blended palette index
2017-10-15 22:31:11 +02:00
Aaron van Geffen
0ed3ef3704
Use ColourMapA where possible.
2017-10-15 22:31:11 +02:00
Aaron van Geffen
4b7ebcb51c
Handle two rare cases: for red losses in finance window, and text in theme window.
2017-10-15 22:31:11 +02:00
Aaron van Geffen
fec0568b29
Shade black backgrounds differently (e.g. IME)
2017-10-15 22:31:11 +02:00
Aaron van Geffen
f2e795b4ef
Handle hinted font rendering in scrolled texts, too.
2017-10-15 22:31:11 +02:00
Aaron van Geffen
346cfdf135
Account for colour intensity as well as outlined texts.
2017-10-15 22:31:11 +02:00
Aaron van Geffen
2dcf9c73e7
Make font hinting optional through config.ini.
2017-10-15 22:31:11 +02:00
Aaron van Geffen
ea034e85fa
Simulate font hinting when using TrueType fonts for better legibility.
2017-10-15 22:31:11 +02:00
Aaron van Geffen
3357d32ec4
Port TTF_RenderUTF8_Shaded and TTF_drawLine_Shaded from SDL_ttf.
2017-10-15 22:31:11 +02:00
Michał Janiszewski
49d58dde3e
Review fixes
2017-10-15 22:07:47 +02:00
Michael Steenbeek
42ee2638f6
Fix Xcode project
2017-10-15 22:07:47 +02:00
Michał Janiszewski
a7be24b2b4
MSVC fixes
2017-10-15 22:07:47 +02:00
Michał Janiszewski
d365407384
Apply formatting
2017-10-15 22:07:47 +02:00
Michał Janiszewski
d9af76d5a1
Exclude parts of Vehicle.cpp from auto-formatting
2017-10-15 22:07:47 +02:00
Michał Janiszewski
f27a7a5918
Compile vehicle.c as C++
2017-10-15 22:07:47 +02:00
Gymnasiast
07cdc79bd7
Replace two missed -1 NULL pointers
2017-10-15 21:41:10 +02:00
Martin Müller
ffdc854c1f
Fix #5741 : Disappearing land/construction rights indicators
2017-10-15 16:11:08 +02:00
Tomas Dittmann
e393ff1f22
Stop using (void*)-1 for invalid pointers
2017-10-15 15:53:16 +02:00
Robert Jordan
74f1eb39a8
Fix: TitleSequence spelling errors
...
```c++
bool TileSequenceSave(TitleSequence * seq);
bool TileSequenceAddPark(TitleSequence * seq, const utf8 * path, const
utf8 * name);
bool TileSequenceRenamePark(TitleSequence * seq, size_t index, const
utf8 * name);
```
Renamed to:
```c++
bool TitleSequenceSave(TitleSequence * seq);
bool TitleSequenceAddPark(TitleSequence * seq, const utf8 * path, const
utf8 * name);
bool TitleSequenceRenamePark(TitleSequence * seq, size_t index, const
utf8 * name);
```
2017-10-15 10:33:10 +02:00
OpenRCT2 git bot
691fb3ab51
Merge Localisation/master into OpenRCT2/develop.
2017-10-15 04:00:34 +00:00
Krutonium
fd459f0791
Add a visible notification for missing KDialog/Zenity
2017-10-14 22:16:51 +02:00
Robert Jordan
0313183d13
Fix #6318 : Can't fire staff that are being placed
2017-10-14 22:14:45 +02:00
Itay Cohen
02dfe90aec
readme.md: fix inconsistent usage of separators
...
[ci skip]
2017-10-14 22:13:19 +02:00
Mark van Renswoude
ce73d3a8a5
Fix #6390 : Crash when renaming rides in multiplayer
2017-10-14 14:21:06 +02:00
Robert Jordan
167662f651
Improvement: more icon resolutions
2017-10-13 22:39:08 +02:00
Michael Steenbeek
7f9c25a7a9
Use constant for LOCATION_NULL, split off location stuff to Location.h
2017-10-13 22:23:07 +02:00
Michał Janiszewski
ab3835719a
Compile peep and staff logic as C++
2017-10-13 10:06:36 +02:00
Robert Jordan
7d6bfa19ea
Fix #6452 : scenario text truncated when switching architectures
...
`ScenarioFileIndex`'s `Serialize` and `Deserialize` now read and write each
individual value of a `scenario_index_entry` instead of the entire struct
at once. Thus the difference in pointer sizes of `highscore` on different
architecture builds will not cause issues with `scenarios.idx`.
2017-10-13 10:00:42 +02:00
Michał Janiszewski
7dad101f70
Include stdbool.h in Guard.hpp
...
C only has `bool` type when `stdbool.h` is included.
2017-10-13 08:00:32 +02:00
OpenRCT2 git bot
18d29fdc24
Merge Localisation/master into OpenRCT2/develop.
2017-10-13 04:00:32 +00:00
Michael Steenbeek
202244eda6
Revert "Remember last used rotation for rides with no tracks."
...
This reverts commit 7dc6e4e9c3
.
This commit caused hacked rides (like rollercoasters set to Crooked House) to crash
2017-10-12 23:24:51 +02:00
Tomas Dittmann
6d29fd5c77
Set null viewports to NULL, not -1
2017-10-12 21:43:39 +02:00
Tomas Dittmann
88742dce80
Ensure null objects are written as -1 to SV6
2017-10-12 21:23:54 +02:00