1
0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-22 14:24:33 +01:00
Commit Graph

165 Commits

Author SHA1 Message Date
Aaron van Geffen
fcbe1aaf92 Display height units in preferred length measurement unit 2024-09-11 17:08:20 +02:00
Aaron van Geffen
cd5e55a1ba Replace custom constants with map constants 2024-09-10 22:24:12 +02:00
Aaron van Geffen
56ef87cb54 Remove terrain height setting map from GenerateMap 2024-09-10 22:19:15 +02:00
Aaron van Geffen
1ad9bc4786 Change terrain widget order once more 2024-09-10 22:09:49 +02:00
Aaron van Geffen
23edd3c0d0 Deduplicate some code shared between blank and simplex generators 2024-09-10 21:35:46 +02:00
Aaron van Geffen
e10e554872 Change icons for terrain tab and forests tab 2024-09-10 20:57:03 +02:00
Aaron van Geffen
df5dcfce48 Add settings for number of trees, min/max tree altitude 2024-09-10 20:45:38 +02:00
Aaron van Geffen
6f83e44a82 Add custom window captions for each page 2024-09-10 20:10:58 +02:00
Aaron van Geffen
a2b572b6f3 Apply texture preferences to height map images; blank maps 2024-09-10 19:39:21 +02:00
Aaron van Geffen
c5b8b91b17 Move forests tab to the end 2024-09-10 19:19:15 +02:00
Aaron van Geffen
fc5ad2a663 Adjust window dimensions, resize and move widgets 2024-09-10 19:13:37 +02:00
Aaron van Geffen
6d6dc95a91 Consolitate simplex and heightmap settings in generator tab 2024-09-10 17:54:25 +02:00
Aaron van Geffen
457a923178 Move smooth tile edges option to terrain tab, apply to all generators 2024-09-10 15:27:15 +02:00
Aaron van Geffen
eb5471346a Unify min/max land height settings in terrain tab 2024-09-10 15:08:57 +02:00
Aaron van Geffen
0c4429e60f Rename baseHeight, waterLevel, landTexture, edgeTexture settings 2024-09-10 14:56:54 +02:00
Aaron van Geffen
e2d05642ae Unify low/high parameters using kMaximumLandHeight 2024-09-10 14:34:46 +02:00
Aaron van Geffen
b434e1bc35 Clarify height map parameters and integrate into MapGenSettings 2024-09-10 14:13:31 +02:00
Aaron van Geffen
6398c066a7 Unify generator buttons for all tabs 2024-09-10 13:51:14 +02:00
Aaron van Geffen
710fbfbf9a Make beaches around water bodies a general option for all generators 2024-09-10 12:41:28 +02:00
Aaron van Geffen
44268fd758 Make tree placement available to all generator algorithms 2024-09-10 12:17:56 +02:00
Aaron van Geffen
6545ab33f2 Unify interface for calling internal map generator 2024-09-10 12:14:01 +02:00
Aaron van Geffen
403495cacf Rename internal map generator functions 2024-09-10 11:21:09 +02:00
Aaron van Geffen
0607f55f14 Consolidate terrain and water settings in two new dedicated tabs 2024-09-09 20:17:33 +02:00
Aaron van Geffen
0c9c79d186 ChangeMapSize: use templated std::clamp and drop static casts 2024-09-08 22:44:27 +02:00
Aaron van Geffen
848b328a82 Use MapGenSettings struct to store settings in MapGen window 2024-09-08 22:43:03 +02:00
Aaron van Geffen
b971d1596e Indent window widget definitions (#22700)
* Indent definitions in About, AssetPacks windows

* Indent definitions in Banner, Changelog, CustomCurrency windows

* Indent DebugPaint, DemolishRidePrompt windows

* Indent EditorBottomToolbar, EditorInventionsList

* Indent EditorObjectiveOptions, EditorScenarioOptions

* Indent Finances

* Indent Footpath

* Indent GameBottomToolbar

* Indent Guest window

* Indent GuestList, InstallTrack windows

* Indent Land, LandRights windows

* Indent LoadSave, Main, MapGen, MapTooltip windows

* Indent MazeConstruction

* Indent Multiplayer

* Indent NetworkStatus

* Indent NewCampaign

* Indent NewRide window

* Indent News window

* Indent NewsOptions window

* Indent ObjectLoadError window

* Indent Options window

* Indent Park window

* Indent PatrolArea window

* Indent Player window

* Indent RefurbishRidePrompt window

* Indent Research window

* Indent Ride window

* Indent RideConstruction

* Indent RideList

* Indent SavePrompt

* Indent ScenarioSelect widgets

* Indent scenario window

* Indent scenery scatter window defs

* Indent server list window

* Indent server start window§

* Indent ShortcutKeys window

* Indent Sign window

* Indent Staff window

* Indent StaffFirePrompt window

* Indent StaffList window defs

* Indent Themes window defs

* Indent TileInspector window defs

* Indent TitleExit, TitleMenu, TitleOptions, Tooltip windows

* Indent TrackDesignManage window defs

* Indent TrackDesignPlace defs

* Indent TrackList def

* Indent Transparency window defs

* Indent ViewClipping window defs

* Indent Viewport window defs

* Indent Water window defs
2024-09-04 21:11:26 +02:00
Greg
dae5b00f05 Close #22509: Refactor SPR_NONE to ImageIndex (#22517)
* ImageIndex typedef moved from ImageId.hpp to new file ImageIndexType.h.

* SPR_NONE redefined as ImageIndex type in ImageIndexType.h.

* SPR_NONE renamed to kSpriteIdNull

* Remove casts and enum all sprites as ImageIndex

* Remove sprites.h include from LandTool.h, RideData.h

* Ensure all RTD headers include sprites.h

---------

Co-authored-by: Aaron van Geffen <aaron@aaronweb.net>
2024-08-11 09:58:28 +00:00
Aaron van Geffen
67fa13f4ac Move window shim definitions into Widget.h (#22412)
* Move window shim definitions into Widget.h

* Remove unnecessary TileInspectorGlobals.h include from Window.h

* Remove Ride.h include from Window.h
2024-07-29 22:31:57 +02:00
Aaron van Geffen
3d5c19de08 Drop Localisation.h include where not required 2024-07-13 13:33:32 +02:00
Gymnasiast
8a181b5513 Split colours and colour flags 2024-05-26 12:35:40 +02:00
Michał Janiszewski
24a2db9fc9 Remove <algorithm> include from Location.hpp (#21993)
See #21947 for methodology

528-372=156 `#include <algorithm>`s fewer
2024-05-09 11:54:40 +00:00
Michał Janiszewski
7b12667ddb Reduce <algorithm> include (#21947) 2024-05-01 13:47:27 +02:00
mrmbernardi
f4cebb11df Speed up TerrainSurfaceObject::GetImageId() 2024-04-26 09:52:19 +02:00
Michał Janiszewski
b64ec76c95 Fix #21787: Map generator heightmap should respect increased height limits (#21798) 2024-04-15 15:19:18 +00:00
Claudio Tiecher
a94e6c54d8 Part of #21421: replace define with constexpr (#21679) 2024-04-01 07:00:32 -03:00
Claudio Tiecher
5d2ecf71e5 Part of #21421: apply clang-formatting 2024-03-25 16:46:44 +01:00
Claudio Tiecher
ffb8b4d44b Part of #21421: Refactor MAXIMUM_MAP_SIZE_TECHNICAL 2024-03-25 16:17:32 +01:00
Claudio Tiecher
ef81a6376e Part of #21421: Refactor MINIMUM_MAP_SIZE_TECHNICAL 2024-03-25 16:17:32 +01:00
CoryY
3f81a491b0 Close #21569: Remove 'Window' from Window Open function names (#21613)
* Close #21569: Remove 'Window' from Window Open function names

Windows are all under the OpenRCT2::Ui::Windows namespace. As such, "Window" is removed from the Open functions names.

* Update Contributors.md

* Fix formatting TrackMangeOpen

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

* Fix formatting TrackPlaceOpen

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

---------

Co-authored-by: Tulio Leao <tupaschoal@gmail.com>
2024-03-17 06:37:46 +00:00
Harry Hopkinson
78d95fc0bd Pass DrawPixelInfo by reference (#21563) 2024-03-10 12:00:08 -03:00
Duncan
7a60e7f2e0 OpenRCT2::Ui::Windows namespace for OpenRCT2 Ui Windows (#21559)
* Move all the windows into OpenRCT2::Ui::Windows namespace

* Fix missing symbol

* Clang format

* Call the correct FormatStringID
2024-03-10 13:52:35 +00:00
Duncan
3146d463bd Move Ui header items to OpenRCT2::Ui (#21546)
* Move ui definitions to ui project

* Enforce coding style

* Apply clang format

* Add clang tidy ignore

* Increase compiler happiness
2024-03-09 14:15:45 +00:00
Harry Hopkinson
14f0479c94 Refactor constants/macros (#21483)
* Refactor constants in AudioMixer.h

* Refactor constants in Map.h

* Rename kMinimumLandHeight_BIG to kMinimumLandZ
2024-03-01 20:23:29 +00:00
James103
1d8dc111f1 Replace 2023 with 2024 in copyright headers (#21139)
Replace all instances of the year 2023 with 2024 in all copyright headers
2024-01-01 12:52:28 +01:00
Aaron van Geffen
d425e0a8bb Remove const qualifier from constexpr statements 2023-06-24 11:45:26 +02:00
Michael Steenbeek
5e495d63c7 Close #15660: Allow showing window buttons on the left (#20176) 2023-05-19 10:17:38 +02:00
Gymnasiast
9c2d5b9fef Make GfxDrawSprite() take reference 2023-04-11 22:53:30 +01:00
Michael Steenbeek
2a8872018b Close #13780: Refactor MapGen to class (#19477) 2023-03-01 08:26:30 +00:00
Matthias Moninger
59875eb409 Merge pull request #19480 from Gymnasiast/refactor/dpi-string
Pass DPI by ref to string drawing
2023-02-28 22:27:51 +02:00
ζeh Matt
ec2f332b92 Fix #19445: Text not cleared using Ctrl+Backspace 2023-02-25 15:42:37 +02:00