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

659 Commits

Author SHA1 Message Date
Gymnasiast aac479d76d
Merge remote-tracking branch 'upstream/develop' into new-save-format 2021-10-26 20:14:01 +02:00
Michael Steenbeek dd007c836f
Fix #15579: Crash in track_block_get_next() 2021-10-26 18:05:13 +00:00
ζeh Matt a98caef48a
Merge remote-tracking branch 'upstream/develop' into new-save-format 2021-10-20 16:35:05 +03:00
seanmajorpayne f6cb144f8c
Fix #15322: Circus Music is Not Playing (Full Fix) 2021-10-20 13:11:06 +00:00
Hielke Morsink 7e2e6e2b2f
Merge branch 'develop' into new-save-format 2021-10-19 22:26:08 +02:00
Hielke Morsink 9dd20ec619
Improve array formatting 
For most of these cases, adding a trailing comma to the array block makes clang-format put each item on a new line, and clang-format exception blocks could be reduced where clang-format does not handle them properly.
 2021-10-17 18:21:45 +02:00
Gymnasiast 0d264479de
Split out min/max cars per train 2021-10-17 14:29:11 +02:00
Hielke Morsink 2ad0ace1cc
Merge branch 'develop' into new-save-format 2021-10-17 13:14:25 +02:00
Michael Steenbeek 5cb1cee0d8
Fix #15584: Ride income underflows when on-ride photos are making losses 2021-10-17 09:15:13 +02:00
duncanspumpkin 982b5b2cb3 Merge branch 'develop' into HEAD 2021-10-08 07:54:24 +01:00
Michael Steenbeek 5563139ed1
Fix #15503: Freeze when doing specific merges 2021-10-06 23:00:06 +02:00
Gymnasiast 5a0fa60b9e
Merge remote-tracking branch 'upstream/develop' into new-save-format 2021-10-01 18:45:51 +02:00
Hielke Morsink 429e34d7f3
Make uses of window_get_main use (const) auto* 2021-09-30 14:36:06 +02:00
Hielke Morsink 94144bcd89
Remove some dead code 
Reported by clang
clang-analyzer-deadcode.DeadStores
 2021-09-30 10:40:32 +02:00
ζeh Matt 82f0da24b1
Use int32_t for iterating tiles 
Co-authored-by: Ted John <ted@brambles.org>
 2021-09-29 20:40:57 +03:00
Gymnasiast 8f97730a5e
Merge remote-tracking branch 'upstream/develop' into new-save-format 2021-09-26 19:56:04 +02:00
Michael Steenbeek f7d61c67e6
Fix arbitrary ride type cheat not working 2021-09-26 16:21:34 +02:00
Gymnasiast 0825865d13
Merge remote-tracking branch 'upstream/develop' into new-save-format 2021-09-26 11:57:32 +02:00
seanmajorpayne 2ba515fb37
Improve #15322: Circus Music Not Playing 
Alleviates the issue, though the circus in European Extravaganza still does not work correctly.
 2021-09-25 19:21:38 +00:00
ζeh Matt f689b4e4c8
Merge remote-tracking branch 'upstream/develop' into new-save-format 2021-09-23 22:28:17 +03:00
ζeh Matt e5de2adc4f
Merge pull request #15429 from ZehMatt/backport/ticks 
Remove scenario ticks and adjust export/import
 2021-09-23 12:08:16 -07:00
ζeh Matt 74e8988dd8
Remove scenario ticks and adjust export/import 
Co-authored-by: Ted John <ted@brambles.org>
 2021-09-23 21:49:09 +03:00
ζeh Matt 719a5a9d8e
Merge pull request #15369 from ZehMatt/refactor/tile-coords 
Refactor overload map_get_first_element_at
 2021-09-21 14:36:03 -07:00
