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

18042 Commits

Author SHA1 Message Date
OpenRCT2 git bot 3b18f66c9e Merge Localisation/master into OpenRCT2/develop. 2020-02-11 04:02:19 +00:00
Tulio Leao d0b255d98b Start zAttemps from 0 2020-02-10 21:55:21 -03:00
Tulio Leao e79584fe24 Remove superflous if 2020-02-10 21:55:21 -03:00
Tulio Leao 6522b10dfa Make Z attempts crescent 2020-02-10 21:55:21 -03:00
Tulio Leao fabef9b050 Modify height search to also affect maze construction 2020-02-10 21:55:19 -03:00
aw20368 d2e5c29ce0 review changes (squash) 2020-02-10 21:54:41 -03:00
aw20368 c76378bc8b Fix #8064 Ride construction errors shown as (undefined string) 
The search for height to build track ended at a half-height, leading to (undefined string) error. Changed to always end at whole height and search as high as possible.
 2020-02-10 21:54:26 -03:00
Michael Steenbeek 723f658dbd
Change ride_idnew_t to 16 bit; use it in more places (#10667) 2020-02-10 22:41:49 +01:00
Tulio Leao df28bca19e Move tupaschoal to development team (#10682) 2020-02-10 06:50:13 +00:00
Michael Steenbeek 3ec2252972 Merge pull request #10654 from IntelOrca/windows/winhttp 
Replace cURL with WinHttp implementation on Windows
 2020-02-09 22:19:20 +01:00
Ted John 4e032aeff0 Improve WinHttp code 2020-02-08 18:11:08 +00:00
Michael Steenbeek 1e64bbedf5 Update Xcode project 2020-02-08 17:47:03 +00:00
Ted John 4af69555d1 Improve WinHttp logic / code 2020-02-08 17:47:03 +00:00
Ted John be9cb19df5 Replace cURL with WinHttp implementation on Windows 
This reduces the number of third party dependencies for Windows builds. WinHttp is quite a nice straight forward API so doesn't involve too much extra code.
 2020-02-08 17:47:03 +00:00
Michael Steenbeek d16fbb0cd2
Change ride->overall_view to CoordsXY (#10673) 2020-02-08 17:19:59 +01:00
Michael Steenbeek 5da4903430
Fix #10629: Footpaths on the ground do not cost money (#10671) 2020-02-08 16:29:14 +01:00
Michael Steenbeek 1a5bbdb97e Merge pull request #10660 from IntelOrca/windows-crypt-cng 
Replace OpenSSL with Windows BCrypt API
 2020-02-08 10:27:29 +01:00
Gymnasiast afab401660
Add #6553 to changelog 2020-02-08 10:09:12 +01:00
Duncan 661be85193
Fix #10196: Cannot place doors at end of track corners (#10663) 2020-02-08 00:02:33 +01:00
Michał Janiszewski 2340206b34
Place constexpr functions in anonymous namespace (#10651) 2020-02-06 08:50:10 +01:00
Ted John b76092eda3 Fix mingw 2020-02-05 22:39:22 +00:00
Ted John d402580201 Update cmake config 2020-02-05 21:28:59 +00:00
Ted John d6da718717 Link to bcrypt instead of ncrypt 2020-02-05 21:24:31 +00:00
Ted John 0cc02f397e Fix guards on crypto implementations 2020-02-05 08:04:05 +00:00
Ted John 57a758b9c0 Get all crypto tests passing 2020-02-05 02:09:19 +00:00
Ted John e2a541bff4 Get import / export of public key working 2020-02-05 00:36:41 +00:00
Ted John c8ef6233aa Add CNG implementation of crypto functions 2020-02-04 22:49:43 +00:00
Ted John 06174adf14 Revert "Fix Windows debug builds" 
This reverts commit 90f788efd1.
Original problem was environment related.
 2020-02-04 20:40:37 +00:00
Michał Janiszewski 1fff7f17d9
Change ninja options to less verbosity, continue on error (#10652) 2020-02-04 00:06:15 +01:00
Umdlye b9a61c0a3a
Update readme.md (#10649) 2020-02-03 15:45:19 +00:00
Ted John 24cc4be534
Update readme.md (#10646) 
VS2019 is now required.
 2020-02-03 13:07:59 +01:00
Ted John 5dbd3c7c0c Allow tests to work with CRLF test data 2020-02-02 15:47:50 +00:00
Duncan 1dc7bc2466
Merge pull request #10643 from Gymnasiast/refactor/remove-optional-polyfill 
Remove opt::optional polyfill
 2020-02-02 12:24:10 +00:00
Ted John 90f788efd1 Fix Windows debug builds 2020-02-02 01:54:29 +00:00
Ted John 0689829980
Update Windows dependencies to v20 (#10642) 2020-02-01 21:38:07 +00:00
Gymnasiast ca2f37ae7f
Remove opt::optional polyfill 
std::optional is supported by Xcode 10. The non-polyfill variant was already used in our code, so this is not likely to break anything that wasn't broken before.
 2020-02-01 22:25:03 +01:00
Michael Steenbeek fd6c709128
Merge pull request #10608 from Gymnasiast/refactor/last-next-research-item-optional 
Convert gResearchLast/NextItem to std::optional
 2020-02-01 22:07:11 +01:00
Michael Steenbeek 57daba8796
Merge pull request #10640 from IntelOrca/github-actions-android 
Enable Android builds with GitHub Actions
 2020-02-01 21:52:08 +01:00
Ted John 1e6bf84796
Do not log element out of range as error (#10641) 
Many routines will attempt to access tile elements outside the range of the map. This can happen for example when a routine is observing surrounding tiles of a piece of track that is near the edge of the map. Null is returned from the function which is handled by the routine, so not really an error and can reduce many bounds checking in callers.
 2020-02-01 20:44:57 +00:00
Ted John a270ce46a5 Remove Android building from Travis 2020-02-01 16:47:57 +00:00
Ted John 12ee84a161 Upload Android builds to openrct2.org 2020-02-01 16:47:49 +00:00
Ted John a64c9e9924 Only build 32/64 ARM and package just apk file 2020-02-01 16:22:57 +00:00
Ted John fd077b85a2 Add Android build to GitHub Actions CI 2020-01-31 08:02:11 +00:00
OpenRCT2 git bot 3f837f561c Merge Localisation/master into OpenRCT2/develop. 2020-01-30 04:01:35 +00:00
Ted John 61893fab40 Build develop docker image on push to develop branch 2020-01-28 16:24:48 +00:00
Ted John a02448e1fa Link stdc++fs for Clang as well as GCC (#10626) 2020-01-28 13:31:03 +00:00
OpenRCT2 git bot 550da84ad6 Merge Localisation/master into OpenRCT2/develop. 2020-01-28 04:01:19 +00:00
Gymnasiast c77c69a0c4
Refactor calls 2020-01-26 16:21:42 +01:00
Gymnasiast 66dbb5e166
Refactor access to ResearchItem's rawValue 2020-01-26 15:17:37 +01:00
Gymnasiast e6c32230bc
Convert rawValue to uint32 2020-01-26 14:12:57 +01:00