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

17624 Commits

Author SHA1 Message Date
Paweł Bylica 45002d723a
Add core/FileSystem.hpp for accessing std::filesystem 
This file enables access to std::filesystem as `fs` namespace
or injects third-party drop-in replacement on build configs
where std::filesystem is not available.
 2019-11-21 13:40:20 +01:00
Paweł Bylica 5a8a7fe7ba
Add ghc::filesystem for thirdparty/ 
This adds the filesystem.hpp from https://github.com/gulrak/filesystem the the src/openrct2/thirdparty directory. The header is going to be used in build configurations where std::filesystem is not available.
 2019-11-21 13:40:20 +01:00
Tulio Leao 7f74e01669
Add braces to fix return on null Coords 2019-11-21 09:22:09 -03:00
Tulio Leao a9c2e1229a Propagate error upward with LOCATION_NULL 2019-11-21 08:00:06 -03:00
OpenRCT2 git bot 7a31b3c230 Merge Localisation/master into OpenRCT2/develop. 2019-11-21 04:00:19 +00:00
duncanspumpkin d4c15cd774 Refactor centre_2d_coordinates to use screenCoords. 2019-11-20 18:44:03 +00:00
Tulio Leao f94970b059 Use CoordsXY/ScreenCoordsXY for viewport*_with_z 
Closes #10268
 2019-11-19 18:33:40 -03:00
Duncan 463ef9d218
Merge pull request #10238 from duncanspumpkin/viewport_get_xy_z 
Refactor screen_get_map_xy_with_z to use CoordsXY structs
 2019-11-19 15:02:50 +00:00
