mirrors
/
OpenRCT2
mirror of https://github.com/OpenRCT2/OpenRCT2.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity
17,789 Commits 8 Branches 40 Tags 367 MiB
Commit Graph

17789 Commits

Author SHA1 Message Date
Ted John 8893d998b8 Remove test push code in macOS CI 2020-01-09 21:16:28 +00:00
Michael Steenbeek 8a81bb4729
Merge pull request #10539 from IntelOrca/github-actions-osx 
Add format check and macOS to GitHub CI
 2020-01-09 22:02:45 +01:00
Tom Lankhorst 6f0ea7b3c2 Link stdc++fs with GCC (#10522) 2020-01-09 19:57:28 +01:00
Tom Lankhorst 2ff8a467c6 Find Jansson with pkg-config on non-MSVC. (#10521) 2020-01-09 19:56:25 +01:00
Ted John a66560045f Add macOS to GitHub actions 2020-01-09 17:20:58 +00:00
Ted John 00b0b6dc0f Add code format check to GitHub CI 2020-01-09 17:17:31 +00:00
OpenRCT2 git bot 868a2793e5 Merge Localisation/master into OpenRCT2/develop. 2020-01-09 04:01:45 +00:00
Ted John 7497809ee9 Add localisation merge workflow (#10538) 2020-01-08 20:32:46 +01:00
OpenRCT2 git bot 26d6155a95 Merge Localisation/master into OpenRCT2/develop. 2020-01-07 04:00:19 +00:00
Tulio Leao c470d84210 Fix #10524: Banners not placeable above certain height (#10528) 2020-01-06 15:10:38 +00:00
OpenRCT2 git bot 09bb3b0ae5 Merge Localisation/master into OpenRCT2/develop. 2020-01-06 04:00:18 +00:00
Michael Steenbeek 08ab15ef36
Fix #10313: Path furniture can be placed on level crossings 2020-01-05 17:59:02 +01:00
X123M3-256 5063cd2283 Fix line that causes build to fail on Mac (#10518) 2020-01-05 14:34:39 +01:00
Tulio Leao e7ee8ebc03 Use CoordsXY on footpath_update_queue_entrance_banner() 2020-01-05 09:14:55 -03:00
Tulio Leao 482ca8765c Use CoordsXY on Footpath's loc_6A6D7E() and loc_6A6C85() 2020-01-05 09:14:51 -03:00
Tulio Leao b1dc6ed6ed Use CoordsXY on footpath_connect_edges() 2020-01-05 08:20:16 -03:00
OpenRCT2 git bot 8d99d37eba Merge Localisation/master into OpenRCT2/develop. 2020-01-05 04:00:19 +00:00
Michael Steenbeek 63da894257
Merge pull request #10511 from tupaschoal/improve-clear-at 
Improve variable names in map_can_construct_with_clear_at() and use big Z
 2020-01-04 19:57:46 +01:00
Michael Steenbeek 0c9b1cec96
Correct max vehicles per ride value (#10504) 
* Correct max vehicles per ride value

* Fix formatting

* Fix constant usage in TrackDesign.cpp
 2020-01-04 18:10:33 +01:00
Tulio Leao d3579e472b Use Big Z coordinates for map_can_construct_with_clear_at() vars 2020-01-04 10:31:18 -03:00
Tulio Leao dff747ce0f Improve variable names in map_can_construct_with_clear_at() 2020-01-04 10:27:57 -03:00
Tulio Leao d861658669 Use CoordsXY on Scenery and SmallScenery (#10513) 2020-01-04 12:45:51 +01:00
Tulio Leao c4a865384e Move Mac-only str handling functions to Platform (#10264) 2020-01-04 12:44:40 +01:00
Michael Steenbeek e87607fa6d
Merge pull request #10402 from NuclearFej/develop 
Android: fix Gradle, CMake, asset copying; upgrade to AndroidX, fullscreen mode
 2020-01-02 13:47:36 +01:00
Kevin Laframboise 13e946a239 Fix #10464: Incorrect error messages for track placement (#10494) 2020-01-02 08:11:24 +00:00
Duncan f4440b57b7
Merge pull request #10488 from Gymnasiast/refactor/map_get_footpath_element 
Refactor map_get_footpath_element() and fix #10486
 2020-01-02 07:45:15 +00:00
NuclearFej f35dd778e5 Android: enable fullscreen mode, raise min SDK 
Fullscreen mode (sticky immersive) is enabled. The minimum SDK version was raised to 19 (4.4.2 KitKat, which is more than old enough) from 16 to enable this.

Additonally, deprecation compiler warnings were enabled.
 2020-01-01 22:57:19 -05:00
Gymnasiast 5c0a62c31a
Implement review requests 2020-01-01 23:03:41 +01:00
OpenRCT2 git bot dcdd312eb1 Merge Localisation/master into OpenRCT2/develop. 2020-01-01 04:00:17 +00:00
ζeh Matt a7c1f1fcc4
Merge pull request #10490 from ZehMatt/fix-10489 
Fix #10489: Hosts last action not being synchronized
 2019-12-31 17:21:00 +01:00
Matt 0807bd4d89
Update changelog.txt 2019-12-31 10:35:00 +01:00
Matt ef4a3d0528
Fix #10489: Hosts last action not being synchronized 2019-12-31 10:34:33 +01:00
Michael Steenbeek 29922da871
Refactor calls to staff_is_patrol_area_set() 2019-12-31 10:10:40 +01:00
Gymnasiast 0d09a645fc
Refactor map_get_footpath_element() and fix #10486 2019-12-31 10:08:36 +01:00
Kevin Strehl 37110f386d Add Keyboard Shortcuts to the Tile Inspector (#10430) 2019-12-31 09:34:38 +01:00
Duncan c170926200 Refactor to prefer baseZ instead of height for big Z (#10478) 2019-12-31 09:33:27 +01:00
Duncan c74339fed9 Fix #10477. Fix upper max height limit being very low for large scenery 
Mistake made while improving mouse control when zoomed out caused the upper limit for multi tile scenery to be limited by the sum of all clearance z values instead of the greatest clearance z value.
 2019-12-31 09:15:46 +01:00
Duncan d486ac4d3b Reduce direct usage of LOCATION_NULL (#10480) 
* Reduce direct usage of Location_Null

Ideally we want to refactor these out to use std::optional as much as possible but for now move to using the standard interfaces.

* Remove incorrect AND with LOCATION_NULL

In the original this was a simple comparison to check for negative. Unsure how it ended up as an AND with the negative bit.
 2019-12-31 09:01:17 +01:00
Michael Steenbeek 97b1c888b3 Also change gClipSelectionA/B in TestPaint (#10485) 2019-12-31 07:12:17 +00:00
Gymnasiast 1133a8c81c
Remove sLocationXY8 2019-12-30 23:03:13 +01:00
Duncan 2c359736ee
Refactor to reduce usage of LocationXY8 and sLocationXY8 (#10479) 
* Refactor to reduce LocationXY8 usage

* Further reduction of LocationXY usage and sLocationXY usage

* Reduce sLocationXY8 usage
 2019-12-30 19:03:34 +00:00
Tulio Leao 06fb16ee88 Use CoordsXYZ for gMapSelectArrowPosition (#10442) 2019-12-30 16:51:35 +00:00
Tulio Leao 8b4e0d7bab Make Map::wall_remove_*() use CoordsXY* (#10461) 
* Make Map::wall_remove_at() use CoordsXYRangedZ

* Make Map::wall_remove_at_z() use CoordsXYZ

* Make Map::wall_remove_intersecting_walls() use CoordsXYRangedZ

* Remove useless TODO and simplify functions
 2019-12-30 16:51:01 +00:00
Tulio Leao a7b33a7d36 Use more Coords on some files. (#10463) 
* Use more Coords on MazePlaceTrackAction

* Use more Coords on MazeSetTrackAction

* Use more Coords on PlacePeepSpawnAction

* Use more Coords on SetCheatAction

* Use more Coords on SurfaceSetStyleAction

* Use more Coords on Station
 2019-12-30 16:50:48 +00:00
Michael Steenbeek 77494bbc73 Create definitions for some coords related stuff (#10456) 
* Create definitions for some coords related stuff

* Use constexpr; add define for Z step
 2019-12-30 15:03:51 +00:00
Tulio Leao 2d7dccb0c2 Make Map::map_can_construct_*() use CoordsXYRangedZ (#10462) 
* Make Map::map_can_construct_with_clear_at() use CoordsXYRangedZ

* Make Map::map_can_construct_at() use CoordsXYRangedZ
 2019-12-30 15:00:42 +00:00
Michael Steenbeek 9de8fa233f
Fix #5249: No collision detection when building ride entrance at heights > 85.5m (#10473) 2019-12-30 14:01:36 +01:00
Michael Steenbeek 4b0dff92aa
Name word_981D6C (#10471) 2019-12-30 12:29:08 +01:00
Duncan 7a64eb4402 Fix #10470. Mistake caused by reusing variable names for different functions. (#10476) 
Added in comments to clarify why function is required. Renamed variables again to clarify what they are used for
 2019-12-30 12:26:58 +01:00
Michael Steenbeek fa4ed37895
Fix #10468: Ride's Entrance/Exit is not buildable above a certain height level (#10472) 2019-12-29 23:48:15 +01:00