1
0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-23 23:04:36 +01:00
Commit Graph

1213 Commits

Author SHA1 Message Date
Chase
d6ebeca483 Fix #19935: Part of old multiplayer name remains when entering a shorter name (#20004)
* clear _playerName

* Change _playerName to a u8string

* Explicitly set underlying string ptr on change
2023-04-26 08:34:39 +01:00
Duncan
cdccb21dd5 Refactor of colours (#19998)
* Move dropdown functions to dropdown code

* Use a map for the colour tip

* Keep dropdownidx and colour seperated

* Allow number of rows to match vanilla

* Apply review comment

* Bump network version
2023-04-22 08:58:13 +00:00
Matthias Moninger
e614584f65 Fix #19991: Crash when using cut-away view (#19968)
* Fix #19991: Crash using cut-away view

* Update changelog.txt

* Document the use of temporary paint head
2023-04-20 16:00:22 +01:00
Matthias Moninger
e88d606925 Merge pull request #19888 from ZehMatt/cleanup-paint
Refactor paint sort code
2023-04-16 17:20:43 +03:00
Rik Smeets
a31ff7e02e Add prompt before resetting shortcut keys (#19905) 2023-04-16 09:22:05 +00:00
ζeh Matt
a1c3f38469 Rename next to NextEntry 2023-04-14 03:37:26 +03:00
ζeh Matt
d35933dc9f Use ScreenCoordsXY in AttachedPaintStruct 2023-04-14 03:22:32 +03:00
ζeh Matt
fc75f8b0e9 Use ScreenCoordsXY, refactor uses 2023-04-14 03:14:37 +03:00
ζeh Matt
31e1a5dbcd Use CoordsXY for map position 2023-04-14 03:09:29 +03:00
ζeh Matt
5ea09be0f8 Rename some fields in PaintStruct 2023-04-14 03:06:53 +03:00
Gymnasiast
bb83a80eab Use dpi ref in rect and line drawing functions 2023-04-11 22:59:01 +01:00
Gymnasiast
0139c8d19e Use dpi ref in everything outside the drawing folder 2023-04-11 22:57:25 +01:00
Gymnasiast
16c5c1b752 Use dpi ref in interface folder 2023-04-11 22:57:25 +01:00
Gymnasiast
3e764677da Use dpi ref in paint folder 2023-04-11 22:57:25 +01:00
Gymnasiast
90d21dbe14 Use dpi ref in Widget.cpp 2023-04-11 22:57:25 +01:00
Gymnasiast
96d77ed8f7 Using dpi refs in most remaining window defs 2023-04-11 22:57:23 +01:00
Duncan
437329bb13 Scenario select cleanup (#19899)
* Move private functions to privat

Fix init

* Minor style cleanup

* Apply review comments

* Apply further review comments
2023-04-11 22:47:53 +01:00
Michał Janiszewski
993da08fb9 Fix #19850: Only provide default value for final arguments (#19852) 2023-04-06 15:35:02 +01:00
kyphii
39790779bb Extend color selection dropdown with more colors (#19446)
* Setup for extended palette

* Define order for color picker cells

* Init G2 Palettes in ColoursInitMaps

* Add Glass Palettes

* Use special sprite for Invisible color

* Set up new cheat for special colors

* Add glass palettes to palette_to_g1_offset

* Add entries for new colors in TranslucentWindowPalettes

* Finish implementation of special colors cheat

* Some cleanup

* New colors almost work

* Correct g2 palette loading indices

* Invisible color sprite displays properly

* Repaint works with large scenery and walls

* Prevent random shop items from overflowing to junk palettes

* More cleanup

* Fix glass palettes

* Add mapping of new colors to original colors for UI themes

* Fix junk palettes for random shop items

* Fix missing highlight color in software renderer

* Convert small scenery support flag to allow use of new colors

* Progress on displaying new colors in software renderer

* Fix invisible color scheme sprite

* Formatting cleanup

* Resolve comparison of integer expressions of different signedness

* Index g2 palette maps to fix visible chain lift

* Progress on fixing new colors in software renderer

* Fix station and support colors

* Fix dropdown selected index

* Get invisible color (mostly) working in software renderer

* Use forceBmp for palette resources

* Remove test function definition left in by mistake

* Remove some obsolete range checks for original color values

* Add changelog entry

* Reorder color dropdown based on NE user feedback

* Some cleanup

* Further cleanup

* Formatting

* Add include for GetPaletteMapIndexForColour

* Fix a couple things I broke

* Fix function placement

* Revert "Add include for GetPaletteMapIndexForColour"

This reverts commit 0af9611e6656d792adb7a36efe7dbf3387a4a759.

* Use color constants for color order list

* Make remappable colors contiguous

* turn off clang format for ordered color list

* Appease clang

* Use all colors for random shop item animation

* Improvements to palette map resources

* Fix chain lifts again + adjustments to a few colors

* Update changelog and contributors.md

* Revert changes to S4 and S6 importers which are no longer needed

* Bump network, plugin, and minimum park versions

* Revert "Progress on displaying new colors in software renderer"

This reverts commit 337602e4a7.

* Remove unnecessary comment

---------

Co-authored-by: Trevor Finney <8711258+finneyt@users.noreply.github.com>
2023-04-06 08:36:07 +01:00
Michael Steenbeek
fd80b4c822 Refactor and clean up date handling (#19666)
* Refactor and clean up date handling

* Remove gDate, remove direct access to days_in_month

* Adjust the MultiLaunch test

* Bump network version

---------

Co-authored-by: ζeh Matt <5415177+ZehMatt@users.noreply.github.com>
2023-04-02 09:25:41 +01:00
Cory Sanin
a102688f5c Fix: Chat history in wrong order, doesn't pop up 2023-03-15 09:57:05 +01:00
Cory Sanin
c9883e1553 Fix: Input text floating outside chat window 2023-03-13 16:54:28 +01:00
Michael Steenbeek
dd624f9bff Replace remaining usages of money16, money32 (#19469)
* Use money64 for ride prices and shop items

* Use money64 for park entrance fee

* Use money64 for gGuestInitialCash

* Use money64 for upkeep costs

* Use money64 for ride value

* Use money64 for marketing campaign cost

* Use money64 for object prices

* Use money64 for land prices

* Use money64 for guest expenditure

* Replace remaining occurrences of money32 with money64

* Update replays

* Bump network version

---------

Co-authored-by: duncanspumpkin <duncans_pumpkin@hotmail.co.uk>
2023-03-02 21:55:42 +00:00
Matthias Moninger
d18de99579 Merge pull request #19515 from ZehMatt/fix-large-list
Fix window scrollbar not able to navigate to the end of large lists
2023-02-28 22:34:06 +02: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
320894971f Fix window scrollbar not able to navigate to the end of large lists 2023-02-28 06:21:15 +02:00
Matthias Moninger
edde337177 Merge pull request #19465 from Gymnasiast/refactor/cmd-line-consistent
Close #19176, close #19273: Consistent “CmdLine” naming
2023-02-27 18:54:38 +02:00
ζeh Matt
7b398d89a6 Remove unused variable 2023-02-25 15:42:37 +02:00
ζeh Matt
365fcf24c3 Implement #19468 and rename functions cursor to caret 2023-02-25 15:42:37 +02:00
ζeh Matt
ec2f332b92 Fix #19445: Text not cleared using Ctrl+Backspace 2023-02-25 15:42:37 +02:00
Gymnasiast
a15f72da87 Pass DPI by ref to string drawing 2023-02-24 22:05:07 +01:00
Michael Steenbeek
be52b55980 Remove some unused stuff (#19474)
* Remove unused symbols

* Remove unused SceneryObject.cpp

* Remove GetScgWallsHeader() and GetScgPiratHeader()
2023-02-23 22:27:21 +00:00
Gymnasiast
fd4c9a7b9d Close #19176, close #19273: Consistent “CmdLine” naming 2023-02-23 00:03:30 +01:00
Silent
0763fd5a78 Fix GfxWrapString potentially corrupting the in/out buffer
Fixes a consistent assertion when displaying "Cannot start construction"
in Japanese, but it has potential fix countless other crashes
related to string wrapping/display.
2023-02-14 09:50:05 +01:00
Matthias Moninger
7b61c6352a Desnake some stuff, small string passing cleanup (#19388)
* Rename scenario_index_entry to ScenarioIndexEntry

* Desnake members of ScenarioIndexEntry

* Pass const u8string& instead of utf8 pointer
2023-02-13 20:30:16 +00:00
Duncan
d811c9a9ba Add Object Entry Manager (#19332)
* Add object entry manager

Port over wall and banner

* Port over small scenery to ObjectEntryManager

Clang format files

Actually make things safe

Fix build
2023-02-12 20:43:11 +00:00
ζeh Matt
a2a06d6dde Return const RideObjectEntry*, refactor uses and fix related access 2023-02-05 17:36:37 +02:00
Matthias Moninger
5994fe6be6 Merge pull request #19284 from ZehMatt/entityId
Refactor sprite_index to entityId for entities
2023-01-28 18:13:04 +02:00
Duncan
24581e781f Move misc ObjectEntries into Object folder (#19281)
* Move water entry

* Move FootpathEntry

* Move EntranceEntry

* Move SceneryGroupEntry
2023-01-27 19:44:58 +00:00
ζeh Matt
2f8e208a9d Refactor sprite_index to Id 2023-01-27 19:21:57 +02:00
Josh Trzebiatowski
258b569deb Allow filtering in Scenery window (#19272)
* WIP: scenery searching

* refactor snake case

* actually start filtering scenery

* prepare for merge from develop

* use ObjectManager to get scenery info

* clear selected scenery when it is filtered out

* Clear tool when no scenery is selected

* updating changelog

* fix clang formatting issues
2023-01-26 21:40:02 +00:00
Duncan
ead13c44b8 Split off LargeSceneryEntry (#19277) 2023-01-26 18:44:42 +00:00
Duncan
ef27814ca5 Split off scenery entries (#19133)
BannerSceneryEntry, WallSceneryEntry footpathItemEntry
2023-01-25 19:56:29 +00:00
Duncan
d51b4d3191 Split off SmallSceneryEntry into dedicated file (#19115)
* Split off small scenery entry to new file

* Move flags to new file
2023-01-25 19:25:33 +00:00
Michael Steenbeek
ba39d7be5d Merge pull request #19241 from Gymnasiast/refactor/more-fields
Desnake TileElement fields, pad_ and byte_
2023-01-21 22:38:07 +01:00
Duncan
e09f27df3c Rename snake_case Class names (Remaining Bits) (#19237)
* Rename snake_case Class names

* Clang format

* Fix build issues
2023-01-21 19:57:17 +00:00
Gymnasiast
3dd895abf7 Rename pad_ to Pad 2023-01-21 16:39:35 +01:00
Duncan
7d08372c80 Remove snake_case from Class names OpenRCT2/Ride*-S* (#19232)
* Remove snake_case from Class names OpenRCT2/Ride*-S*

* Clang format
2023-01-20 20:58:55 +00:00
Duncan
9deed6d98a Replace snakes in Class names OpenRCT2/N*-P* (#19227)
* Replace snakes in Class names OpenRCT2/N*-P*

* Rename PODDate (and TimeOfDay for good measure)

Co-authored-by: Gymnasiast <m.o.steenbeek@gmail.com>
2023-01-20 05:24:44 +00:00
Duncan
23b6d1840e Rename classes with snakes OpenRCT2/G*-M* 2023-01-19 15:13:23 +00:00