mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-17 03:53:07 +01:00
Code Issues Releases Wiki Activity
17,529 Commits 8 Branches 59 Tags
fed417da033fe81d35be7a337e7f5ce4d762a0e1
Commit Graph

17529 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Tulio Leao
aa02a8c7ce Throw exception if floor2 and ceil2 are misused 2019-12-03 23:13:12 -03:00
Gokturk Yuksek
7bf05d4c04 Fix #10308: remove the last remnants of libsdl2-ttf references (#10321) 
As per #5702, SDL2_ttf dependency is completely eliminated from
OpenRCT2. However, there are still references to it, which are
redundant and misleading. Clean up the remaining references to
libsdl2-ttf.

Closes: https://github.com/OpenRCT2/OpenRCT2/issues/10308
 2019-12-02 07:41:18 +01:00
Tulio Leao
c4089acd63 Removed parentheses for improved readability 2019-12-01 22:45:16 -03:00
duncanspumpkin
44998481f6 Use tile Offset 2019-12-01 15:15:44 +00:00
duncanspumpkin
ef10cb243b minor code cleanup 2019-12-01 14:53:52 +00:00
duncanspumpkin
813ed4fdac Remove commented out dead code 2019-12-01 14:52:17 +00:00
duncanspumpkin
f964d38e7d Renable light occlusion 2019-12-01 14:51:14 +00:00
duncanspumpkin
ace59e6a73 Make lights work for all rotations. 
Mistake made with the coordinates confusing viewport and screen coordinates. In addition occlusion code that is depretiated was culling all lights in two rotations due to dead code.
 2019-12-01 14:07:48 +00:00
Duncan
3bd46ed602 Merge pull request #10315 from duncanspumpkin/screen_2_refactor 
Refactor return value of screen_coord_to_viewport_cord
 2019-12-01 13:22:50 +00:00
duncanspumpkin
0c6e062d5a Refactor return value of screen_coord_to_viewport_cord 2019-12-01 09:15:07 +00:00
Tulio Leao
1532ee2b23 Create CoordsXY::ToTileStart() and CoordsXY::ToTileCentre() 2019-11-30 16:47:23 +01:00
Tulio Leao
1e67c3bff8 Make floor2 and ceil2 constexpr functions 2019-11-30 08:41:45 -03:00
Duncan
58948793e9 Merge pull request #10307 from tupaschoal/fix-10304 
Fix #10304: Mouse zoom not following cursor position
 2019-11-29 22:51:58 +00:00
Tulio Leao
721a4961a7 Fix #10304: Mouse zoom not following cursor position 2019-11-29 18:08:59 -03:00
Tulio Leao
4537c061d9 Prefer std::optional over LOCATION_NULL on Viewport (#10297) 2019-11-29 17:17:01 +01:00
Duncan
7e96ddf1d6 Merge pull request #10289 from tupaschoal/viewport-inter-2 
Use CoordsXY on ViewportInteraction.cpp
 2019-11-29 09:21:08 +00:00
Duncan
b316f447a4 Merge pull request #10285 from tupaschoal/useCoords-get-map-coords 
Remove raw coordinates overload of get_map_coordinates_from_pos
 2019-11-29 09:20:12 +00:00
OpenRCT2 git bot
91df8358a1 Merge Localisation/master into OpenRCT2/develop. 2019-11-29 04:00:19 +00:00
Ted John
569161902f Fix #9919: invalid read in vehicle_update_measurements (#10300) 2019-11-27 21:45:32 +01:00
Tulio Leao
fb95154000 Use operator -= and += of CoordsXY 2019-11-25 23:08:31 -03:00
Tulio Leao
47935288d0 Remove raw coordinates overload of get_map_coordinates_from_pos 2019-11-25 17:45:02 -03:00
Duncan
0093105219 Merge pull request #10288 from duncanspumpkin/v_adjust 
Refactor viewport_adjust_for_map_height to use Screen/CoordsXYZ.
 2019-11-25 12:39:36 +00:00
Tulio Leao
2af1f1feba Use CoordsXY on ViewportInteraction.cpp 2019-11-24 19:45:56 -03:00
duncanspumpkin
0c4fffb2ec Refactor viewport_adjust_for_map_height to use CoordsXYZ. 2019-11-24 21:37:35 +00:00
Duncan
966ba6b018 Merge pull request #10269 from duncanspumpkin/centre_2d 
Refactor centre_2d_coordinates to use screenCoords.
 2019-11-24 14:28:18 +00:00
Duncan
81566a5e90 Merge pull request #10276 from tupaschoal/viewport-inter 
Use ScreenCoordsXY on viewport interactions
 2019-11-24 14:27:58 +00:00
tjwrona1992
5f41e9df38 Add missing include for std::max to fix VS16.4.0P2 compilation (#10282) 
* Fix errors where "std::max" was not recognized while compiling with the latest Visual Studio (2019 16.4.0 Preview 2.0) due to a missing "#include" statement.

* Ran clang-format.
 2019-11-24 08:12:50 +01:00