mirrors
/
OpenRCT2
mirror of https://github.com/OpenRCT2/OpenRCT2.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity
20,230 Commits 7 Branches 39 Tags 355 MiB
Commit Graph

20230 Commits

Author SHA1 Message Date
Michał Janiszewski 9bdf2cd1c5 Add MinGW job targetting NT 5.1 2020-09-27 20:30:13 +02:00
Michał Janiszewski 8daca5b69e Add better controls over MinGW jobs to CMake 2020-09-27 20:29:49 +02:00
Michał Janiszewski 92e7677e4b Remove redundant pkg-config package from duktapeConfig.cmake 2020-09-27 20:28:05 +02:00
Michał Janiszewski 5bb607fc98 Fix outdated config option in GitHub Actions 2020-09-27 20:27:12 +02:00
Aaron van Geffen 3ad1df7bab
Fix #12756: Define NDEBUG for Xcode release targets (#13012) 
* Define NDEBUG for Xcode release builds

* Remove redundant GCC_PREPROCESSOR_DEFINITIONS for targets
 2020-09-27 16:44:26 +02:00
ζeh Matt 5b1f6ce3e5
Merge pull request #13008 from ZehMatt/fix-12969 
Fix #12969: Crash opening ride window with invalid mechanic assigned
 2020-09-27 14:06:14 +03:00
