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

218 Commits

Author SHA1 Message Date
Michael Steenbeek
af845beb61 Replace mapElement with tileElement 2017-10-31 19:59:06 +01:00
Michael Steenbeek
ce8d9cc71b Rename map_element to tile_element 2017-10-31 19:59:06 +01:00
Aaron van Geffen
765e3d9a4f Remove unnecessary ceil call 2017-10-30 16:31:03 +01:00
Robert Jordan
a3c64bb146 Feature: Preview title sequences in-game
Title sequences can now be played back in-game, allowing for much easier
editing.

Improved title sequence playback in general. Clicking play while on a
different title sequence will play the new one. Clicking stop will make
the title screen go back to the config title sequence. And the closing
the title sequence window will also make the game go back to the config
title sequence, and reload the sequence if it was modified.

Changes made to title sequences in-game are now correctly loaded in the
title screen.

Starting a title sequence within the editor will now always reset it
even if it's the current playing sequence. (Not for playing in the
editor though).

Get Location in title sequence command editor now has 100% accuracy
compared to before
where it would usually get some offset value.

Added `get_map_coordinates_from_pos_window` which will allow getting the
viewport coordinates of a specific window even if the input coordinates
are under another window. This has use with getting 2D positions from
the main window without the other windows getting in the way.

Options window will now always specify the config title sequence in the
dropdown and not the current title sequence.

Made a global variable `gLoadKeepWindowsOpen`, in game.h to keep windows
open when loading a park. When loading a title sequence park in-game.
The sequence player will force-close all park-specific windows ahead of
time.

Skipping while testing title sequences no longer needs to reload the
park if the current playback position is already before the target
position and ahead of the load position.

Added changelog entry.
2017-10-30 12:07:01 +01:00
Aaron van Geffen
dd4f5ff93b Use 'STHeiti' for Chinese (Simplified) on macOS. 2017-10-30 12:06:05 +01:00
Aaron van Geffen
9cb25e6106 Use 'LiHei Pro' for Chinese (Traditional) on macOS. 2017-10-30 12:06:05 +01:00
Aaron van Geffen
b393ce3f11 Introduce 'Nanum' as a macOS alternative for Gulim when using Korean. 2017-10-30 12:06:05 +01:00
Aaron van Geffen
744341af07 Introduce 'Arial Unicode MS' as a more compatible alternative to regular Arial. 2017-10-30 12:06:05 +01:00
Aaron van Geffen
58add28604 Introduce 'Hiragino Maru Gothic' for Japanese on macOS. 2017-10-30 12:06:05 +01:00
Aaron van Geffen
8c8a2317f6 Initial prototype for font families. 2017-10-30 12:06:05 +01:00
Michał Janiszewski
90a14205c8 Compile track_data.c as C++ 2017-10-25 23:53:47 +02:00
Cody Jung
c25a4490e4 Windows: Fix bad screenshots if park name has ":"
Fixes issue #6481 where taking a screenshot of a park with a colon in
its name on Windows was causing the screenshot data to get written as an
alternate data stream.

This patch replaces any colons with hyphens in screenshot filenames on
Windows.
2017-10-24 14:52:40 +02:00
Aaron van Geffen
9984fcac88 Set default TTF font heights to more sensible values. 2017-10-22 21:47:17 +02:00
Aaron van Geffen
9f67fafc43 Add theme support for console background colour. 2017-10-19 21:26:53 +02:00
Aaron van Geffen
a0fb2a6d7c Fix game console overflowing when using TTF for rendering. 2017-10-19 21:26:53 +02:00
Michał Janiszewski
8fd2266bda Refactor includes (#6512)
* Refactor Intent.h inclusion

* Use forward declaration of ITcpSocket

* Remove unused include

* Forward declare rct_ride_entry

* Remove unused headers

* Forward-declare rct_drawpixelinfo

* Remove unused headers

* Lower header include from header to source file

* Reduce included headers

* Reduce includes
2017-10-19 10:01:05 +02:00
Marijn van der Werf
bcb6b83a7d Fix #6514: Groupbox titles break format arguments 2017-10-18 21:55:20 +02:00
Aaron van Geffen
d6ee66acb4 Split/rename ROW_HEIGHT constant into widget-specific ones. 2017-10-18 11:17:22 +02:00
Aaron van Geffen
7e9a5bbb6b Increase padding for finances summary and marketing tab. 2017-10-18 11:17:22 +02:00
Michael Steenbeek
79365b7a91 Merge pull request #6075 from marijnvdwerf/ui/text-paint
Refactor text painting
2017-10-18 07:49:13 +02:00
Michael Steenbeek
bb01699b7d Compile track.c as C++ 2017-10-17 13:51:47 +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
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
Aaron van Geffen
08f7aba817 Rename 'blend' function to 'blendColours'. 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
Michał Janiszewski
f27a7a5918 Compile vehicle.c as C++ 2017-10-15 22:07:47 +02:00
Tomas Dittmann
e393ff1f22 Stop using (void*)-1 for invalid pointers 2017-10-15 15:53:16 +02:00
Ted John
a8c9c758f4 Fix a couple of bugs 2017-10-14 23:38:51 +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
Tomas Dittmann
6d29fd5c77 Set null viewports to NULL, not -1 2017-10-12 21:43:39 +02:00
Michał Janiszewski
c4538496c5 Make sure variables are either static or declared externally 2017-10-09 22:59:40 +02:00
Aaron van Geffen
bfc999aac9 Order language list by native name 2017-10-09 10:53:09 +02:00
duncanspumpkin
79f34c6fa3 Add remove park fences console command 2017-10-09 10:49:06 +02:00
Marijn van der Werf
ebb4bbe5d5 Move ride list window to UI module (#6412) 2017-10-08 22:15:41 +02:00
Marijn van der Werf
d02976695d Move new ride and research windows 2017-10-07 22:24:14 +02:00
Marijn van der Werf
eef3bd9af5 Move staff and guest windows 2017-10-07 22:24:14 +02:00
Marijn van der Werf
8569a7fe2f Move map window 2017-10-07 22:24:14 +02:00
Michael Steenbeek
31e1ad43a8 Compile finance.c as C++, clean up 2017-10-07 16:28:35 +02:00
Michael Steenbeek
25b72260d7 Compile research.cpp as C++, small refactor 2017-10-06 21:41:50 +02:00
Christian F. Coors
ecc6bf5120 Fix scrolling with mouse wheel 2017-10-06 10:17:43 +02:00
Michael Steenbeek
f2195b4300 Use constants and proper formatting in colour.[ch] 2017-10-05 15:55:57 +02:00
Olivier Wervers
a75d727685 Implement #5826: Add command to show map data counts and limits 2017-10-05 10:00:32 +02:00
ZehMatt
5aa8ae5c6e Fix viewport coordinates being set too late.
Fix headless always sending 0,0 viewport coordinates.
2017-10-05 09:57:08 +02:00
Michael Steenbeek
ccefc98491 RCT1 theme: make Options and Shortcut windows brown 2017-10-02 11:45:28 +02:00