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
Tulio Leao
0fc6da2443
Use ScreenCoordsXY for MazeConstruction ( #10222 )
2019-11-13 11:54:55 +01:00
Tulio Leao
5e888747de
Use mapCoords instead of ScreenCoords
2019-11-12 20:13:14 -03:00
duncanspumpkin
278dd9b1d2
Remove global variables from get_map_coordinates_from_pos_window
2019-11-12 20:11:48 +00:00
Tulio Leao
3fa4b7b964
Fix clang-format
2019-11-12 00:27:59 -03:00
Tulio Leao
892c084cd8
Use ScreenCoordsXY for windows/Footpath
2019-11-11 23:10:51 -03:00
Conrad Kostecki
9df66b1f1f
CMakeLists.txt: don't install desktop and icon files without GUI ( #10206 )
...
If OpenRCT2 is compiled without GUI (for example as a dedicated server),
it does not make sense to install the desktop and icon files.
Signed-off-by: Conrad Kostecki <conrad@kostecki.com>
2019-11-10 20:05:51 +01:00
ζeh Matt
7e279d37cd
Fix out of bounds access opening the in-game console at startup ( #10197 )
2019-11-09 21:26:14 +01:00
Conrad Kostecki
fef1906d0d
CMakeLists.txt: make discord-rpc and google benchmark optional ( #10208 )
...
For a package maintainer, it should be possible to disable the support
for discord-rpc and google benchmark, as it currently always includes them,
when the library if found.
2019-11-09 21:20:16 +01:00
ζeh Matt
9b499ea239
Fix #10087 : crash loading a save with corrupt peeps ( #10122 )
2019-11-09 17:00:09 +01:00
ζeh Matt
f6a23fd5f5
Add compile time selection for copying data with specialised paths ( #9331 )
2019-11-09 15:54:43 +01:00
ζeh Matt
f4a1b75a53
Merge pull request #10191 from ZehMatt/refactor/benchgfx
...
Refactor benchgfx
2019-11-09 00:22:58 +01:00
Michał Janiszewski
afc92ee15a
ifdef-out WinNT 6.0+ APIs ( #10198 )
...
Occasionally I need to build a binary compatible with WinNT 5.1, e.g.
when testing out Wine or ReactOS. There are just a few minor changes
required to have a working build, but as they are not part of the
repository, I always end up doing them from scratch. I would like to
upstream them instead so I don't have to recreate them each time, even
if this is not the most common use case.
2019-11-08 23:16:15 +01:00
Matt
d3103b6397
Refactor benchgfx
2019-11-08 08:52:45 +01:00
OpenRCT2 git bot
ffb1982d5e
Merge Localisation/master into OpenRCT2/develop.
2019-11-05 04:00:18 +00:00
Ted John
d8d762dcb9
Build cli, win and tests projects sequentially, not in parallel ( #10190 )
...
There is probably some kind of file locking issue with openrct2.lib which stops the win project from building during re-build. Only let the two lib projects build in parallel.
2019-11-04 15:51:10 +01:00
Michael Steenbeek
dc74171a70
Merge pull request #10118 from tomlankhorst/fix/cleanup-opengl-drawing
...
Cleanup OpenGL code and fix HiDpi OpenGL window size
2019-11-04 15:50:11 +01:00
Tom Lankhorst
027c09553b
Reformat code with clang-format 8.0.
2019-11-04 15:11:06 +01:00
Tom Lankhorst
efea8856ed
Clean up OpenGL engine.
...
Code de-duplication and improved namespacing.
2019-11-04 15:10:42 +01:00
Aaron van Geffen
91f91d4388
Merge pull request #10147 from AaronVanGeffen/implement/1164
...
Use available translations for shortcut keys
2019-11-04 13:07:34 +01:00
Aaron van Geffen
d3b5214f95
Clarify user strings section in comment; add stylistic braces.
2019-11-04 12:09:36 +01:00
Duncan
8dc5865e6f
Merge pull request #10170 from tupaschoal/int32t_for_vehicle_train_index
...
Use int32_t instead of int for train_index
2019-11-03 05:17:30 +00:00
duncanspumpkin
ac87b3f667
Use std::optional to remove requirement for invalid result.
2019-11-02 14:43:51 +00:00
Tulio Leao
9776a0843d
Make Viewport::screen_to_map_pos() return coords ( #10171 )
...
* Make Viewport::screen_to_map_pos() return coords
* Fix clang-format
* Update src/openrct2-ui/windows/TileInspector.cpp
* Update src/openrct2-ui/windows/TileInspector.cpp
* Apply suggestions from code review
2019-11-02 08:04:46 +00:00
OpenRCT2 git bot
66b26acf2f
Merge Localisation/master into OpenRCT2/develop.
2019-11-02 04:00:17 +00:00
Duncan
57f202d721
Merge pull request #10175 from ZehMatt/ga-queue-investigation
...
Add game action type to the assert in GameActions::ProcessQueue
2019-11-01 20:58:45 +00:00
Alan Berndt
a4181d10f4
Refactor get_map_coordinates_from_pos_window ( #10109 )
...
* Refactor get_map_coordinates_from_pos_window
This changes get_map_coordinates_from_pos_window to use the
ScreenCoordsXY and CoordsXY structs instead of bare ints as suggested
in #10065
* Use default constructor.
The default constructor initializes the coordinates to (0, 0) anyway so
doing that explicitly is redundant.
* Fix parentheses
* Fix formatting issues
* Manually fix clang formatting
Apparently my version of clang-format doesn't behave properly so I am
manually making the changes that CI suggests.
2019-11-01 20:57:44 +00:00