mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-26 00:04:43 +01:00
Code Issues Releases Wiki Activity
14,494 Commits 8 Branches 59 Tags
507989abdd9b5e96d9079fbf7295044280c330bd
Commit Graph

11089 Commits

Author SHA1 Message Date
Gymnasiast
350b777fe9 Fix includes 2018-05-01 20:38:57 +02:00
oli414
126881cc8a Move last_for_tile function to tile element 2018-05-01 18:08:11 +02:00
oli414
353c8bcf8d Adhere to coding style 2018-05-01 17:48:34 +02:00
oli414
c5fd9e67eb Seperate tile element from map 2018-05-01 17:47:00 +02:00
oli414
3bff12c081 Seperate surface tile element 2018-05-01 16:33:16 +02:00
oli414
27aa28749c Move surface element to seperate file 2018-05-01 14:57:13 +02:00
Aaron van Geffen
735cc2df89 Take line height into account in scenario selection screen 2018-05-01 13:58:46 +02:00
Michał Janiszewski
3a0e553cf5 Use c++1z for android 2018-05-01 10:49:22 +02:00
Michał Janiszewski
dc1c715bb9 Update Android CMake project for C++17 
Android uses cmake 3.6, so cannot use `CXX_STANDARD` 17, which only got introduced in cmake 3.9
 2018-05-01 10:34:27 +02:00
Gymnasiast
728eb7565c Increase network version 2018-04-30 21:20:18 +02:00
Gymnasiast
4244f915a1 Implement #7377: Allow for six 6-seater cars on the Wooden RC 2018-04-30 20:37:11 +02:00
Michael Steenbeek
3025599eb3 Merge pull request #7435 from ZehMatt/indexing-perf 
Use multiple threads to generate object index cache.
 2018-04-30 14:55:54 +02:00
Toby Hinloopen
2fc01cb698 Fix #7424: Do not auto-rotate shops to face queue paths 2018-04-30 14:54:26 +02:00
Olivier Wervers
7713cdac4d Replace month count magic numbers 2018-04-29 20:46:46 +02:00
ZehMatt
76e54dd5ec Fix dead lock due to uninitialized variables. 2018-04-28 02:38:06 +02:00
Ted John
2ef549b055 Fix #7450: Only 3 standard entertainer costumes can be chosen 
String value rather than string arrays were not being processed for enterainer costumes in object json files.
 2018-04-26 22:00:48 +01:00
ZehMatt
ee53855c62 Use emplace_back with reference as return type. 2018-04-26 21:26:30 +02:00
Ted John
dd58a710ee Make Console::Write functions atomic 2018-04-26 21:26:30 +02:00
Ted John
7da60f4950 Make log functions atomic 
Use only one print call to stdout in log functions so that messages are not malformed.
 2018-04-26 21:26:30 +02:00
