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

22435 Commits

Author SHA1 Message Date
Hielke Morsink 557d4119df
Merge pull request #15599 2021-10-19 22:13:23 +02:00
Hielke Morsink edde5096db
Use correct size for monorail_cycles_track_pieces_flat 2021-10-19 21:54:02 +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
Duncan fe46a2cf09
Fix Custom Currency window (#15596) 
* Fix custom currency window exchange rate

This was using the wrong size type for the money

* Change name of string id

This was being used by two windows and should be made generic
 2021-10-17 14:56:11 +01:00
Gymnasiast 0d264479de
Split out min/max cars per train 2021-10-17 14:29:11 +02:00
Gymnasiast 4890903241
Fix accidental revert of widget changes 2021-10-17 13:44:10 +02:00
Hielke Morsink 2ad0ace1cc
Merge branch 'develop' into new-save-format 2021-10-17 13:14:25 +02:00
Gymnasiast 0b159a0712
Update to objects release v1.2.2 2021-10-17 13:07:56 +02:00
Gymnasiast f03de84116
Add support for “no queue banner” flag 2021-10-17 12:34:54 +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
Hielke Morsink c01aedf32e
Merge pull request #15578 2021-10-16 23:28:02 +02:00
Hielke Morsink aff3b41feb
Refactor research status drawing code 2021-10-16 19:32:54 +02:00
ζeh Matt 50cd5dbb75
Merge pull request #15582 from Basssiiie/plugin-fix-litter 
Plugin API: Fix being unable to read litter information
 2021-10-16 08:10:28 -07:00
ζeh Matt f1875f9518
Merge remote-tracking branch 'upstream/develop' into new-save-format 2021-10-16 16:50:16 +03:00
Bas 8682a8677e Fix unable to read litter information in plugin api 2021-10-16 15:38:52 +02:00
Michael Steenbeek c04249f208
Merge pull request #15563 from ZehMatt/backport/trackdesign 
Backport TrackDesign changes
 2021-10-15 21:31:19 +02:00
Michael Steenbeek 0b6c6bb22a
Merge pull request #15490 from Broxzier/bugfix/invalid-clearance-surfaces 
Fix: Surface slopes edited by TI have invalid clearance
 2021-10-15 19:55:50 +02:00
Michael Steenbeek 7da85c9925
Merge pull request #15581 from Gymnasiast/refactor/research_remove 
Make research_remove take const ref
 2021-10-15 17:18:25 +02:00
Gymnasiast eb14c426fd
Rename research_remove() to ResearchRemove() 2021-10-15 17:01:04 +02:00
Gymnasiast 5cf4a53b66
Make research_remove take const ref 2021-10-15 16:21:14 +02:00
duncanspumpkin 4a179cbbea Merge branch 'develop' into HEAD 2021-10-15 10:42:33 +01:00
hjort96 eba2041aaa
Close #13791: Refactor window to class Options (#15558) 
* Create class OptionsWindow. Moving functions to class.

* Move functions to class OptionsWindow

* Fix coding style

Co-authored-by: hjort96 <jonathan.hjorth96@hotmail.com>
 2021-10-15 10:41:30 +01:00
Sijmen 83a3da0a28
Refactor window_dropdown_paint (Part of #12098) (#15574) 
* Refactor window_dropdown_paint

- Use ScreenRect (#12098) and ScreenCoordsXY
- Move variables to a more local scope, with the appropriate types
- Reduce nesting in if statements

* Apply suggestions from code review

Co-authored-by: Tulio Leao <tupaschoal@gmail.com>

* Combine all screenCoords calculations in window_dropdown_paint

* Remove brackets from cellCoords calculation

Co-authored-by: Tulio Leao <tupaschoal@gmail.com>
 2021-10-14 20:46:45 -03:00
ζeh Matt 7f3dc5c001
Fix fallback for missing path objects 2021-10-15 01:12:38 +03:00
Hielke Morsink c2d3ca5f85
Automatically deduce std::array types 
This also improves formatting of some arrays with weird or no indention.
 2021-10-14 23:27:28 +02:00
ζeh Matt 57ec8424c9
Merge remote-tracking branch 'upstream/develop' into new-save-format 2021-10-14 19:13:35 +03:00
ζeh Matt 19464c6e17
Merge pull request #15566 from ZehMatt/fix-litter-underflow 
Fix #15567: Litter age underflow
 2021-10-14 09:11:22 -07:00
duncanspumpkin 1ff0929c91 Merge branch 'develop' into HEAD 2021-10-14 16:56:50 +01:00
Duncan dc6a8a6235
Refactor ObjectLoadError to class (#15573) 
* Move into class

* Refactor names and const

* Apply review comments
 2021-10-14 16:53:48 +01:00
Makke94 780ebea3f0
Refactor TrackList Window into class (#13812) (#15533) 
* Close #13812: Refactor window to class: TrackList

* Close #13812: Refactor window to class: TrackList

* Remove misplaced include

* Refactor to CamelCase

* Remove forward declaration

* Fix unsafe string_view operation

* Access local widgets insted of global

* Override correct function

Co-authored-by: Makke <markuswetterberg1@gmail.com>
 2021-10-14 15:35:40 +01:00
seanmajorpayne 04004d9b8c
Fix #15377: Station Hover doesn't show entrance/exit ghost (#15523) 
Fix #15377: Station Hover doesn't show entrance/exit ghost

Replacing tileElement->AsTrack() with trackElement
Changing const auto* to TrackElement*
Replacing trackElement with auto
Implementing ZehMatt's Feedback
Update changelog.txt
 2021-10-14 17:01:47 +03:00
ζeh Matt e1fb987c12
Replace loop with count_if 2021-10-14 16:33:06 +03:00
ζeh Matt f701d2ceb5
Make EntityList const correct 2021-10-14 16:31:37 +03:00
Hielke Morsink cac2708066
Add changelog entry 2021-10-13 23:44:17 +02:00
Hielke Morsink ea4c21522b
Increment network version 2021-10-13 23:42:28 +02:00
Hielke Morsink f09006b6dd
Do not change clearance height when toggling slope 2021-10-13 23:41:10 +02:00
Hielke Morsink a3641aa102
Fix: Surface slopes edited by TI have invalid clearance 2021-10-13 23:40:47 +02:00
ζeh Matt f2bfec977f
Update changelog.txt 2021-10-13 21:35:21 +03:00
ζeh Matt ba96d6a7fd
Update replays 2021-10-12 21:44:30 +03:00
ζeh Matt f2372337bf
Bump up network version 2021-10-12 21:36:13 +03:00
ζeh Matt c2d9d727d9
Fix #15566: Litter age underflow 2021-10-12 21:27:08 +03:00
ζeh Matt b4cd8e4628
Fix #15560: Memory leak due to OpenGL Renderer not releasing a texture 2021-10-11 21:01:11 +02:00
ζeh Matt 0ef4ed35e9
Fix scenery being disabled, footpath railings don't exist in develop 2021-10-11 20:28:13 +03:00
ζeh Matt d5bac47834
Bump up network version 2021-10-11 20:28:13 +03:00
ζeh Matt 6f8e017a32
Backport track design changes 
Co-authored-by: Ted John <ted@brambles.org>
 2021-10-11 20:28:13 +03:00
Michael Steenbeek 6ea0d8639d
Merge pull request #15552 from CookiePLMonster/fix-15227 
Fix Object Selection not tearing down objects properly
 2021-10-11 09:30:33 +02:00
Adam c812b696bd
Fix #14741: crash on macOS exit (#15550) 2021-10-10 22:01:18 +01:00
duncanspumpkin 1baf593b23 Merge branch 'develop' into HEAD 2021-10-10 15:34:56 +01:00
Duncan 961d51eae4
Fix hovering on scenery window showing incorrect hover for 1 tick 
The scenery window will periodically reset the hover selection so that when you move the cursor out of the window it correctly switches to the actual selection. This leads to the price and description resetting for a singular tick which looks a bit odd and unexpected. To fix this instead when it tries to reset it first checks to see if the cursor is still over the hover selection and if it is does not reset the selection.
 2021-10-10 12:17:52 +02:00
Duncan 5ee78213b2
Port over research == operator from NSF 2021-10-10 12:09:26 +02:00