Matt 958f3824c9
Fix #12969: Crash opening ride window with invalid mechanic assigned 2020-09-27 13:40:40 +03:00
Aaron van Geffen 62b13e68bc
Fix #13005: Last player action is not truncated (#13007) 2020-09-27 11:41:28 +02:00
Michael Steenbeek a3c9a84ae1
Upgrade objects to v1.0.17 2020-09-24 22:42:42 +02:00
Michał Janiszewski 17e86a61c9
WinNT5.1 networking fixes (#12759) 2020-09-24 10:28:24 +02:00
OpenRCT2 git bot e882e9003c Merge Localisation/master into OpenRCT2/develop 2020-09-24 04:04:44 +00:00
Michael Steenbeek e5ec74feaf
Fix #12918: Cannot place "Blue Hurricane" (hypercoaster) (#12982) 
The track design was recognised as a Corkscrew RC, not as a Hypercoaster. Moved the conversion code from the track design repository to the TD6Importer (where it should have been, really).

This also fixes the issue that Hypercoasters, Monster Trucks, Classic Mini Roller Coasters, Spinning Wild Mouses and Hyper-Twisters placed from a track design have the wrong ride type.
 2020-09-21 22:42:25 +02:00
Michał Janiszewski 0ae86d0558
Don't use empty resolutions (#12980) 2020-09-20 23:13:10 -03:00
Michał Janiszewski 2c520b9b5b
Don't use CCACHE for CI flow (#12977) 
Don't use CCACHE for CI flow
 2020-09-20 23:06:20 -03:00
Richard Fine 4030d9050e
Fix #12974: unable to build fences on slopes (#12975) 
Fix the casing of 'isAllowedOnSlope' to match the way it is cased in the JSON files, which causes the flag to be read correctly and re-enables building on slopes for the scenery pieces which have it specified.
 2020-09-20 06:54:01 +01:00
OpenRCT2 git bot 1a815584ab Merge Localisation/master into OpenRCT2/develop 2020-09-20 04:04:43 +00:00
Duncan 124161b459
Implement copy constructors (#12970) 2020-09-19 13:58:05 +01:00
Michael Steenbeek 4a79e9305f
Replace gfx_draw_string_right() with DrawTextBasic (#12966) 2020-09-18 21:39:00 -03:00
Michael Steenbeek fd194d0e32
Allow compilation with nlohmann/json < 3.9.0 
According to the [API docs](https://github.com/nlohmann/json/blob/develop/single_include/nlohmann/json.hpp#L23219-L23222), the fourth argument (which allows ignoring comments) was only introduced in version 3.9.0 (released on 27 July 2020), which is not present in Ubuntu 20.04 (it only has 3.7.3-1).

Since comments are not part of the JSON spec, this option is not terribly useful anyway. I have removed it, so that it can now compile on Ubuntu 20.04, and possibly also earlier versions.
 2020-09-19 00:19:39 +02:00
Gymnasiast a896d238b1
Remove optional arguments to json_t::parse 2020-09-18 23:46:07 +02:00
Michael Steenbeek 77e22851cc
Merge pull request #12925 from richard-fine/dropdown-menus-static-data 
RFC: Dropdown menus static data
 2020-09-18 23:37:26 +02:00
Gymnasiast 72c13c8e77
Allow compilation with nlohmann/json < 3.9.0 2020-09-18 23:31:09 +02:00
Michael Steenbeek d239b963c7
Add #12837 to changelog 2020-09-18 22:33:21 +02:00
Michael Steenbeek a3f9e572be
Merge pull request #12837 from Gymnasiast/refactor/fribidi-for-arabic 
Windows: FriBidi for Bidi and shaping
 2020-09-18 21:23:20 +02:00
Gymnasiast 265429c85a
Fix compilation on 32-bit Windows and MinGW 2020-09-18 20:54:36 +02:00
Michael Steenbeek 6b9f83a5a4
Fix compilation on Linux and macOS 2020-09-18 19:46:12 +02:00
Ted John c204767176
Fix RTL for Windows 2020-09-18 19:46:12 +02:00
Gymnasiast fbfdcc2412
Update Windows dependency bundle 2020-09-18 19:46:12 +02:00
Michael Steenbeek a4bd49186e
Update Xcode project 2020-09-18 19:46:12 +02:00
Gymnasiast 4ff77ebc35
Split RTL implementations to files; add preprocessor guards 2020-09-18 19:46:12 +02:00
Gymnasiast f11d1294fe
Use FriBidi on Windows, ICU on the rest 2020-09-18 19:46:12 +02:00
Gymnasiast 751810fc24
Use FriBidi for Bidi and shaping instead of ICU 2020-09-18 19:46:12 +02:00
Duncan da82144bfb
Fix #12944. Mistake from refactor meant formatter optimised away (#12961) 
Not sure why it should get optimised away but this will fix the crashes.
 2020-09-18 09:25:17 +01:00
Tulio Leao c72f547606
Merge pull request #12916 from richard-fine/pathfinding 
Pathfinding cleanup
 2020-09-17 17:58:31 -03:00
Tulio Leao 3b148bf25c
Merge pull request #12936 from ZehMatt/refactor/formatter 
Refactor more text formatting
 2020-09-17 17:57:46 -03:00
Matt b3b9a348c5
Apply review suggestions 2020-09-17 22:16:05 +03:00
Matt 38e03ae45d
Use the Formatter for News items 2020-09-17 22:14:36 +03:00
Matt ccde06ab0f
Explicitly pass formatter arguments to ShowError and family 2020-09-17 22:14:36 +03:00
Matt 2639349925
Move storage into Formatter class and refactor usage 2020-09-17 22:14:36 +03:00
Michael Steenbeek 1982e8491b
Merge pull request #12667 from mwnciau/json-refactor 
Migrate JSON library to JSON for Modern C++
 2020-09-17 21:11:06 +02:00
OpenRCT2 git bot 27a7ca778f Merge Localisation/master into OpenRCT2/develop 2020-09-17 04:04:39 +00:00
Richard Fine b57ed85098 Fixes from review feedback 2020-09-16 21:24:35 -04:00
ζeh Matt fc2773d68f
Merge pull request #12941 from ZehMatt/code-cleanup 
Minor code cleanup
 2020-09-16 23:38:57 +03:00
Michał Janiszewski 3af8462bb6 Update readme.md to make package list sorted 2020-09-16 20:18:54 +01:00
Michał Janiszewski 8479f133e9 Update OS requirements in readme.txt 2020-09-16 20:18:54 +01:00
Simon Jarrett 4d0f76837d Update project readme 2020-09-16 20:18:54 +01:00
Simon Jarrett f3aba68e46 Update project build files 2020-09-16 20:18:54 +01:00
Simon Jarrett 660c137958 Refactor Version to use new JSON library 2020-09-16 20:18:54 +01:00
Simon Jarrett 2c92c652e2 Refactor ObjectLoadError to use new JSON library 2020-09-16 20:18:54 +01:00
Simon Jarrett 57a57b0c02 Refactor Theme to use new JSON library 2020-09-16 20:18:54 +01:00