mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2.git synced 2025-01-22 18:31:59 -05:00
Code Issues Projects Releases Packages Wiki Activity
17830 commits 10 branches 46 tags 399 MiB
Commit graph

17830 commits

This branch
This branch
All branches
Author SHA1 Message Date
OpenRCT2 git bot
5be2604f27 Merge Localisation/master into OpenRCT2/develop. 2020-01-24 04:01:26 +00:00
Duncan
171e255981 Fix #10598. Mistake made when fixing #7784. (#10606) 2020-01-23 22:43:29 +01:00
OpenRCT2 git bot
06fbfe46ac Merge Localisation/master into OpenRCT2/develop. 2020-01-23 04:01:52 +00:00
Michael Steenbeek
3192bfb7c6
Move research functions to method; remove unused function (#10609) 2020-01-22 22:51:11 +01:00
Aaron van Geffen
d1eb041958 Increase height of track save buttons. (#10604) 2020-01-22 13:30:33 +01:00
Aaron van Geffen
c5bdbc4296
Merge pull request #10370 from MichaelJBerk/develop 
Resolve #3154: Random Title Sequence
 2020-01-22 11:55:38 +01:00
Aaron van Geffen
5cf7618610 Update changelog. 2020-01-22 11:41:34 +01:00
Aaron van Geffen
acc6cffad3 Apply clang-format. 2020-01-22 11:41:34 +01:00
Michael Berk
914c07a711 Added Random Title Sequence 2020-01-22 11:41:34 +01:00
Michael Steenbeek
4781ee3176
Add #9073 to changelog [ci skip] 2020-01-21 22:51:46 +01:00
Michael Steenbeek
733ec6ec24
Fix water sides glitch (#10599) 2020-01-21 14:34:25 +01:00
Ted John
804cf2c072 Disable localisation merge for forks 2020-01-21 09:00:18 +00:00
Duncan
f1dcf85731
Merge pull request #10591 from duncanspumpkin/Sprite 
Sprite Refactor
 2020-01-20 08:38:51 +00:00
Michael Steenbeek
7949e80fd3 Remove clang-format from Travis (#10589) 
Now clang-format has been moved to Github Actions, remove it from Travis to avoid running it twice.
 2020-01-19 18:13:21 +00:00
duncanspumpkin
85f2b0b21d Fix testpaint 2020-01-19 17:37:24 +00:00
duncanspumpkin
28565b370d Fix clang format 2020-01-19 17:19:45 +00:00
duncanspumpkin
272e4f29a3 Further minor refactors 2020-01-19 17:16:42 +00:00
duncanspumpkin
08ea5585ee Small refactors and cleanups 2020-01-19 17:16:42 +00:00
duncanspumpkin
5e9e9df7ce Refactor invalidate_sprite 2020-01-19 17:16:42 +00:00
duncanspumpkin
71aed18fba Rfactor sprite_set_coordinates 2020-01-19 17:16:42 +00:00
duncanspumpkin
bdcfd615ed Refactor sprite_move 2020-01-19 17:16:41 +00:00
duncanspumpkin
a262f325ed Refactor sprite_remove 2020-01-19 17:15:52 +00:00
duncanspumpkin
65c6564165 Use SpriteBase instead of rct_sprite for move_sprite_to_list 2020-01-19 17:15:52 +00:00
duncanspumpkin
1b6bfa2bbf Remove no longer strictly correct comments 2020-01-19 17:15:51 +00:00
duncanspumpkin
a5ef8d6240 Rename rct_vehicle 2020-01-19 17:14:56 +00:00
duncanspumpkin
164acc85cc Rename sprites to newer style naming 2020-01-19 17:10:53 +00:00
duncanspumpkin
86a20805ad Correct the types for exporting 2020-01-19 17:08:57 +00:00
duncanspumpkin
4e796ec92d Increase Sprite size to 0x200 
This should allow for major refactoring of the sprite classes
 2020-01-19 17:08:57 +00:00
Michael Steenbeek
b1e8caa575
Merge pull request #10570 from tupaschoal/use-more-coords-6 
Prefer CoordsXY* on more places
 2020-01-19 18:06:20 +01:00
Michael Steenbeek
1892a3da48
Merge pull request #10574 from tupaschoal/footpath-direction-delta 
Prefer CoordsDirectionDelta on footpath_update_path_wide_flags()
 2020-01-19 18:06:02 +01:00
Michael Steenbeek
7f4d35f1c3
Merge pull request #10584 from Gymnasiast/modulo7 
Name field var_CD of vehicle struct. Refactor to enum
 2020-01-19 18:04:49 +01:00
Gymnasiast
af12421f2d
Apply fixes 2020-01-19 17:34:11 +01:00
modulo7
fdf0c17fd8
Name field var_CD of vehicle struct. Refactor to enum 2020-01-19 17:34:11 +01:00
Tulio Leao
b7e9b36a27 Prefer std::array and COORDS defines on Map::CoordsDirectionDelta 2020-01-19 13:30:29 -03:00
Tulio Leao
0d88c73b90 Prefer std::array and COORDS defines on Fountain arrays 2020-01-19 13:30:29 -03:00
Tulio Leao
c8097eab3a Use CoordsXYE on maze_entrance_hedge_removal() 2020-01-19 13:30:28 -03:00
Tulio Leao
a3ecefcf89 Use CoordsXYE on maze_entrance_hedge_replacement() 2020-01-19 13:30:28 -03:00
Tulio Leao
893086440c Use CoordsXYZ on park_entrance_get_index() 2020-01-19 13:30:28 -03:00
Tulio Leao
d34321fdaa Use CoordsXY on ride_entrance_exit_place_ghost() 2020-01-19 13:30:28 -03:00
Tulio Leao
e65f9424cf Use CoordsXYZ on rct_duck::MoveTo() 2020-01-19 13:30:26 -03:00
Tulio Leao
49bd8e0c67 Use CoordsXYZ on banner_get_ride_index_at() 2020-01-19 13:28:24 -03:00
Tulio Leao
5a74d057b0 Use CoordsXY on banner_get_closest_ride_index() 2020-01-19 13:28:24 -03:00
Tulio Leao
ad89319918 Simplify loop on footpath_update_path_wide() 2020-01-19 13:09:45 -03:00
Tulio Leao
132ab424f7 Use loop on footpath_update_path_wide() to iterate with CoordsDirectionDelta 2020-01-19 13:09:45 -03:00
Tulio Leao
57faa437c0 Prefer CoordsDirectionDelta on footpath_update_path_wide_flags() 2020-01-19 13:09:45 -03:00
Michael Steenbeek
d798811c4a Make GetWaterHeight return big Z (#10579) 
* Make GetWaterHeight return big Z

* Restore > 0 [ci skip]
 2020-01-19 15:12:48 +00:00
Duncan
8abb9e5515
Fix obstructions not stopping ride placement (#10585) 2020-01-19 15:12:26 +00:00
Ted John
3ba8369f22
Do major clean up of Windows CI workflow (#10581) 
- Move many of the post build operations in openrc2.proj to bash scripts, some of which can be shared with the macOS and Linux CIs.
- Improve performance of NSIS stage by grabbing a pre-packaged portable zip from GitHub. This typically saves the CI a minute and is more reliable.
 2020-01-19 14:04:59 +00:00
Duncan
0702808692
Use a game action result for clear at function (#10576) 
* Use a game action result for clear at function

* Clean up callers of set_error_text

* Make it compile

* Make suggested changes

* fix compile

* Fix nullptr deref
 2020-01-19 13:14:37 +00:00
Michael Steenbeek
8a9f0eeca5
Prepare track piece handling code for more than 256 pieces (#10575) 2020-01-17 12:27:14 +01:00