mirrors
/
OpenRCT2
mirror of https://github.com/OpenRCT2/OpenRCT2.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity
18,042 Commits 7 Branches 39 Tags 358 MiB
Commit Graph

18042 Commits

Author SHA1 Message Date
Gymnasiast 63fddee603
Convert gResearchLast/NextItem to std::optional 2020-01-26 10:07:16 +01:00
OpenRCT2 git bot 775add1edb Merge Localisation/master into OpenRCT2/develop. 2020-01-26 04:01:51 +00:00
Ted John 5925d5fc10
Improve cmake config for Windows and Visual Studio (#10361) 
- Ensure static CRT is used when compiling.
- Allow Ninja generator to work (remove use of CMAKE_VS_PLATFORM_NAME).
- Move CMakeSettings.json to new standard location for VS.
 2020-01-25 22:42:27 +00:00
Ted John 519ea1c8c3 Fix #10376: No ratings generated when a shop and track intersect (#10387) 2020-01-25 23:09:58 +01:00
Michael Steenbeek 2b6e925744
Fix testing giga coaster with cable lift crashing the game (#10620) 2020-01-25 12:24:04 +01:00
Duncan 4a22158387 Fix #10386. Mistake made while refactoring (#10607) 
Added some additional comments whilst investigating the issue. Ultimate fix should look at changing the bounding box units but unsure of consequences
 2020-01-25 10:30:38 +01:00
OpenRCT2 git bot 027c5ce112 Merge Localisation/master into OpenRCT2/develop. 2020-01-25 04:01:30 +00:00
ζeh Matt 32d6ed2bc2
Merge pull request #10593 from tupaschoal/pr-10048 
Fix #9477: Process exit code is always 0
 2020-01-24 22:38:22 +01:00
Ted John eab255c4bf
Add Linux portable to GitHub CI (#10612) 2020-01-24 11:46:12 +00:00
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
Tulio Leao c87e1ff9b6 Use EXITCODE enum on game startup 2020-01-19 19:37:27 -03:00
Lomash Gupta 0165261ac0 Fix #9477: Fix process exit code always being zero 
- Replaced gExitCode occurences with EXIT_SUCCESS and EXIT_FAILURE
- Removed global declaration of gExitCode
 2020-01-19 18:35:24 -03:00
Lomash Gupta 36840f3fe0 fixed gExitCode 2020-01-19 18:35:24 -03: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