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

13007 Commits

Author SHA1 Message Date
LRFLEW
d3d41ea724 OpenGL: Add single-pass transparency 2017-10-30 16:21:49 +01:00
LRFLEW
3d2d99817c OpenGL: Add Depth Buffer and Depth Test 2017-10-30 16:21:49 +01:00
LRFLEW
6bf2e0157b OpenGL: Improve Shaders 2017-10-30 16:21:49 +01:00
LRFLEW
f105237a2e OpenGL: Delay Palette Mapping Until Final Framebuffer Copy to Screen 2017-10-30 16:21:49 +01:00
duncanspumpkin
85b257cc2e Fix #6503. GameActions correctly recorded.
Mistake made during GameActions refactor.
2017-10-30 12:09:40 +01:00
duncanspumpkin
b96657c0cd Fix #6478. Rides can no longer be destroyed during pause mode.
Mistake made during refactoring into GameAction
2017-10-30 12:09:40 +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
Marijn van der Werf
fb7f97d360 Update Xcode project 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
9815df5e04 Remove redundant checks for group
It is enough to just check it once
2017-10-30 12:04:23 +01:00
Michał Janiszewski
75685fa75d Fix #3781: Glitchy map causing crash 2017-10-30 12:03:34 +01:00
Michał Janiszewski
216836cd12 Remove unnecessary condition
It is impossible for two positive integers, each <= 0x7fff, to form a
sum larger than 0xffff
2017-10-30 10:53:28 +01:00
OpenRCT2 git bot
e656418286 Merge Localisation/master into OpenRCT2/develop. 2017-10-30 04:00:30 +00:00
Gymnasiast
bc3b579b92 Fix import of RCT1's inverted coaster train 2017-10-28 19:02:58 +02:00
Aaron van Geffen
25d5ff729a Increase padding and fix button alignment for load/save window 2017-10-28 09:32:31 +02:00
Michael Steenbeek
5035492f8c Fix #6535: Donut shop renders black spots that should be white
Issue caused by a regression that also broke #1749 (rainbow path) and the pause button.
Reinstated the fix from 599c259603.
2017-10-27 12:07:52 +02:00
Cody Jung
cc82fceaef Fix #6199: Inverted hairpin coaster vehicle tab has vehicle too low 2017-10-27 11:25:18 +02:00
Ted John
017eb4df72 Refactor date update and checks to new functions 2017-10-27 11:23:10 +02:00
Robbin Voortman
f0b8559341 Lower game actions verbosity 2017-10-27 11:14:37 +02:00
Aaron van Geffen
f1c69ac4f7 Take font line height into account in News window. 2017-10-27 11:11:43 +02:00
Aaron van Geffen
a058b39b90 Add extra padding to options in News Options screen. 2017-10-27 11:11:43 +02:00
Michał Janiszewski
27f2198cb5 Properly declare track data in C++ 2017-10-25 23:53:47 +02:00
Michael Steenbeek
2692e98434 Fix Xcode project 2017-10-25 23:53:47 +02:00
Michał Janiszewski
a70a1bc523 Compile track_data_old as C++ 2017-10-25 23:53:47 +02:00
Michał Janiszewski
2b505926c4 Format TrackData.h 2017-10-25 23:53:47 +02:00
Michał Janiszewski
90a14205c8 Compile track_data.c as C++ 2017-10-25 23:53:47 +02:00
Michael Steenbeek
b232bdf3a3 Make some variables const 2017-10-25 23:13:54 +02:00
Michael Steenbeek
17fdf1511f Clear entrance/exit location if no entrance or exit is found 2017-10-25 23:13:54 +02:00
Michael Steenbeek
e3b0409fbc Also fix disconnected exits 2017-10-25 23:13:54 +02:00
Michael Steenbeek
e53d76f7e1 Fix disconnected entrances when loading save 2017-10-25 23:13:54 +02:00
Robert Jordan
98043c284b Fix: Steam path locator Android build error
Added `platform_get_steam_path` to android.c
2017-10-25 18:37:26 +02:00
Ted John
be4fe7b681 Rename total ride value to total ride value for money 2017-10-25 13:38:06 +02:00
Michael Steenbeek
4290d0a65d Fix some erroneous use of LOCATION_NULL
Found by @janisozaur and introduced in PR #6461.
2017-10-25 11:59:29 +02:00
OpenRCT2 git bot
33dd3b2275 Merge Localisation/master into OpenRCT2/develop. 2017-10-25 04:00:33 +00:00
Robert Jordan
c9c0c07eca RCT2 Steam path locator: improve OS support
Now looks for RCT2 install within OS-specific steam install directories.
Also checks the registry in Windows in case Steam has a custom install
path.
2017-10-24 18:36:40 +02:00
Michał Janiszewski
d924d771a6 Update changelog for #6295
[ci skip]
2017-10-24 16:30:58 +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
Michael Steenbeek
6757633965 Fix formatting and a refactor mistake 2017-10-24 10:11:48 +02:00
Michael Steenbeek
887ec16b53 Split off ride_get_rotated_coords() 2017-10-24 10:11:48 +02:00
Michael Steenbeek
c77c15e4de Initialise more variables to keep AppVeyor happy 2017-10-24 10:11:48 +02:00
Michael Steenbeek
e4132c9030 Initialse foundTrack 2017-10-24 10:11:48 +02:00
Michael Steenbeek
1b78f87177 Remove goto from ride_get_entrance_or_exit_position_from_screen_position() 2017-10-24 10:11:48 +02:00
Michael Steenbeek
2742bd8db4 Remove goto from ride_music_update_final() 2017-10-24 10:11:48 +02:00
Michael Steenbeek
2fd33c4c61 Remove goto in ride_get_track_length() 2017-10-24 10:11:48 +02:00
Michael Steenbeek
cabd65f3e7 Remove ride_music_params_update gotos 2017-10-24 10:11:48 +02:00