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

17867 Commits

Author SHA1 Message Date
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 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
Gymnasiast 63fddee603
Convert gResearchLast/NextItem to std::optional 2020-01-26 10:07:16 +01:00
OpenRCT2 git bot 775add1edb Merge Localisation/master into OpenRCT2/develop. 2020-01-26 04:01:51 +00:00
Ted John 5925d5fc10
Improve cmake config for Windows and Visual Studio (#10361) 
- Ensure static CRT is used when compiling.
- Allow Ninja generator to work (remove use of CMAKE_VS_PLATFORM_NAME).
- Move CMakeSettings.json to new standard location for VS.
 2020-01-25 22:42:27 +00:00
Ted John 519ea1c8c3 Fix #10376: No ratings generated when a shop and track intersect (#10387) 2020-01-25 23:09:58 +01:00
Michael Steenbeek 2b6e925744
Fix testing giga coaster with cable lift crashing the game (#10620) 2020-01-25 12:24:04 +01:00
Duncan 4a22158387 Fix #10386. Mistake made while refactoring (#10607) 
Added some additional comments whilst investigating the issue. Ultimate fix should look at changing the bounding box units but unsure of consequences
 2020-01-25 10:30:38 +01:00
OpenRCT2 git bot 027c5ce112 Merge Localisation/master into OpenRCT2/develop. 2020-01-25 04:01:30 +00:00
ζeh Matt 32d6ed2bc2
Merge pull request #10593 from tupaschoal/pr-10048 
Fix #9477: Process exit code is always 0
 2020-01-24 22:38:22 +01:00
Ted John eab255c4bf
Add Linux portable to GitHub CI (#10612) 2020-01-24 11:46:12 +00:00
OpenRCT2 git bot 5be2604f27 Merge Localisation/master into OpenRCT2/develop. 2020-01-24 04:01:26 +00:00
Duncan 171e255981 Fix #10598. Mistake made when fixing #7784. (#10606) 2020-01-23 22:43:29 +01:00
OpenRCT2 git bot 06fbfe46ac Merge Localisation/master into OpenRCT2/develop. 2020-01-23 04:01:52 +00:00
Michael Steenbeek 3192bfb7c6
Move research functions to method; remove unused function (#10609) 2020-01-22 22:51:11 +01:00
Aaron van Geffen d1eb041958 Increase height of track save buttons. (#10604) 2020-01-22 13:30:33 +01:00
Aaron van Geffen c5bdbc4296
Merge pull request #10370 from MichaelJBerk/develop 
Resolve #3154: Random Title Sequence
 2020-01-22 11:55:38 +01:00
Aaron van Geffen 5cf7618610 Update changelog. 2020-01-22 11:41:34 +01:00
Aaron van Geffen acc6cffad3 Apply clang-format. 2020-01-22 11:41:34 +01:00
Michael Berk 914c07a711 Added Random Title Sequence 2020-01-22 11:41:34 +01:00
Michael Steenbeek 4781ee3176
Add #9073 to changelog [ci skip] 2020-01-21 22:51:46 +01:00
Michael Steenbeek 733ec6ec24
Fix water sides glitch (#10599) 2020-01-21 14:34:25 +01:00
Ted John 804cf2c072 Disable localisation merge for forks 2020-01-21 09:00:18 +00:00
Duncan f1dcf85731
Merge pull request #10591 from duncanspumpkin/Sprite 
Sprite Refactor
 2020-01-20 08:38:51 +00:00
Tulio Leao c87e1ff9b6 Use EXITCODE enum on game startup 2020-01-19 19:37:27 -03:00
Lomash Gupta 0165261ac0 Fix #9477: Fix process exit code always being zero 
- Replaced gExitCode occurences with EXIT_SUCCESS and EXIT_FAILURE
- Removed global declaration of gExitCode
 2020-01-19 18:35:24 -03:00
Lomash Gupta 36840f3fe0 fixed gExitCode 2020-01-19 18:35:24 -03:00