Michael Steenbeek
a2b9598341
Modify code using Location8 to use isNull()/setNull() ( #10403 )
2019-12-21 11:34:46 +01:00
Duncan
19f9fef532
Merge pull request #10401 from tupaschoal/std-coords
...
Standardize Coords and TileCoords objects
2019-12-21 10:22:11 +00:00
duncanspumpkin
f64563e0a7
Make suggested changes
2019-12-21 09:07:34 +00:00
NuclearFej
da49d98b8b
Android: fix Gradle, CMake, asset copying; upgrade to AndroidX
...
Gradle now pulls from the main OpenRCT2 /bin/data folder to insert the assets into the APK. MainActivity now properly copies assets from within the APK. Dependencies have been updated and the support library has been upgraded to AndroidX. CMake libraries now link properly. Network (multiplayer), Discord, and HTTP_Twitch were disabled, in addition to the already-disabled HTTP, OpenGL, and Twitch, due to compile-time errors. Revision number incremented.
2019-12-20 19:44:45 -05:00
Tulio Leao
780e3265d1
Standardize Coords and TileCoords objects
2019-12-20 08:29:42 -03:00
Duncan
3be7d824ac
Merge pull request #10397 from duncanspumpkin/refactor_gcommand
...
Remove gCommandPosition. Use GameActionRes instead.
2019-12-19 20:48:20 +00:00
duncanspumpkin
86cc7e9734
Add temporary variable to clear up shifting.
...
Fix clang format.
Simplify compare
2019-12-19 18:58:33 +00:00
duncanspumpkin
ee206546bf
Refactor MapAnimation to use CoordsXYZ
2019-12-19 18:38:46 +00:00
nia
1f220f2d62
Simplify OS-specific FileStream code ( #10270 )
...
Define ftello/fseeko to ftello64/fseeko64 only on Linux,
these functions are Linux-specific extensions.
Define ftello/fseeko to _ftelli64/_fseeki64 on MSC.
Otherwise, just use the standardized ftello/fseeko, and avoid
duplicating code for different names of the same function.
This allows this code to be reused on e.g. NetBSD without piling
on additional #ifdefs for any other POSIX operating systems.
2019-12-19 18:34:31 +01:00
Tulio Leao
918624e090
Fix #10396 : Function returning TileCoordsXYZD'z coord in a CoordsXYZD object ( #10398 )
2019-12-19 15:41:22 +01:00
Michael Steenbeek
6ede67d50a
Merge pull request #10371 from tupaschoal/coords-for-get-surface-element-at
...
Make map_get_surface_element_at only accept Coords objects
2019-12-19 13:24:17 +01:00
Tulio Leao
7e7b4029a9
Simplified conversions from TileCoordsXYZ to CoordsXY
2019-12-19 08:12:42 -03:00
Michael Steenbeek
f59f5d9b1f
Merge pull request #10375 from tupaschoal/coords-for-map-entrance-exit
...
Make map entrance/exit fetching functions use Coords objects
2019-12-19 11:39:37 +01:00
Duncan
08bf0a6807
Merge pull request #10391 from tupaschoal/mouse-diff-coords
...
Save mouse differential coords using ScreenCoordsXY
2019-12-19 08:02:32 +00:00
Tulio Leao
aea755bd70
Allow TileCoordsXYZD to generate CoordsXYZD equivalent
2019-12-19 00:11:26 -03:00
Tulio Leao
a5065e95c6
Simplify MouseInput differential coords calculation
2019-12-18 23:57:57 -03:00
Tulio Leao
5c657bde9f
Remove map_get_surface_element_at operating with TileCoordsXY
2019-12-18 23:47:17 -03:00
Tulio Leao
7c75db2b2d
Make map_get_surface_element_at only accept Coords objects
2019-12-18 23:46:50 -03:00
Duncan
099404b505
Merge pull request #10381 from tupaschoal/cursorsate-store-coords
...
Make CursorState store a ScreenCoordsXY object
2019-12-18 20:10:51 +00:00
Tulio Leao
af281817c3
Use CoordsXYZD on map_get_wall_element_at() ( #10374 )
...
* Use CoordsXYZD on map_get_wall_element_at()
* Add CoordsXYZ::ToTileStart()
2019-12-18 11:23:53 +01:00
Tulio Leao
4f615c5802
Make const some methods of location objects ( #10392 )
2019-12-18 11:21:16 +01:00
Tulio Leao
52d09171ba
Remove usage of LocationXY on TrackDesign ( #10383 )
2019-12-18 11:20:51 +01:00
OpenRCT2 git bot
fe23df5b48
Merge Localisation/master into OpenRCT2/develop.
2019-12-18 04:00:22 +00:00
Tulio Leao
c71c4284d0
Make map entrance/exit fetching functions use only CoordsXY objects
2019-12-17 23:55:46 -03:00
Tulio Leao
8613edee4a
Use ScreenCoordsXY::operator- to improve readability
2019-12-17 23:33:07 -03:00
Tulio Leao
972a8735e8
Fix arithmetic error in Scenery::window_scenery_update()
2019-12-17 23:32:34 -03:00
Tulio Leao
502a15512b
Save mouse differential coords using ScreenCoordsXY
2019-12-17 23:21:12 -03:00
Ted John
b2c0787c2d
Fix #10389 : Invalid read in vehicle_update_travelling ( #10390 )
2019-12-17 21:48:38 +01:00
Tulio Leao
c2c40fa951
Create ScreenCoordsXY on UIContext mouse/finger functions ( #10382 )
2019-12-17 18:46:28 +01:00
Tulio Leao
6b06b2c578
Use ScreenCoordsXY for Mouse Drag storage ( #10380 )
2019-12-17 18:38:20 +01:00
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
