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
Robert Jordan
0e354e18af
Improve #6125 : Place path in park entrances ( #6479 )
...
Can now update park entrance path by placing path over the middle tile.
Updating the path costs money just like normally replacing a path.
Updating the path type can only be done in sandbox mode or in the
scenario editor.
2017-10-24 09:50:33 +02:00
Cody Jung
4bbb0b3b37
Fix #6251 : Splash Boats flat-to-25 tunnel drawn incorrectly
...
Fixes Splash Boats 25deg-down-to-flat tunnel rendering. This is based on
flat-to-25deg-up (but opposite).
Wrap Splash Boats fix in an ifdef for TestPaint.
2017-10-24 09:45:49 +02:00
Michael Steenbeek
962e479437
Remove unused function
2017-10-24 09:40:58 +02:00
Michael Steenbeek
b9e4d06d07
Compile cable_lift.c as C++
2017-10-24 09:39:40 +02:00
blackhand1001
e4caeb7ef9
Use constants for energy bars in Peep window
2017-10-24 09:19:17 +02:00
OpenRCT2 git bot
f938904cfe
Merge Localisation/master into OpenRCT2/develop.
2017-10-24 04:00:27 +00:00
Michael Steenbeek
ce4899c60c
Compile station.c as C++
2017-10-23 14:47:12 +02:00
OpenRCT2 git bot
47f5423845
Merge Localisation/master into OpenRCT2/develop.
2017-10-23 04:00:25 +00:00
zaxcav
f5ff867599
Fix #6261 : Broken pathfinding after removing park entrances with the tile inspector
...
Check the gParkEntrance locations after loading from file and clear those locations for which there is no longer a park entrance map element.
Resolves path finding problems in parks caused, for example, be deleting a park entrance using the tile inspector.
Fixes #6261 , #6344 , #6520 .
2017-10-22 23:22:46 +02:00
Michał Janiszewski
81ba7e774f
Don't trigger assert on invalid TopSpin paint
2017-10-22 22:30:16 +02:00
Aaron van Geffen
0a6e780fe6
Add extra padding to the listings in the ride window.
2017-10-22 22:00:49 +02:00
Aaron van Geffen
ec53c1c953
Add extra padding to the editor's scrollable invention lists.
2017-10-22 22:00:49 +02:00
Aaron van Geffen
9dbba6e56e
Add extra padding to scrollable list items in staff window.
2017-10-22 22:00:49 +02:00
Aaron van Geffen
cbb178743f
Add extra padding to scrollable list items in guest window.
2017-10-22 22:00:49 +02:00
Aaron van Geffen
84435262ba
Increase height of the options button on the title screen.
2017-10-22 22:00:49 +02:00
Aaron van Geffen
ac8eaaee62
Add extra padding to dropdowns and menus.
2017-10-22 22:00:49 +02:00