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

9401 Commits

Author SHA1 Message Date
Ted John
5a77355377 Merge pull request #4548 from janisozaur/compilation-fixes
Compilation fixes
2016-10-06 23:42:59 +01:00
Michał Janiszewski
9966052ca7 Fix more configurations 2016-10-06 23:32:10 +02:00
Michał Janiszewski
9da9b6f29a Remove unnecessary sprintf 2016-10-06 23:13:28 +02:00
Michał Janiszewski
4bfd5c6f4c Hide unused variables in some configurations 2016-10-06 23:13:28 +02:00
Michał Janiszewski
c9b0d9e24d Initialise all variables flagged by -Wmaybe-uninitialized 2016-10-06 23:13:28 +02:00
Duncan
63ce7170c6 Merge pull request #4547 from HaasJona/entertainer_fix
Fix #2042: Underflow in entertainer code when subtracting 200 from time_in_queue.
2016-10-06 18:22:41 +01:00
Jonathan Haas
7a13fa6221 Fix #2042: Underflow in entertainer code when subtracting 200 from time_in_queue.
Adding myself to contributors + changelog.
2016-10-06 19:15:48 +02:00
Ted John
41f026e5e2 Fix wrong function case in wooden wild mouse paint 2016-10-05 22:17:48 +01:00
Ted John
df65f3686c testpaint: Test chain lift and improve general support height assertion 2016-10-05 22:16:46 +01:00
Ted John
ebd12bde83 Fix #4537: Park with object containing no images fails to load
Allow gfx_object_allocate_images to take 0 images and return INVALID_IMAGE_ID which will safely not be freed.
2016-10-05 21:47:02 +01:00
Michael Steenbeek
e45f4be196 Merge pull request #4535 from wolfreak99/weather_in_console
set render_weather_effects and render_weather_gloom in console
2016-10-05 22:37:23 +02:00
LRFLEW
75800ed251 Fix Uninitialized Variable Warning 2016-10-05 21:36:19 +01:00
Ted John
4f247c16b2 Fix #4525: Track Designs Manager Crashing
Handle tracks that use a vehicle object that can not be found, fall-back if possible to another object of the same ride type.
2016-10-05 21:34:32 +01:00
Duncan
6599cee193 Merge pull request #4532 from LRFLEW/macversion
Fix #3842
2016-10-05 21:02:54 +01:00
Ted John
001120e6b2 Fix #4531: Ride sound focus not available any longer
Only reset the ride viewport if it the window has actually been resized and maintain the viewport flags.
2016-10-05 19:08:20 +01:00
Ted John
0341935ee4 Merge pull request #4530 from IntelOrca/paint/wild-mouse
Paint Setup: Wild Mouse
2016-10-05 18:55:07 +01:00
Ted John
2de33772cd Revert openrct2.vcxproj.user 2016-10-05 18:39:49 +01:00
Ted John
c6efe8dabc Clean up 2016-10-05 18:39:25 +01:00
Ted John
8abd11f8bd Implement right quarter turn 3, 25 deg up and counterpart 2016-10-05 18:31:37 +01:00
LRFLEW
79a5cec15a Improve Retina Display Support on macOS 2016-10-05 18:24:10 +01:00
LRFLEW
97cc97e0e8 Fix #3842: Version number not up to date
Add Version Information to Info.plist for macOS
2016-10-05 11:50:31 -05:00
wolfreak99
53c123acae set render_weather_effects and render_weather_gloom in console 2016-10-05 10:43:38 -04:00
Ted John
8f77790e4d Implement right quarter turn 3, 25 deg down and counterpart 2016-10-05 13:03:28 +01:00
Ted John
71cf498206 Implement quarter turn 3 2016-10-04 22:29:22 +01:00
Ted John
59cf534bbb Implement quarter turn 1 2016-10-04 22:13:48 +01:00
Ted John
78e7bdf4ea Implement steep to flat pieces 2016-10-04 21:45:03 +01:00
Ted John
53f613a30d Implement most slope pieces 2016-10-04 21:31:36 +01:00
Ted John
d29bc09683 Implement rotation control toggle 2016-10-04 20:29:28 +01:00
Ted John
8f38a3b279 Implement brakes 2016-10-04 18:47:09 +01:00
Ted John
461680be46 Implement station 2016-10-04 18:39:22 +01:00
Ted John
67d04a26ee Implement flat 2016-10-04 18:29:03 +01:00
Ted John
80f2389de0 Setup debug settings 2016-10-04 18:22:27 +01:00
Ted John
497c99a2b8 Setup wild mouse paint function 2016-10-04 18:21:55 +01:00
Michał Janiszewski
71d0861be1 Mark classes as final
This may hint compiler to de-virtualise some calls.
2016-10-04 18:14:29 +01:00
Ted John
4b92e5e820 Merge pull request #4521 from marijnvdwerf/fix/osx-macos
Convert more occurences of OS X to macOS
2016-10-04 18:14:03 +01:00
OpenRCT2 git bot
89d672ba70 Merge Localisation/master into OpenRCT2/develop. 2016-10-04 04:00:21 +00:00
Ted John
3bb05e2ddd Merge pull request #4523 from IntelOrca/paint/wooden-wild-mouse
Paint Setup: Wooden Wild Mouse
2016-10-04 00:27:25 +01:00
Ted John
973765769d Remove unnecessary braces 2016-10-04 00:20:22 +01:00
Ted John
f58cbfbb69 Revert openrct2.vcxproj.user 2016-10-04 00:11:09 +01:00
Ted John
ef81919f02 Implement quarter turn 3 2016-10-04 00:10:50 +01:00
Ted John
c6a1ecab91 Implement quarter turn 1 2016-10-03 23:50:48 +01:00
Ted John
475a142bf7 Implement steep to flat pieces 2016-10-03 23:50:34 +01:00
Ted John
3c43bb5522 Implement most of the slope pieces 2016-10-03 22:35:06 +01:00
Michael Steenbeek
52e5506d9a Fix crashes in ride with more than 12 cars per train 2016-10-03 21:58:52 +01:00
Ted John
fc8bd70f93 Implement 25 and 60 deg up 2016-10-03 21:40:32 +01:00
Ted John
e18233d71e Implement station 2016-10-03 21:40:32 +01:00
Ted John
041b286c8b Implement flat 2016-10-03 21:40:32 +01:00
Ted John
1bb09d6c62 Setup debug settings 2016-10-03 21:40:32 +01:00
Ted John
7c61b960b7 Setup paint function for wooden wild mouse coaster 2016-10-03 21:40:32 +01:00
Ted John
3cbf06c886 Fix sub_98197C_rotated 2016-10-03 21:40:13 +01:00