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

22518 Commits

Author SHA1 Message Date
ζeh Matt fb93b9d81f
Use fold expressions to enable potential simd optimizations 2021-12-13 17:05:01 +02:00
ζeh Matt e405658f6a
Code style and cleanup 2021-12-13 16:00:51 +02:00
ζeh Matt 9ec4e9c326
Fix trim condition 2021-12-13 15:35:42 +02:00
ζeh Matt a742b49f2c
Pass const data by template parameters 2021-12-13 05:05:12 +02:00
ζeh Matt ecfbaec47e
Cleanup and fix block size calculation 2021-12-13 03:25:28 +02:00
ζeh Matt 59682291f0
Fix warnings and supply template argument 2021-12-13 02:31:33 +02:00
ζeh Matt 4f0b0e8aa4
Fix template parameter to be size_t 2021-12-12 23:47:20 +02:00
ζeh Matt ae61d7956a
Add tests for BitSet 2021-12-12 23:47:20 +02:00
ζeh Matt 16635b9192
Implement custom BitSet and replace std::bitset 2021-12-12 23:47:17 +02:00
Michał Janiszewski f55bc799cc
Merge pull request #16205 from janisozaur/reformat-clang-12 
Reformat with clang-format-12 from updated CI image
 2021-12-12 22:46:43 +01:00
Michał Janiszewski 52fc699e38 Use some updated CI images 2021-12-12 22:21:33 +01:00
Michał Janiszewski 7b0e6ad0b6 Reformat with clang-format-12 from updated CI image 2021-12-12 17:48:52 +01:00
Michael Steenbeek 0a31d9284b
Merge pull request #16202 from Gymnasiast/refactor/ride-functions-b 
Move 5 ride functions to methods
 2021-12-12 13:27:09 +01:00
Gymnasiast 4ebc23ad36
Move ride_get_total_time() to method 2021-12-12 13:00:28 +01:00
Gymnasiast 5e8a204365
Move ride_get_total_length() to method 2021-12-12 13:00:28 +01:00
Gymnasiast 9b81bacecd
Move ride_remove_peeps() to method 2021-12-12 12:31:19 +01:00
Gymnasiast 7559354d25
Move ride_update_popularity() to method 2021-12-12 12:30:22 +01:00
Gymnasiast 6df7c1e3b0
Move ride_update_satisfaction() to method 2021-12-12 12:30:22 +01:00
Ted John 2f20dc029e
Fix drawing of disabled zoom buttons 2021-12-12 11:48:49 +01:00
Michael Steenbeek b4f256be87
Merge pull request #16151 from IntelOrca/refactor/imageid-painting 
Refactor most map paint routines to use ImageId
 2021-12-12 11:43:31 +01:00
Duncan 3deaa1af2e
Fix #16197: Park award time and type accidentally swapped 2021-12-12 11:20:17 +01:00
Michael Steenbeek 27cbb6c6ae
Merge pull request #16190 from Gymnasiast/refactor/normalised-tile-element-type-3 
Part of #15485: normalise all OpenRCT2 tile element types
 2021-12-12 09:53:09 +01:00
Ted John 7ad1e257d3 Update formatting of files 2021-12-11 23:07:56 +00:00
Ted John 4288589f11 Refactor large scenery to use ImageId 2021-12-11 23:07:56 +00:00
Ted John d62736634f Refactor paint banner to use ImageId 2021-12-11 23:07:56 +00:00
Ted John 3fa2af3f6b Refactor paint small scenery to use ImageId 2021-12-11 23:07:56 +00:00
Ted John 4e9ca39c4a Refactor station covers to use ImageId 2021-12-11 23:07:55 +00:00
Ted John f8431d2b2e Refactor Entrance painting to use ImageId 2021-12-11 23:07:55 +00:00
Ted John b270688635 Refactor paint footpath to use ImageId 2021-12-11 23:07:55 +00:00
Ted John 5f1c85fbfd Refactor paint large scenery to use ImageId 2021-12-11 23:07:55 +00:00
Ted John 4aabe02eb0 Refactor surface paint to use ImageId 2021-12-11 23:07:55 +00:00
Ted John a17f1990f2 Refactor some viewport code to use ImageId 2021-12-11 23:06:21 +00:00
Ted John c55fa94af5 Refactor paint wall to use ImageId 2021-12-11 23:06:21 +00:00
Ted John 6cbf87cab3 Refactor paint vehicle to ImageId 2021-12-11 23:06:21 +00:00
Michael Steenbeek b83f7c3859
Merge pull request #16150 from IntelOrca/refactor/imageid-ui 
Refactor footpath, scenery, terrain and mapgen windows to use ImageId
 2021-12-11 23:21:19 +01:00
deurklink ceb49e0984
Fix: #16162 Go Kart speeds not correctly randomised (#16165) 
* Fix Go Kart Speeds not being random

Go kart speeds now only get 2 different values (around 37kmh or around 25kmh), in vanilla Go karts can also have a value in between. This PR fixes that.

* Update changelog.txt

Co-authored-by: Michael Steenbeek <m.o.steenbeek@gmail.com>

* Increment network version

* Update replays

Co-authored-by: Michael Steenbeek <m.o.steenbeek@gmail.com>
Co-authored-by: duncanspumpkin <duncans_pumpkin@hotmail.co.uk>
 2021-12-11 17:11:23 +00:00
ζeh Matt cec30e093d
Merge pull request #15991 from ZehMatt/refactor/bannerid 
Use TIdentifier for BannerIndex
 2021-12-11 08:08:27 -08:00
Duncan 56c4240d77
Make Parkfile Pathfinding Deterministic (#16147) 
* Rename path find functions and use sub function

* Modify leaving park logic to not use park entrance index

* Remove ChosenParkEntrance from peep struct

* Refactor GetNearestParkEntrance

Removed the index as its pointless. Fixed function to use CoordsXY

* Increment network version

* Update replays
 2021-12-11 16:03:59 +00:00
Duncan 6dc1efde82
Make awards a vector (#16134) 
* Make awards a vector

* Fix compiler and use one less branch
 2021-12-11 14:45:50 +00:00
OpenRCT2 git bot e4af63d3f6 Merge Localisation/master into OpenRCT2/develop 2021-12-11 04:09:03 +00:00
Gymnasiast aa34f0f760
Drop the N postfix 2021-12-11 00:39:39 +01:00
Gymnasiast 23c5988fb1
Change last usage of GetType() and remove the method 2021-12-11 00:38:42 +01:00
Gymnasiast fc3ce3294c
Move over switches to normalised tile element types 2021-12-11 00:30:59 +01:00
Michael Steenbeek 4caeb797f8
Merge pull request #16127 from Gymnasiast/feature/rct1-image-fallback 
Create fallback system for csg1 images
 2021-12-10 23:25:04 +01:00
Gymnasiast bedcba5ea8
Use SetTypeN() in ScTileElement.cpp 2021-12-10 23:05:56 +01:00
Gymnasiast 50c0080da8
Update calls to ClearAs() 2021-12-10 22:58:27 +01:00
Michael Steenbeek 2d1af0ec42
Replace many GetType() calls with GetTypeN() 2021-12-10 22:43:17 +01:00
OpenRCT2 git bot 0879f96f96 Merge Localisation/master into OpenRCT2/develop 2021-12-10 04:09:11 +00:00
Ted John 54ed1ecd05
Fix #16155: Paint issue on Swinging Ship 2021-12-09 20:41:16 +01:00
OpenRCT2 git bot a396289a7a Merge Localisation/master into OpenRCT2/develop 2021-12-09 04:09:15 +00:00