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

13260 Commits

Author SHA1 Message Date
Ted John 4a66e98bb5 Add more null checks to get element functions 2017-11-04 18:06:59 +00:00
Ted John 6341a1679c Fix #6618: Crash when loading Covey Cove 
Add null check for map_get_first_element_at in map_get_park_entrance_element_at
 2017-11-04 18:04:16 +00:00
OpenRCT2 git bot ce6ae6d07a Merge Localisation/master into OpenRCT2/develop. 2017-11-04 04:00:41 +00:00
Ted John 446f57e43b Fix NO-RCT2 builds 2017-11-03 22:24:04 +00:00
Ted John 4232be9fc2 Remove remaining external uses of g1element 2017-11-03 22:18:10 +00:00
Ted John 444a8c1602 Const protect get_g1_element 2017-11-03 22:18:10 +00:00
Ted John 5a05bd51e5 Use get_g1_element and add null checks 2017-11-03 22:18:10 +00:00
Robert Jordan 8da1cad3ab Enhance: Change title editor default selection 
Title editor sequence selection now defaults to current preset. This is
only after the first time the window is opened. Afterwards it keeps the
last selection.
 2017-11-03 21:34:37 +01:00
Robert Jordan a01471b535 Enhance #6530: Don't block land rights tool 
Land rights tool no longer cares if part of the available land is
unavailable for purchase. It will not even through an error when none of
the tiles are available. Just like other tools.

Added a changelog entry.

This increments the network version.
 2017-11-03 19:21:58 +01:00
Robert Jordan f4538c6557 Fix: Realign Park Viewport 
The viewport had a 1x1 spacing before the bottom right border was
reached.
 2017-11-03 07:53:25 +01:00
OpenRCT2 git bot a8374af240 Merge Localisation/master into OpenRCT2/develop. 2017-11-03 04:00:32 +00:00
Marijn van der Werf 45b75692d9 Fix code style 2017-11-03 01:54:37 +01:00
Marijn van der Werf ee2f04864f Update Xcode project 2017-11-03 01:54:37 +01:00
Marijn van der Werf bbe46cb583 Sort affected includes 2017-11-03 01:54:37 +01:00
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