Tulio Leao 7718d83b21 Simplify assignment in RideConstruction.cpp (#10266) 2019-11-19 16:01:22 +01:00
TheAssassin 0152eaa246 Build versioned AppImages (#10265) 2019-11-19 16:00:51 +01:00
duncanspumpkin 3b8bf56b71 Use helper function 2019-11-19 11:20:59 +00:00
duncanspumpkin 421107436f Refactor helper function to take screen coords 2019-11-19 11:20:59 +00:00
duncanspumpkin 1d6a923298 Refactor screen_get_map_xy_with_z to use CoordsXY structs 2019-11-19 11:20:58 +00:00
Duncan c04cb0b94b
Merge pull request #10254 from tupaschoal/coords-for-ride-construction 
Coords for ride construction
 2019-11-19 11:12:51 +00:00
Tulio Leao 2acdc577f7 Use Coords for windows/RideConstruction 2019-11-18 19:17:54 -03:00
Tulio Leao 9fa355cb8c Make window_event_list use Coords for moved and cursor (#10258) 2019-11-18 23:13:32 +01:00
Duncan 5bfe31ceb9
Merge pull request #10062 from tupaschoal/nullptr-deref-avoid-surface 
Avoid dereferencing map_get_surface_element_at nullptr on libopenrct2
 2019-11-18 12:39:41 +00:00
Tulio Leao 72b4d93ad2 Avoid dereferencing map_get_surface_element_at nullptr on libopenrct2 2019-11-18 08:01:04 -03:00
Ted John f7a8f5a0c7 Fix #10228: Can't import RCT1 Deluxe from Steam (#10260) 
Use size of buffer rather than the size of a pointer which would always return 4 or 8 for the buffer size.
 2019-11-18 10:05:16 +01:00
OpenRCT2 git bot 40e22eba8a Merge Localisation/master into OpenRCT2/develop. 2019-11-18 04:00:18 +00:00
ζeh Matt 7744fc71e4 Fix #10256: Desync because of client advancing ahead of server ticks during map change (#10257) 2019-11-17 23:26:32 +01:00
ζeh Matt 5606b4895b Fix desync because of ride status (#10227) 2019-11-16 16:12:33 +01:00
OpenRCT2 git bot f959be6b44 Merge Localisation/master into OpenRCT2/develop. 2019-11-16 04:00:16 +00:00
Tulio Leao 93083780df Use ScreenCoordsXY for windows/Map (#10233) 
* Use ScreenCoordsXY for windows/Footpath

- Refactor `place_park_entrance_get_map_position()` to receive `ScreenCoordsXY` and return `CoordsXYZD`
- Refactor `sub_68A15E()` to receive `ScreenCoordsXY` and return `CoordsXY`. Some of its usage are narrowing the result on purpose, as same variable is used for contexts where `int16_t` is still a hard requirement.

* Properly increment for big Z and use LOCATION_NULL
 2019-11-14 23:09:27 +01:00
Duncan f47b199cd2
Merge pull request #10231 from duncanspumpkin/viewport_get_refactor 
Refactor get_map_coordinates to enforce Coords struct
 2019-11-14 22:01:15 +00:00
duncanspumpkin e4ee91f5ff Refactor get_map_coordiantes to enforce Coords struct 2019-11-14 20:28:54 +00:00
Duncan 8eb42867dd
Merge pull request #10223 from duncanspumpkin/viewport_refactor 
Remove global variables from get_map_coordinates_from_pos_window
 2019-11-14 20:27:39 +00:00
Duncan d6bb101f8d
Merge pull request #10237 from tupaschoal/screencoords-for-mouse-functions 
Use ScreenCoordsXY for scroll_mouse* functions
 2019-11-14 20:24:06 +00:00
Tulio Leao cc12dbf238
Fix tile_element_height to use mapCoords instead of screenCoords 2019-11-14 10:50:10 -03:00
Duncan a80566027a
Merge pull request #10236 from tupaschoal/coords-for-tile-inspector 
Use more ScreenCoordsXY on windows/TileInspector.cpp
 2019-11-14 12:52:00 +00:00
Duncan 38db42ac22
Merge pull request #10235 from tupaschoal/coords-for-landrights 
Use ScreenCoordsXY on windows/LandRights.cpp
 2019-11-14 12:43:17 +00:00
Duncan 3f7a4a9f42
Merge pull request #10229 from tupaschoal/refactor_ride_get_entrance_or_exit 
Refactor ride_get_entrance_or_exit_position_from_screen_position()
 2019-11-14 12:42:38 +00:00
Tulio Leao fe3d6f6faf Use ScreenCoordsXY for scroll_mouse* functions 2019-11-14 08:40:40 -03:00
Tulio Leao a5492acdec Use more ScreenCoordsXY on windows/TileInspector.cpp 2019-11-14 08:05:07 -03:00
Tulio Leao 5ca54758ae Use ScreenCoordsXY on windows/LandRights.cpp 2019-11-14 07:58:54 -03:00
Tulio Leao 0bc28406e0 Fix mistake on Coords Z assignment 2019-11-14 07:27:28 -03:00
Duncan 7babeb47d4
Merge pull request #10221 from tupaschoal/viewport-return-more-coords 
Receive ScreenCoordsXY and return CoordsXY in Viewport
 2019-11-14 06:36:09 +00:00
Tulio Leao 7e65aeaea3 Fix issues in code review 
Implement operator== and operator!= for CoordsXYZD
Set location to null before returning from ride_get_entrance_or_exit_position_from_screen_position
 2019-11-13 18:46:02 -03:00
Tulio Leao ce9432964c Improve coords management on window_rotate_camera 2019-11-13 18:28:03 -03:00
Tulio Leao c36606c051 Distinguish Screen and Map Coords on window_rotate_camera 2019-11-13 18:28:03 -03:00
Tulio Leao 47387690f5 Improve coords assignments 2019-11-13 18:28:03 -03:00
Tulio Leao 30815f0886 Fix clang-format 2019-11-13 18:28:03 -03:00
Tulio Leao 054bc8e4ca Receive ScreenCoordsXY and return CoordsXY in Viewport 2019-11-13 18:27:59 -03:00
duncanspumpkin 0af10781f1 Remove unused globals 2019-11-13 19:04:01 +00:00
duncanspumpkin 57baeeaa3c Refactor to remove std::optional 2019-11-13 18:58:17 +00:00
Duncan dde6ee93e0
Merge pull request #10220 from tupaschoal/coords-for-footpath 
Use ScreenCoordsXY for windows/Footpath
 2019-11-13 18:41:37 +00:00
Tulio Leao 27f47e1407
Apply suggestions from code review 2019-11-13 05:18:06 -08:00
Tulio Leao 677bd119cf
Update src/openrct2/ride/Ride.cpp 2019-11-13 05:17:02 -08:00
Tulio Leao c568510bdc Fix warning displayed on CI 2019-11-13 09:54:05 -03:00
Tulio Leao 5dfe373061 Refactor ride_get_entrance_or_exit_position_from_screen_position() 2019-11-13 09:41:58 -03:00