mirrors/OpenRCT2
2
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2.git synced 2024-09-10 11:32:47 +02:00
Code Issues Projects Releases Wiki Activity
18456 commits 9 branches 42 tags 369 MiB
Commit graph

18456 commits

This branch
This branch
All branches
Author SHA1 Message Date
Michael Stowe
f281aa1a80
Fix #8571: Redundant comparison in Station.cpp 2020-04-25 00:08:04 +02:00
Michael Steenbeek
2a95a9c2af
Merge pull request #11441 from Gymnasiast/refactor/nodiscard 
Mark getters in audio layer as [[nodiscard]]
 2020-04-24 23:18:27 +02:00
Tom Lankhorst
da0c586fad
Mark getters in audio layer as [[nodiscard]] 2020-04-24 18:38:11 +02:00
WantDiscussion
37e9270c00
Close #6024: Closing object selection now advances to next step 
In the scenario editor and track designer X button in object selector
will now close the object selector window and advance to the next stage
instead of closing the scenario editor and track editor entirely and
returning to the main menu.

Co-authored-by: Gymnasiast <m.o.steenbeek@gmail.com>
 2020-04-24 17:19:06 +02:00
Michał Janiszewski
295a98028e
Disable warnings around incompatible function pointer cast (#9543) 
This addresses a compilation issue with newer (8+) mingw.

Co-authored-by: Gymnasiast <m.o.steenbeek@gmail.com>
 2020-04-24 16:03:03 +02:00
Umdlye
76c10d1806
en-GB: Fix capitals after hyphens 
Co-authored-by: pizza2004 <pizza2004@users.noreply.github.com>
 2020-04-24 15:32:38 +02:00
Michael Steenbeek
baf6f1587a
Add #11390 to changelog 2020-04-24 13:27:25 +02:00
FlukiestEmperor
23d295924d
Fix Android filesystem compilation error when using NDK revision 19+ 
When attemping to build with ndk 19+ I get the following error: error: undefined reference to 'std::__ndk1::__fs::filesystem::path::__extension() const'

Looking at this issue here https://github.com/android/ndk/issues/609 and https://android.googlesource.com/platform/ndk/+/master/docs/Roadmap.md#package-management it's stated that the ndk does not support std::filesystem.
 2020-04-24 13:08:44 +02:00
Michał Janiszewski
b9671b0353
Merge pull request #11433 from FlukiestEmperor/android-cleanup 
Android cleanup
 2020-04-24 09:27:52 +02:00
OpenRCT2 git bot
2fd8e7a9ff Merge Localisation/master into OpenRCT2/develop. 2020-04-24 04:02:05 +00:00
FlukiestEmperor
944e61d446 Add missing nullable annotations 2020-04-23 22:23:51 -05:00
FlukiestEmperor
512d77e011 Remove unreachable code 
Since the compile sdk is 19, the if check is always true since it's checking 19 >= 17. This also removes the need for the success boolean which would always be true.
 2020-04-23 22:21:28 -05:00
Michael Steenbeek
44f62a97c2
Move PhotoItem to RTD (#11415) 2020-04-24 04:47:40 +02:00
Michael Steenbeek
144d312ead
Fix RCT1 import importing too many vehicle types (#11419) 2020-04-24 04:00:41 +02:00
Michael Steenbeek
f5e2efac77
Close #11390: Write OpenRCT2 build hash to screenshot metadata (#11423) 2020-04-24 04:00:17 +02:00
Michael Steenbeek
619b06254e
en-GB: Change "plug-in objects" to "custom objects" (#11421) 
This change is to avoid confusion with the upcoming plug-in system. Additionally, "custom objects" is what most people would call these anyway.
 2020-04-23 23:38:25 +02:00
ifimfree
aaaae16d15
Close #11209: Show a warning when the user is running OpenRCT2 in Wine (#11395) 2020-04-23 19:12:54 +02:00
Michael Steenbeek
092b9c0086
Update changelog for #11405 
[skip-ci]
 2020-04-23 14:51:02 +02:00
Michael Steenbeek
62482312fb
Bump network version 2020-04-23 14:44:23 +02:00
Michael Steenbeek
d0f2ade778
Fix #11405: Building path through walls does not always remove them (#11416) 2020-04-23 14:35:54 +02:00
Tulio Leao
dd64295ba7
Rename and improve documentation on MAX_STR_COUNT (#11409) 2020-04-23 12:29:02 +02:00
Breno Rodrigues Guimarães
c0d0c7de16
Part of #11389: Replace set_format_arg by Formatter::Common() (#11388) 2020-04-22 21:41:20 -03:00
Breno Rodrigues Guimarães
ef8fd20c99
Let Ride::FormatStatusTo return the number of written bytes (#11411) 2020-04-22 21:24:51 -03:00
Mustapha Elghoul
b138cb46ba
Name Flags in PeepThoughtToActionMap 2020-04-22 18:50:53 +02:00
Michał Janiszewski
2323cc1596
Use named casts instead of old-style casts 
Change prepared with clang-tidy and google-readability-casting check
 2020-04-22 17:09:29 +02:00
Duncan
cfd94d4fa5
Merge pull request #11382 from mustaphaelghoul/eecs481 
Create 5 Vehicle::CableLiftUpdate... member functions from cable_lift_update_... (#9473)
 2020-04-21 22:10:16 +01:00
Mustapha Elghoul
38630eeb59 Update dist_x and dist_y to camelCase. (1 >> 1) to VEHICLE_UPDATE_MOTION_TRACK_FLAG_1, and (1 >> 0) to VEHICLE_UPDATE_MOTION_TRACK_FLAG_VEHICLE_AT_STATION 2020-04-21 16:51:00 -04:00
Breno Rodrigues Guimarães
568e60b13c
Remove duplicated code due to merge issue (#11392) 2020-04-21 17:10:05 +02:00
Michał Janiszewski
e716250dec
Merge pull request #11366 from janisozaur/super-duper-warnings 
Super duper warnings
 2020-04-21 13:45:38 +02:00
Michał Janiszewski
777541afeb Disable null-dereference warning for MinGW 
Error messages produced by MinGW look like:
```
In file included from ../src/openrct2/world/Banner.cpp:10:0:
../src/openrct2/world/Banner.h:29:8: error: potential null pointer dereference [-Werror=null-dereference]
 struct Banner
        ^~~~~~
```
 2020-04-21 13:31:01 +02:00
Michał Janiszewski
c4b6897635 Address possible nullptr dereferences 2020-04-21 13:31:01 +02:00
Michał Janiszewski
5f97637d5e Only suggest final when using non-LTO builds 
In LTO builds GCC issues the suggestion-warning from linking stage,
when pragmas are already gone and do nothing.
 2020-04-21 13:31:01 +02:00
Michał Janiszewski
4f85810c14 Fix setting extended warning options 2020-04-21 13:31:01 +02:00
Michał Janiszewski
eeef01f34b Remove redundant function declaration 2020-04-21 13:31:01 +02:00
Michał Janiszewski
de51d97f70 Remove redundant unreachable breaks 2020-04-21 13:31:01 +02:00
Michał Janiszewski
64e9e8aeb9 Add missing override specifier 2020-04-21 13:31:01 +02:00
Michał Janiszewski
cb74c5bbb6 Fix globals that really aren't 2020-04-21 13:30:55 +02:00
Breno Rodrigues Guimarães
374b744477
Use Formatter to handle argument formatting for tooltips (#11379) 2020-04-21 12:38:59 +02:00
Michael Steenbeek
b94dfab7d0
Merge pull request #11383 from tupaschoal/followup-11163 
Simplify logic in ride_ratings_score_close_proximity_in_direction()
 2020-04-21 12:36:39 +02:00
Tulio Leao
12beb78377
Use enum for PeepState instead of raw Number on NewsItem (#11384) 2020-04-21 12:33:53 +02:00
Mustapha Elghoul
b38bf7a438 Grouped Alike Functions in Vehicle.h 2020-04-20 22:52:22 -04:00
Tulio Leao
dedd0cd54f Use CoordsXY on ride_ratings_score_close_proximity_in_direction() 2020-04-20 23:33:56 -03:00
Tulio Leao
a7c103261a Use BaseZ and ClearanceZ on ride_ratings_score_close_proximity_in_direction() 2020-04-20 23:28:59 -03:00
Mustapha Elghoul
e627b1680c Part of #9473: Create 5 Vehicle::CableLiftUpdate... from cable_lift_update_... 2020-04-20 22:12:42 -04:00
Breno Rodrigues Guimarães
2479256bc1
Adjust Formatter function names according to coding style (#11378) 2020-04-20 18:55:15 -03:00
Michael Steenbeek
e1e58423fc
Replace RideTypeHasRideGroups with flag (#11375) 2020-04-20 21:50:35 +02:00
Olivier Wervers
fc5a5fe320
Fix #11370: Copy and paste shortcuts switched (#11373) 2020-04-20 12:16:50 +02:00
ifimfree
fb6dd4bfad
Create constants for a few flags 2020-04-20 10:39:26 +02:00
Breno Rodrigues Guimarães
d4a2a98e20
Replacing set_format_arg_on macro in favor of a more C++zy solution (#11350) 2020-04-20 07:10:33 +02:00
OpenRCT2 git bot
6992299c1a Merge Localisation/master into OpenRCT2/develop. 2020-04-20 04:02:06 +00:00