Commit graph

17706 commits

Author SHA1 Message Date
OpenRCT2 git bot
0d11f4f150 Merge Localisation/master into OpenRCT2/develop. 2019-12-16 04:00:19 +00:00
Duncan
b767351a56
Merge pull request #10189 from duncanspumpkin/track_ac
Track Design GameAction
2019-12-15 17:10:57 +00:00
duncanspumpkin
df5d5f4eb1 Fix the logging once and for all 2019-12-15 16:48:14 +00:00
duncanspumpkin
11974dd7b3 Increment Network Version 2019-12-15 08:31:26 +00:00
duncanspumpkin
3c89fc63ad Reduce logging of variables to just name to make logs useful 2019-12-15 08:26:19 +00:00
duncanspumpkin
2eab8c3784 Fix formatting and declaration 2019-12-15 08:23:21 +00:00
duncanspumpkin
d9db7a05c9 Xcode patch from
@Gymnasiast
2019-12-15 08:23:21 +00:00
duncanspumpkin
63b8f83f4f Make suggested changes 2019-12-15 08:23:21 +00:00
duncanspumpkin
073e75a7bd Remove extra line break 2019-12-15 08:23:21 +00:00
duncanspumpkin
d4e15d7238 Update changelog 2019-12-15 08:23:21 +00:00
duncanspumpkin
d97bb88c41 Reduce desyncs by removing teh track before updating peep logic 2019-12-15 08:21:32 +00:00
duncanspumpkin
cfb4bba721 Remove todo and clang format where required
Change array type to avoid additional code

