1
0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-19 13:03:11 +01:00
Commit Graph

13601 Commits

Author SHA1 Message Date
Michael Steenbeek
31bf792538 Refactor research - spike 1
This involves refactoring gResearchedRideTypes and gResearchedRideEntries
and the functions involved.

Also renames some functions in order to better express what they do.
2018-01-04 17:44:51 +01:00
Michał Janiszewski
c7417e11a4 Use bool type for boolean logic 2018-01-04 15:40:52 +01:00
Hielke Morsink
3dd98c7aa2 Apply coding style 2018-01-04 07:58:31 +01:00
Hielke Morsink
a6e4c1d677 Remove undefined function declaration 2018-01-04 07:58:31 +01:00
Hielke Morsink
7d37798f19 Reduce duplicated code in finances window
All of the pages share some common widgets (title, close button, background, tabs). To
reduce code duplication here, I've moved those values to a define that then gets used
for each of the pages.
The same thing applies to enabled widgets. One additional change is that left bitshifts
from `1` have been changed to `1ULL`.
2018-01-04 07:58:31 +01:00
Aaron van Geffen
0138df5dd8 Centre overall viewports on geometric centre. 2018-01-04 07:57:27 +01:00
Aaron van Geffen
92bcc5f579 For overall views, show small rides zoomed in all the way. 2018-01-04 07:57:27 +01:00
Michał Janiszewski
17354122d4 Remove deprecated comment 2018-01-04 07:36:54 +01:00
Michał Janiszewski
33a94fe1bb Use C++ headers in C++ code 2018-01-04 07:36:54 +01:00
Michał Janiszewski
b2bc974fe7 Use nullptr where possible 2018-01-04 06:58:44 +01:00
OpenRCT2 git bot
56ab7e9c09 Merge Localisation/master into OpenRCT2/develop. 2018-01-04 04:00:39 +00:00
Michał Janiszewski
4d0c88fb94 Mark constructors explicit (#6928) 2018-01-04 01:12:34 +00:00
Tobias Kohlbau
7aeb3e11b3 Fix #5562: fix continous reopening of log files
Every logging opens a new file handle which should be avoided
for performance reasons.

Signed-off-by: Tobias Kohlbau <tobias@kohlbau.de>
2018-01-04 00:01:43 +01:00
Michael Steenbeek
91589f57c6 Compile map.c as C++ 2018-01-03 20:40:51 +01:00
Richard Jenkins
3ab3003e7b Xcode fix 2018-01-03 15:07:17 +01:00
Ted John
0cbc8bea10 Fix compile of Scenario.cpp 2018-01-03 15:07:17 +01:00
Ted John
49f5611bd1 Rename scenario.c|h to cpp 2018-01-03 15:07:17 +01:00
Hielke Morsink
eb4a8924d1 Refactor and clean up footpath-related code
This commit corrects some misused defines, and gave them clearer names.
For example, the slope mask was only useful for surface elements, so now
"SURFACE" is in its name. I also replaced any hard coded values that I
could find and knew their purpose off.
2018-01-03 10:57:37 +01:00
Michael Steenbeek
d25856d59c Make tile element type strings in the Tile Inspector translatable 2018-01-03 10:21:53 +01:00
Michael Steenbeek
347ff702d0 Refactor objects 2018-01-03 10:16:51 +01:00
Aaron van Geffen
da519c9b32 Add extra padding to label text in guest window. 2018-01-03 10:09:21 +01:00
OpenRCT2 git bot
ef657caed3 Merge Localisation/master into OpenRCT2/develop. 2018-01-03 04:01:00 +00:00
Michael Steenbeek
3b06f92c0a Merge pull request #5964 from janisozaur/sse4.1 2018-01-02 22:27:17 +01:00
Michał Janiszewski
7f5e3a3a64 Sink some variables 2018-01-02 22:03:10 +01:00
Michał Janiszewski
68881fbbc7 Call core_init() on paths that need it 2018-01-02 19:53:51 +01:00
Michael Steenbeek
1bc711e266 Fix #5761: Mini coaster doesn't appear despite being selected (#6909) 2018-01-02 19:40:08 +01:00
Ted John
d14dce2b95 Prevent invalid chunk message when loading SC4
Exception messages were being logged when classifying the file type. This is generally unwanted as it will happen in normal cicumstances.
2018-01-02 18:23:14 +00:00
Michael Steenbeek
b38123924a Fix object override size (#6901) 2018-01-02 17:51:29 +00:00
Michael Steenbeek
c5e966292b Fix #3171: Guests entering from the corner of the tile in Amity Airfield 2018-01-02 16:07:39 +01:00
Michael Steenbeek
3d1deb26ce Update changelog for #5190 [ci skip] 2018-01-02 15:47:06 +01:00
Michael Steenbeek
f1b42fa9dd Update changelog [ci skip] 2018-01-02 13:33:33 +01:00
Tobias Kohlbau
9da4305a9c Fix #5224: Close multiplayer window when server closes
Signed-off-by: Tobias Kohlbau <tobias@kohlbau.de>
2018-01-02 13:04:53 +01:00
Tobias Kohlbau
a726f6decd Multiplayer: save manually added servers
Adding a server via "Add Server" should handle them
as favorites as otherwise the list is not saved locally and
each server is lost after game restart.

Signed-off-by: Tobias Kohlbau <tobias@kohlbau.de>
2018-01-02 13:04:08 +01:00
OpenRCT2 git bot
6336e8c719 Merge Localisation/master into OpenRCT2/develop. 2018-01-02 04:00:31 +00:00
Michał Janiszewski
7f7054049d Read commandline before initialising other features
This allows setting options that may affect future feature detection,
but also allows for configuring verbosity levels early.
2018-01-01 23:51:43 +01:00
Michał Janiszewski
2a4680035f Update Android project to enable SSE4.1 2018-01-01 23:49:09 +01:00
Michał Janiszewski
566991897e Add compile guard to not miss SSE4.1 2018-01-01 23:49:09 +01:00
Michał Janiszewski
1fdc8ef49e Move definition of OPENRCT2_X86 macro 2018-01-01 23:49:09 +01:00
Marijn van der Werf
ab716f60b2 Update Xcode project 2018-01-01 23:49:09 +01:00
Michael Steenbeek
400993c8cb Fix Xcode project 2018-01-01 23:49:09 +01:00
Ted John
d48f8c4f36 Enable SSE4.1 for Windows builds 2018-01-01 23:49:09 +01:00
Michał Janiszewski
54394d3a21 Enable SSE4.1 for file implementing it 2018-01-01 23:49:09 +01:00
Michał Janiszewski
645b36169d Move SSE4.1 code to its own file, detect SSE4.1 in runtime 2018-01-01 23:49:09 +01:00
Michał Janiszewski
c04e720f9f Hide mask_sse4_1 completely on non-SSE builds 2018-01-01 23:49:09 +01:00
Michał Janiszewski
b30fb66878 Add SSE4.1 implementation of masking 2018-01-01 23:49:09 +01:00
Michał Janiszewski
b1a78c8f24 Fix a compilation issue with older compilers 2018-01-01 22:55:00 +01:00
Michał Janiszewski
1cd7f99d2d Fix Ride.cpp compilation issues 2018-01-01 22:16:16 +01:00
OpenRCT2 git bot
60a91910d8 Merge Localisation/master into OpenRCT2/develop. 2018-01-01 04:00:30 +00:00
Gymnasiast
1626f86acc Compile park.c as C++ 2018-01-01 01:18:12 +01:00
Gymnasiast
6f7dfb00aa Fix duplicated line 2018-01-01 01:01:12 +01:00