ζeh Matt
3142ed7058
Merge remote-tracking branch 'upstream/develop' into new-save-format
2021-10-20 20:47:31 +03:00
ζeh Matt
60422960a3
Merge pull request #15616 from ZehMatt/fix-15006
...
Fix #15006 : Prevent allocating empty texture atlases
2021-10-20 10:46:57 -07:00
ζeh Matt
ea0b8840ac
Merge pull request #15610 from ZehMatt/refactor/stringvariant
...
Replace StringVariant with std::variant
2021-10-20 10:46:42 -07:00
Michael Steenbeek
62a9096079
Fix #15466 : Crash when opening dropdown with 0 rows
2021-10-20 18:50:21 +02:00
Michael Steenbeek
b762cb26ed
Turn some guest functions into methods
2021-10-20 18:33:14 +02:00
ζeh Matt
7bb8a7b838
Merge remote-tracking branch 'upstream/develop' into new-save-format
2021-10-20 19:22:12 +03:00
ζeh Matt
428eed469a
Merge pull request #15611 from ZehMatt/backport/imagetable
...
NSF Backport ImageTable changes
2021-10-20 09:19:32 -07:00
ζeh Matt
6a219b2481
Fix #15006 : Prevent allocating empty texture atlases
2021-10-20 19:02:15 +03:00
Michael Steenbeek
578d8ce247
Fix #15612 : Crash in WallCheckObstruction()
2021-10-20 14:15:35 +00:00
ζeh Matt
6f28f3e516
Backport ImageTable changes
...
Co-authored-by: Ted John <ted@brambles.org >
2021-10-20 16:50:38 +03:00
ζeh Matt
3325898e25
Apply review suggestions
2021-10-20 16:37:32 +03:00
ζeh Matt
4d72c29ca3
Specify underlying type for rct_string_id
2021-10-20 16:35:58 +03:00
ζeh Matt
5bf3513156
Default initialize ErrorTitle and ErrorMessage with STR_NONE
2021-10-20 16:35:58 +03:00
ζeh Matt
7fc49fca39
Replace StringVariant with std::variant
2021-10-20 16:35:58 +03:00
ζeh Matt
a98caef48a
Merge remote-tracking branch 'upstream/develop' into new-save-format
2021-10-20 16:35:05 +03:00
ζeh Matt
27939c2417
Merge pull request #15587 from ZehMatt/refactor/trackdesignaction-result
...
Refactor result passing of TrackDesignAction
2021-10-20 06:34:23 -07:00
seanmajorpayne
f6cb144f8c
Fix #15322 : Circus Music is Not Playing (Full Fix)
2021-10-20 13:11:06 +00:00
ζeh Matt
8e06d84a09
Refactor result passing of TrackDesignAction
2021-10-20 16:08:21 +03:00
ζeh Matt
e06f9c3ee7
Refactor result passing of TrackPlaceAction
2021-10-20 14:15:24 +02:00
ζeh Matt
89bbe47211
Merge remote-tracking branch 'upstream/develop' into new-save-format
2021-10-20 00:09:17 +03:00
ζeh Matt
2d78a5efc3
Move GameActionResult into its own unit ( #15588 )
2021-10-19 17:50:24 -03:00
Hielke Morsink
64d8b1bd69
Fix mapgen clang-formatting
2021-10-19 22:27:41 +02:00
Hielke Morsink
7e2e6e2b2f
Merge branch 'develop' into new-save-format
2021-10-19 22:26:08 +02:00
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