Ted John
20be1cc0a8 Small refactor and code format 2018-04-26 21:26:30 +02:00
ZehMatt
b9d939b294 Show progress of processed elements instead of pending tasks. 2018-04-26 21:26:30 +02:00
ZehMatt
d77f06c1ee Coding style changes. 2018-04-26 21:26:30 +02:00
ZehMatt
7be1cd3e37 Use std::list and fixed step size. 2018-04-26 21:26:30 +02:00
ZehMatt
b9e0eede44 Code cleanup 2018-04-26 21:26:30 +02:00
ZehMatt
64d9109226 Add progress report back. 2018-04-26 21:26:30 +02:00
ZehMatt
bee0fc25b1 Move all code into JobPool.hpp 2018-04-26 21:26:30 +02:00
ZehMatt
ac6b3fb225 Change order of members. 2018-04-26 21:26:30 +02:00
ZehMatt
8c2ac904b4 Add missing vector include. 2018-04-26 21:26:30 +02:00
ZehMatt
6b649e6b29 Remove unused includes. 2018-04-26 21:26:30 +02:00
ZehMatt
dfcec4d9da Refactor file indexing to use the job pool instead of threads. 2018-04-26 21:26:30 +02:00
ZehMatt
254aedefd4 Add generic job pool implementation. 2018-04-26 21:26:30 +02:00
ZehMatt
e841c5b20b Use multiple threads to generate object index cache. 2018-04-26 21:26:30 +02:00
Michael Steenbeek
2d92ecf10b Fix #7436: Only the first 32 vehicles of a train can be painted 2018-04-26 10:33:54 +02:00
Hielke Morsink
49cf840f28 Fix memset byte value too big (#7447) 
`memset` takes an integer as argument which gets converted to an unsigned byte. `SPRITE_INDEX_NULL` has a value of 0xFFFF, essentially cutting it to 0xFF. Calling `std::fill_n` instead of `memcpy` assigns the given value to each element in its range rather than setting the bytes. In this case, the result is the same.

None of the other calls to `memset` in the project use values bigger than 0xFF.
 2018-04-25 14:47:03 +02:00
Michael Steenbeek
3aac52cf44 Fix rendering of inverted exclamation mark 2018-04-25 13:47:07 +02:00
Ted John
42f46d15e3 Merge pull request #7414 from OpenRCT2/refactor/string-conversions 
Refactor string conversion between RCT2 and UTF8
 2018-04-25 10:14:39 +01:00
Hielke Morsink
bf4f68fe33 Use enum type that guarantee to support its values 
By default enumerators use type `int` which can store values up to `1 << 31 - 1`. The clang compiler generates this error for enums values that use the sign bit: `enumerator value is not representable in the underlying type 'int'.`

To get rid of those warnings (and technically improve the code) the erroneous enums are now of type of `uint32`.

Note: I've skipped peep.h to prevent conflicts with the peep refactor branch.
 2018-04-24 16:51:42 +02:00
Hielke Morsink
5327c9feb4 Remove unused windows_get_registry_install_info (#7442) 2018-04-23 20:20:03 +02:00
Ted John
41b3a33af4 Merge pull request #7430 from IntelOrca/fix/scan-objects 
Fix scan objects and run before tests
 2018-04-22 22:11:03 +01:00
Hielke Morsink
30063984e6 Delete unused function arguments or mark them so (#7426) 
This aims to make future refactoring easier. The arguments are removed where possible, but kept and marked with C++17's [[maybe_unused]] where they could not be removed (e.g. when they are used as a callback, rather than called directly).

I've skipped the rides/<category>/* and peep/* source files, because the rides source files are mostly generated and have a ton of unused variables, and the peep source files are being refactored.
I've also skipped most of window/* source files, because most of the functions are used as callbacks and will be bulk-renamed at some point.
 2018-04-20 13:56:37 +02:00
Manuel Vögele
588e6f32c4 Rename vehicle_is_boat_on_water to better reflect the actual functionality (#7421) 
* Rename and refactor `vehicle_is_boat_on_water` to better reflect the actual functionality

New name is `vehicle_boat_is_location_accessible`

* Refactor `vehicle_boat_is_location_accessible` take `TileCoordsXYZ` as parameter
 2018-04-20 12:50:11 +01:00
Ted John
4ce4101ac5 Ensure correct language is used for scan-objects 2018-04-20 00:12:40 +01:00
Ted John
edb9dc39ab Pass object repository as a dependency when loading objects 2018-04-19 23:51:05 +01:00
Ted John
6d76d76f98 Protect against bad RCT2 strings 2018-04-19 22:36:14 +01:00
Ted John
6526f9f6cb Fix scan-objects CLI action 
Ensure a context is available when objects are loaded.
 2018-04-19 13:26:19 +01:00
Ted John
947a0625c8 Fix mingw builds 2018-04-18 13:16:20 +02:00
Ted John
deaa60f8f1 Refactor string conversion between RCT2 and UTF8 
Use Win32 API for conversion on Windows for non-1252 code pages instead of built-in tables.
 2018-04-18 13:16:20 +02:00
Hielke Morsink
f661d48d90 Add tests for tile_element_wants_path_connection_towards 2018-04-17 20:43:49 +02:00
Hielke Morsink
99d8c83807 Fix #7402 Properly check for entrance location before disconnecting paths 2018-04-17 20:43:49 +02:00
Aaron van Geffen
11207f9c41 Re-introduce zebra striping. 2018-04-16 22:11:53 +02:00