Michael Steenbeek
b0c784ed71
Fix # 6775: New Campaign window only shows 40 rides
2017-12-04 08:35:33 +01:00
Aaron van Geffen
837b177d9d
Simplify UI scaling display quality options ( #6764 )
...
Simplify UI scaling display quality options.
This removes three options:
* 'Use NN scaling at integer scales', as NN is decidedly preferable at integer scales.
* Anisotropic scaling, as it produces results very similar (if not equal) to linear scaling.
* NN as a selectable option in the dropdown - NN is forced on integer scales and unavailable for non-integer scales.
2017-12-03 22:35:16 +01:00
Ted John
107461bbe8
Reintroduce XDG_CONFIG_HOME
...
Accidentally removed resolving the user data path by XDG_CONFIG_HOME environment variable
2017-12-03 19:22:35 +00:00
TELK
349d19e834
Check rct_window is NULL
2017-12-03 18:08:40 +01:00
TELK
b7ca7d25ee
Fix #6625 : Not to try to open a ride window when it crashes
2017-12-03 18:08:40 +01:00
OpenRCT2 git bot
08893ecff9
Merge Localisation/master into OpenRCT2/develop.
2017-12-03 04:02:57 +00:00
Ted John
33d0fa9b8c
Merge pull request #6748 from IntelOrca/fix/2410
...
Refactor logic for resolving base paths
2017-12-02 19:08:43 +00:00
Michał Janiszewski
079d223663
Actually fix RCT2 builds
2017-12-02 19:46:02 +01:00
Ted John
64f129c616
Fix RCT2 builds
2017-12-02 18:03:54 +00:00
Ted John
6ef5154b02
Fix #6761 : An assertion failed - Invalid Font index 65675
...
Special font bases were not converted in font_sprite_get_codepoint_width.
Assert converted to safe warning.
2017-12-02 11:47:24 +00:00
Michał Janiszewski
0920e58f98
Remove ADVERTISE_STATUS_ prefix
2017-12-02 09:03:59 +01:00
Michał Janiszewski
8e57c7d05d
Make ADVERTISE_STATUS enum class
2017-12-02 09:03:59 +01:00
Michał Janiszewski
053a2540f3
Fix building with HTTP disabled, but network enabled
2017-12-02 09:03:59 +01:00
Ted John
11fac1bbf5
Change back to current directory structure
2017-12-01 21:09:52 +00:00
Michael Steenbeek
8a62229a5b
Fix build on Xcode
2017-12-01 21:09:52 +00:00
Michael Steenbeek
3dfb4214f3
Fix Xcode project
2017-12-01 21:09:52 +00:00
Ted John
205fdaefa7
Split up Platform2 by OS
2017-12-01 21:09:52 +00:00
Ted John
bbc389d18e
Fix remaining code issues
2017-12-01 21:09:52 +00:00
Ted John
ea356cd2b9
Fix mingw
2017-12-01 21:09:52 +00:00
Ted John
679aae801d
Fix GetFolderPath for Windows
2017-12-01 21:09:52 +00:00
Ted John
66a6aa95f6
Redirect platform_get_user_directory to IPlatformEnvironment
...
- Remove old code for getting user directory, redirect to IPlatformEnvironment.
- Fix config loading so that it uses path straight from IPlatformEnvironment.
- Add more special folder implementation in Platform2.
2017-12-01 21:09:52 +00:00
Ted John
dcb92a466d
Add new base path for user data and config
...
Refactor more path resolution to Platform2.cpp
2017-12-01 21:09:45 +00:00
Ted John
f52544d607
Fix #6739 : Park name isn't displayed
...
Fix wrong type, down cast introduced by mistake in 585fc1afce
2017-12-01 20:25:41 +00:00
Ted John
1f456d3e8e
Merge pull request #6638 from janisozaur/font-guard
...
Guard access to font
2017-12-01 20:13:58 +00:00
Stefan Winkler
516c5737be
Set branch/sha1 defines only for specific files
2017-12-01 21:05:44 +01:00
Michael Steenbeek
63f7820b25
Fix #1185 : Close button colour of prompt windows does not match
2017-12-01 17:36:30 +01:00
Michael Steenbeek
57a2612365
Fix scenery group assignment race conditions
...
When adding entries to scenery groups by hand, like we do for a lot of ToonTowner's stuff, it currently tries to get the loaded scenery group. If this happens not to be loaded at that time, this will fail.
Instead, hardcode the headers - that's how object .DATs do this anyway.
2017-12-01 11:54:25 +01:00
Michael Steenbeek
7b373e23ac
Fix #6756 : Raise maximum amount of scenery items per tab to 1024
2017-12-01 10:02:33 +01:00
OpenRCT2 git bot
f4b6b728e3
Merge Localisation/master into OpenRCT2/develop.
2017-12-01 04:00:39 +00:00
Aaron van Geffen
1747253c42
Do not accept implicit font substitutions from FontConfig.
...
FontConfig implicitly falls back to any default font it is configured to handle.
In our implementation, this cannot account for supported character sets, leading
to unrendered characters (tofu) when trying to render e.g. CJK characters using a
Western (sans-)serif font. We therefore ignore substitutions FontConfig provides,
and instead rely on exact matches on the fonts predefined for each font family.
2017-11-30 23:35:02 +01:00
Michael Steenbeek
3eb0ffbc53
Add #5838 to changelog
...
[ci skip]
2017-11-30 23:28:17 +01:00
Tomas Dittmann
1332004640
switch returnvalue from 0 to `false`.
...
switch const variable to `#define`
2017-11-30 23:26:15 +01:00
Tomas Dittmann
60b457d13f
Prevent writing to invalid memory.
...
Switch magic number to constant `maxTrackElements`.
If the number of TrackElements becomes equal to maxTrackElements, cleanup the data and abort the export.
2017-11-30 23:26:15 +01:00
Michael Steenbeek
b0aaf13cec
Clean up and future-proof peep spawn import
2017-11-30 23:08:59 +01:00
Ted John
47a68e9e90
Add constant for maximum zoom level
2017-11-30 21:21:38 +00:00
OpenRCT2 git bot
5d5c64acbf
Merge Localisation/master into OpenRCT2/develop.
2017-11-30 04:00:45 +00:00
Michael Steenbeek
251dad113c
Make ride_entry_get_first_non_null_ride_type() take a const ride entry
2017-11-29 12:15:33 +01:00
Michael Steenbeek
e568dcabff
Adding some missing entries to changelog
2017-11-29 12:09:05 +01:00
Michael Steenbeek
7feb0f8f7e
Fix #4760 : Correct guest entry points on loading scenario
2017-11-29 09:10:09 +01:00
Michael Steenbeek
32f91e3e45
Draw friction wheels instead of chain on LRC station
2017-11-29 09:08:27 +01:00
OpenRCT2 git bot
743c79c169
Merge Localisation/master into OpenRCT2/develop.
2017-11-29 04:00:46 +00:00
Michael Steenbeek
677815ddc8
Update update info in readme
2017-11-28 22:38:32 +01:00
Michael Steenbeek
4430496d03
Bump minimum Windows version to 7, remove copypasta from OpenTTD
2017-11-28 22:37:53 +01:00
Michael Steenbeek
3f8556c85a
Fix #6294 : Refactor Editor::SelectedObjects
2017-11-28 13:38:54 +01:00
OpenRCT2 git bot
66aa25da81
Merge Localisation/master into OpenRCT2/develop.
2017-11-28 04:01:14 +00:00
Michał Janiszewski
3df5dd8391
More compiler warnings
2017-11-27 23:52:17 +01:00
Michał Janiszewski
f46f2d6821
Fix g1 image ID check ( #6742 )
2017-11-27 22:03:54 +00:00
OpenRCT2 git bot
a3be15c9c9
Merge Localisation/master into OpenRCT2/develop.
2017-11-27 04:01:17 +00:00
Michał Janiszewski
585fc1afce
Ensure variables in switch are properly scoped
2017-11-26 23:14:40 +01:00
Ted John
86ec21016d
Merge pull request #6487 from janisozaur/includes
...
Remove limits.h from common.h
2017-11-26 22:08:51 +00:00