mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-15 11:03:00 +01:00
Code Issues Releases Wiki Activity
17,422 Commits 8 Branches 59 Tags
5e888747de7663e577cdfd38df7608d0f703e3ea
Commit Graph

17422 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Tulio Leao
5e888747de Use mapCoords instead of ScreenCoords 2019-11-12 20:13:14 -03: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
Duncan
834e8da379 Merge pull request #10168 from duncanspumpkin/refactor_vp_to_map 
Refactor viewport_coord_to_map_coord to return a CoordXY
 2019-11-01 20:56:56 +00:00
Duncan
6cbc052c4e Merge pull request #10144 from cskrisz/refactor 
Refactor vehicle_visual_virginia_reel
 2019-11-01 20:55:17 +00:00
Aaron van Geffen
71699543dd Remove obsolete key label strings; update changelog. 2019-11-01 21:14:01 +01:00
Aaron van Geffen
e3b0c52086 Use available translations for shortcut keys. 2019-11-01 21:14:01 +01:00
duncanspumpkin
5ca553dd08 Refactor viewport_coord_to_map_coord to return a CoordXY 2019-11-01 20:04:07 +00:00
Duncan
9bf2cffbb7 Merge pull request #10169 from SijmenSchoon/feature/refactor-coordinates 
Change a sizable portion of LocationXY(Z) to (Tile)CoordsXY(Z)
 2019-11-01 20:02:26 +00:00
Sijmen Schoon
f7fd98fcf2 Add constexpr keywords 2019-11-01 02:07:14 +01:00
Matt
fbe0506ca8 Add game action type to the assert in GameActions::ProcessQueue 2019-10-31 17:27:55 +01:00
Sijmen Schoon
6b351870c3 Format MiniatureRailway.cpp 2019-10-31 16:20:22 +01:00
Sijmen Schoon
a815a3c626 Remove unnecessary static_casts 2019-10-31 16:18:44 +01:00
Sijmen Schoon
3f3baa2b13 Revert changing constructor lists to constructors 2019-10-31 16:10:26 +01:00
Tulio Leao
e86ee10e5f Use int32_t instead of int for train_index 2019-10-31 01:39:37 -03:00
Sijmen Schoon
ab2dbea32a Change a sizable portion of LocationXY(Z) to (Tile)CoordsXY(Z) 2019-10-31 00:19:14 +01:00
Duncan
bb48a471e6 Merge pull request #10135 from tupaschoal/constexpr-for-openrct2-defines 
Use constexpr on openrct2/*
 2019-10-30 19:45:25 +00:00
Duncan
219046af14 Merge pull request #10136 from tupaschoal/constexpr-for-openrct2ui-define 
Use constexpr on openrct2-ui/*
 2019-10-30 06:44:11 +00:00
Duncan
229e390a98 Merge pull request #10116 from ZehMatt/importexport-test 
Add S6 Import/Export test and remove old NetworkLoadSave test
 2019-10-30 06:42:36 +00:00
Duncan
3362cbc366 Merge pull request #10131 from tupaschoal/screencoords-for-tool-functions 
Use ScreenCoordsXY for tool_* functions
 2019-10-30 06:29:07 +00:00
Tulio Leao
afc14183e7 Use ScreenCoordsXY for tool_* functions 2019-10-29 19:02:58 -03:00
Tulio Leao
d1cec43065 Use constexpr on openrct2-ui/* 2019-10-29 18:48:04 -03:00
Tulio Leao
9123b597a9 Use constexpr on openrct2/* 2019-10-29 18:44:14 -03:00
Michał Janiszewski
f5c9131f23 Update version in .travis.yml to 0.2.4 2019-10-29 18:27:11 +01:00
babywashbear
86844d2a57 Context: replace 2nd std::make_unique<Context> with CreateContext call (#10139) 2019-10-29 17:41:49 +01:00
Tulio Leao
d9efd64fea Use ScreenCoordsXY for interface\Widget.h (#10123) 2019-10-29 17:41:19 +01:00
Krisztián Csordás
f2eb1fada6 Refactor SteamParticleOffsets (#10134) 
* Refactor SteamParticleOffsets

Turn flat array of 48 offsets into arrays of 16 offsets for 3 different
types.
 2019-10-29 17:38:57 +01:00
Michael Steenbeek
5c6e2c7fe9 Merge pull request #10119 from duncanspumpkin/maze_place_ga 
Maze Place Track Game Action
 2019-10-29 17:37:35 +01:00
Tulio Leao
96e54519ca Remove comparison of ScreenCoords with MONEY32_UNDEFINED (#10124) 2019-10-29 17:36:57 +01:00