Hielke Morsink d93309d065
Merge branch 'develop' into new-save-format 2021-09-17 23:41:58 +02:00
Ted John 80e0f990ab Fix remaining merge conflicts 2021-09-17 22:16:47 +01:00
Gymnasiast c390e9f521
Merge remote-tracking branch 'upstream/develop' into new-save-format 
Some conflicts intentionally unresolved
 2021-09-17 10:15:09 +02:00
Hielke Morsink 4b4b3333d6
Remove unnecessary else blocks 2021-09-16 18:31:12 +02:00
ζeh Matt 687b6c000e
Apply review suggestion 
Co-authored-by: Tulio Leao <tupaschoal@gmail.com>
Co-authored-by: Hielke Morsink <hielke.morsink@gmail.com>
 2021-09-14 16:30:38 +03:00
ζeh Matt 59a6c34db4
Make use of std::optional strict 2021-09-13 20:02:32 +03:00
ζeh Matt b733e97bfa
Remove numerics from common.h and use it as needed 2021-09-11 20:21:08 +03:00
ζeh Matt 516232e0a7
Change static casts to EnumValue 2021-09-10 19:10:15 +03:00
ZehMatt 3ad72baaae
Cast fixes 2021-09-10 19:10:12 +03:00
Michael Steenbeek 624a32e93b
Make Coords isNull/setNull functions TitleCase (#15382) 2021-09-08 20:48:53 -03:00
ζeh Matt 07a7946caf
Remove redundant conversions 2021-09-07 22:36:16 +03:00
spacek531 ebc201aaf2 comment and rename 
refactor to class method

fix formatting

rename function

rename another

rename sub_6C683D

rename loc_6CD18E

annotate ride_get_entrance_or_exit_position_from_screen_position

fix format

rename loop value

fix formatting again

rename functions to TitleCase
 2021-09-02 19:47:22 -07:00
Gymnasiast 612724e8f8
Merge remote-tracking branch 'upstream/develop' into new-save-format 2021-08-31 00:42:44 +02:00
Michael Steenbeek 4bbee1c6ae
Merge pull request #15261 from frutiemax/13874_refactor 
Track Element Descriptor refactor (issue #13874)
 2021-08-29 22:38:46 +02:00
frutiemax 450bf61ee4 Part of #13874: TrackSequenceProperties, Pricing and MirrorMap renamed 2021-08-29 10:45:17 -04:00
Gymnasiast 93c656f91d
Merge remote-tracking branch 'upstream/develop' into new-save-format 2021-08-29 15:39:42 +02:00
frutiemax b3744f129f Part of #13874: Avoid copies of ted 2021-08-28 18:57:46 -04:00
frutiemax 5f438535ad Part of #13874: Gymnasiast review 2021-08-27 17:57:10 -04:00
frutiemax 9c53fe252d Part of #13874: ZehMatt review changes 2021-08-27 17:44:33 -04:00
Duncan 008f106242
Add constants for golf flags (#15072) 
* Add constants for golf flags

* Reorg SubPositionData for minigolf

* Add enum for golf states

* Add golf animation enum

* Fix names of animations

* Correct spleing

* Revert stray change
 2021-08-25 11:08:57 +01:00
frutiemax 046c060e74 Part of #13874: Replace Track Sequence properties 2021-08-22 18:01:03 -04:00
frutiemax 382315b2c3 Part of #13874: Replace block tables 2021-08-22 17:57:56 -04:00
frutiemax 780eb4f287 Part of #13874: Replace piece lengths 2021-08-22 17:53:38 -04:00
frutiemax 1bfa26e4c5 Part of #13874: replace flags table 2021-08-22 17:51:35 -04:00
frutiemax 80418efafb Part of #13874: Replace TrackCoordinates 2021-08-22 17:49:00 -04:00
spacek531 c49c6ca4a7
Rename animation vars 2021-08-21 19:23:27 +02:00
Gymnasiast ca47b31207
Merge remote-tracking branch 'upstream/develop' into new-save-format 2021-08-13 18:29:09 +02:00