Make CI's happier
2019-12-15 08:21:32 +00:00
duncanspumpkin
d8b5060eb9 Remove dead game command code.
Refactor of z increment
2019-12-15 08:21:32 +00:00
duncanspumpkin
fa3332f47a Fix ghost desync and rotation issue
Fix callback by reworking placement code
2019-12-15 08:21:32 +00:00
duncanspumpkin
7dbf0353ff Serialise scenery, mazes, entrances 2019-12-15 08:21:32 +00:00
duncanspumpkin
83503f4c69 Serialise track design. Start work on making it work
Fix track designs issuing extra game actions
2019-12-15 08:21:32 +00:00
duncanspumpkin
c781fcb72d Start moving track design into a game action
Make place track design work with game actions
2019-12-15 08:21:32 +00:00
Tulio Leao
2cd3add373 Make CursorState store a ScreenCoordsXY object 2019-12-14 23:30:55 -03:00
Tulio Leao
72d19f779b Fix clang-format 2019-12-14 23:07:45 -03:00
Tulio Leao
9d09f1b95c Use ScreenCoordsXY on context cursor operations (#10364) 2019-12-14 22:52:18 +01:00
Tulio Leao
af7b364946 Prefer map_is_location_valid over hardcoded map limits (#10373) 2019-12-14 22:50:34 +01:00
Tulio Leao
03e7e29b21 Make map entrance/exit fetching functions use Coords objects 2019-12-14 12:13:09 -03:00
frutiemax
18ba9b27a3 Implement #7865: Allow transport rides to synchronise with adjacent stations (#10280) 2019-12-14 09:58:00 +01:00
Tulio Leao
801e6e085d Use CoordsXY on Map::map_surface_is_blocked() (#10369)
* Use CoordsXY on Map::map_surface_is_blocked()

* Update src/openrct2/peep/GuestPathfinding.cpp

* Use map_is_location_valid() instead of hardcoded number
2019-12-14 09:57:13 +01:00
Abd Narane
1ace96ccc4 Add shortcuts for changing the scaling value. (#10341)
Fixes #10305
2019-12-13 17:31:23 +01:00
Tulio Leao
440f012e8a Remove unused Map::rotate_map_coordinates() function (#10362) 2019-12-12 18:53:24 +01:00
Tulio Leao
2ff4c28cb5 Use CoordsXY on action rotation (#10332)
* Use CoordsXY on action rotation

* Don't use intermediate CoordsXY variable just for Rotating it next

* Standardize operations on Coords and Rotated Coords

* Remove unwanted linebreak addition
2019-12-12 08:09:46 +00:00
Duncan
fed417da03
Merge pull request #10356 from duncanspumpkin/label_var
Change the label on known var to reflect use.
2019-12-11 18:14:07 +00:00
Duncan
90bde58852
Merge pull request #10329 from tupaschoal/coords-for-windows-rotate
Use CoordsXY on TopToolbar and TrackDesignPlace rotations
2019-12-11 08:44:06 +00:00
OpenRCT2 git bot
c0208210e5 Merge Localisation/master into OpenRCT2/develop. 2019-12-11 04:00:20 +00:00
Tulio Leao
43366a0a51 Make sure height comparisons are done against TileCoords 2019-12-10 23:33:53 -03:00
Duncan
2a53ebd936
Merge pull request #10333 from tupaschoal/rotate-paint
Use CoordsXY for Paint rotations
2019-12-10 18:35:38 +00:00
Duncan
432ad7867a
Merge pull request #10334 from tupaschoal/rotate-for-trackdesign
Use CoordsXY for TrackDesign* rotations
2019-12-10 12:49:34 +00:00
Michael Steenbeek
8e805f5088
Merge pull request #10328 from tupaschoal/rotate-ride-coords
Use CoordsXY and ScreenCoordsXY for rotate in Ride*.*
2019-12-10 13:13:03 +01:00
Ted John
e72d2aba85
Merge pull request #10309 from tupaschoal/floor-ceil-constexpr
Make floor2 and ceil2 constexpr functions
2019-12-09 22:48:20 +00:00
Tulio Leao
68e0519c5e Remove Map::map_offset_with_rotation() 2019-12-09 17:55:57 -03:00
Tulio Leao
2ddde8a344 Simplify attach calculation on Paint.cpp 2019-12-09 17:19:45 -03:00
Tulio Leao
01c62437b2 Remove Ride::ride_get_rotated_coords() 2019-12-09 16:52:47 -03:00
OpenRCT2 git bot
137d47a375 Merge Localisation/master into OpenRCT2/develop. 2019-12-09 04:00:18 +00:00
OpenRCT2 git bot
b02729d0ce Merge Localisation/master into OpenRCT2/develop. 2019-12-06 04:00:19 +00:00
Tulio Leao
aca4d39107 Allow TileCoordsXYZ conversion to CoordsXYZ 2019-12-05 21:43:20 -03:00
Tulio Leao
e21e0105af Use CoordsXY for Map rotations (#10335) 2019-12-05 20:38:14 +01:00
Tulio Leao
081c9fb187 Use CoordsXY for TrackDesign* rotations 2019-12-04 23:30:36 -03:00
Tulio Leao
5b43f19708 Use CoordsXY for Paint rotations 2019-12-04 23:08:26 -03:00
Tulio Leao
accb4ea691 Use CoordsXY on TopToolbar and TrackDesignPlace rotations 2019-12-04 22:07:11 -03:00
Tulio Leao
d9348cf562 Use CoordsXY::ToTileCentre() on Ride.cpp 2019-12-04 22:02:11 -03:00
Michael Steenbeek
d012c8141b
Merge pull request #10316 from duncanspumpkin/light_fx
Make lights work for all rotations.
2019-12-04 14:11:26 +01:00
Wuzzy
b2443d36e8 Change some ride descriptions (#10244) 2019-12-04 14:10:03 +01:00
Tulio Leao
6f0ebfea27 Use CoordsXY and ScreenCoordsXY for rotate in Ride*.* 2019-12-04 08:02:09 -03:00
ζeh Matt
ab5be44ccb Fix #10325: Crash when banners have no text (#10327)
* Fix #10325: Crash when banners have no text

* Update changelog.txt
2019-12-04 11:22:07 +01:00