mirrors
/
OpenRCT2
mirror of https://github.com/OpenRCT2/OpenRCT2.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity
13,046 Commits 7 Branches 39 Tags 356 MiB
Commit Graph

13046 Commits

Author SHA1 Message Date
Marijn van der Werf 666809fb8b Move object load error window to UI module 2017-11-03 01:54:37 +01:00
Marijn van der Werf 59df233669 Move text input window to UI module 2017-11-03 01:54:37 +01:00
Marijn van der Werf de6b3b4ebf Sort includes in Guest.cpp 2017-11-03 01:54:37 +01:00
Marijn van der Werf 4a4f9648a7 Move network status window to UI module 2017-11-03 01:54:37 +01:00
Marijn van der Werf b85f9c3f68 Move maze construction window to UI module 2017-11-03 01:54:37 +01:00
Marijn van der Werf 1e335308cc Move map tooltip to ui module 2017-11-03 01:54:37 +01:00
Marijn van der Werf ee6c3cfc56 Move track design list window to UI module 2017-11-03 01:54:37 +01:00
Marijn van der Werf 61255e25a7 Move Ride window to UI module 2017-11-03 01:54:37 +01:00
Marijn van der Werf 427d639e69 Improve title screen options button appearance 2017-11-02 22:57:00 +01:00
Martin Müller 8422556bc1 Fix #6566 and #6573: Highscores don't get saved 
For some RCT2 parks the scenario name in the sv6 file is wrong, so take the real filename.
 2017-11-02 19:31:01 +01:00
Robert Jordan d79d2a7503 Fix numerous title sequence editor bugs 
* Change how current title sequence is handled. It can either be
previewing a title sequence, or playing the preset.
* LoadMM and LoadRCT1 now save when script is saved.
* No more infinite failing to load loops.
* No more crashing when attempting to display "no save selected" in
title editor.
* Title editor now gracefully fails to preview a title sequence and lets
the user know with a context error.
* When preset title sequence fails to load, the preset will forcibly be
changed to the first sequence to successfully load.

Added changelog entries for last two items.
 2017-11-02 18:36:37 +01:00
Michael Steenbeek 0b3da4b209 Create constants for music tunes 2017-11-02 17:31:31 +01:00
Michał Janiszewski 13dd00e386
Add missing branch information to android jobs 2017-11-02 16:22:07 +01:00
Michał Janiszewski 6c3e215907
Push cron-built android builds to openrct2.org 
Fixes #5657
 2017-11-02 15:28:21 +01:00
Christian F. Coors 06afeeda9a Apply some refactoring 2017-11-02 12:22:28 +01:00
Michael Steenbeek 386a399a51
Fix #6593: Can't hire entertainers when default scenery groups are deselected 2017-11-02 11:10:26 +01:00
OpenRCT2 git bot e9c7f6d589 Merge Localisation/master into OpenRCT2/develop. 2017-11-02 04:00:33 +00:00
Robert Jordan 88b487309d Refactor: Title Editor new lines 
[ci skip]
 2017-11-01 22:42:58 +00:00
Robert Jordan 9917a24a58 Remove < 0 check for size_t 2017-11-01 22:42:58 +00:00
Robert Jordan b715d83bfd Add missing size_t cast 2017-11-01 22:42:58 +00:00
Robert Jordan 61accf6e02 Fix another missing instance of size_t 2017-11-01 22:42:58 +00:00
Robert Jordan 0698154ba1 Refactor: Title sequences and switch to size_t 2017-11-01 22:42:58 +00:00
Michael Steenbeek 3d8ec4e393 Warn when loading incompatible RCTC saves 2017-11-01 20:23:06 +01:00
Robert Jordan 9425ed1aee Implement #6307: Display arrow on park entrance placement 2017-11-01 18:14:01 +01:00
rwjuk 3125956b77 Fix off-by-one error in placement of centred text 2017-10-31 21:04:42 +01:00
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
Michał Janiszewski fb74d12f31 Fix NULL checks in facility_paint_setup 2017-10-30 22:55:12 +01:00
Michał Janiszewski b12dad5bd9 Remove duplicate assignment in S4Importer.cpp 2017-10-30 22:51:35 +01:00
Michał Janiszewski ed5b655b09 Fix StringTable::Sort comparator 
Previously, it explicitly compared to -1, while _strcmpi can return
all integers.
 2017-10-30 22:46:57 +01:00
Michał Janiszewski 4d0a8143bc Remove redundant check in peep_update_answering 
The field `mechanic_status` is verified to be RIDE_MECHANIC_STATUS_HEADING
when entering the function
 2017-10-30 22:18:17 +01:00
Michał Janiszewski c7c0c15abf Update formatting for recent changes 2017-10-30 16:45:16 +01:00
Michał Janiszewski d3a30132a8 Fix check order that did not function properly 
The checks were done in https://github.com/OpenRCT2/OpenRCT2/pull/6576
but probably due to me later rearranging things, I got them wrong.
 2017-10-30 16:45:16 +01:00
Aaron van Geffen 765e3d9a4f Remove unnecessary ceil call 2017-10-30 16:31:03 +01:00
Michał Janiszewski 076be24bb9 Default-initialise fields in DrawRectShader 2017-10-30 16:21:49 +01:00
LRFLEW 778cb9d024 Rename CopyFramebufferShader to ApplyPaletteShader 2017-10-30 16:21:49 +01:00
LRFLEW 50600f6195 Move MaxTransparencyDepth 2017-10-30 16:21:49 +01:00
LRFLEW 7db8d0f00a OpenGL: Fix linear DPI scaling 2017-10-30 16:21:49 +01:00
LRFLEW aac1c59714 OpenGL: Add multi-pass transparency 2017-10-30 16:21:49 +01:00
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