Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Chat toggle button #8648

Merged
merged 10 commits into from Feb 3, 2019
Merged

Chat toggle button #8648

merged 10 commits into from Feb 3, 2019

Conversation

tomlankhorst
Copy link
Contributor

@tomlankhorst tomlankhorst commented Jan 27, 2019

So, I added this toggleable chat button for #8634.
I feel like I'm almost there, except for adding a new 'Chat' sprite.

It has a blue matte and reduced color palette because it will pop up on the blue tabs to the left.

I tried to follow the Wiki page about adding sprites but this was not very clear. Could someone please show me the way ;). Resources are added. Original SVG.

chat

Doh, I was aiming at 'Chat' but I highlighed 'Cheats'.

@tomlankhorst
Copy link
Contributor Author

tomlankhorst commented Jan 27, 2019

I'm setting up a clang-formatter githook...
https://github.com/OpenRCT2/OpenRCT2/wiki/Coding-Style#clang-format-and-git-hooks

@IntelOrca
Copy link
Contributor

I can't see anything unusual about the code, you have done it exactly like the other toolbar buttons so it should work. I can only assume that the import code is not processing your .png file correctly and losing the colour information. The offset can be easily fixed though either in the code or by adding it to the G2 json.

@Gymnasiast
Copy link
Member

Put the icon before the glyphs. There are three sets of them, but only one set of constants. It's easier to keep them at the end of G2.

@tomlankhorst
Copy link
Contributor Author

@Gymnasiast Have done that as well...
When I export from the sprite file I get an empty PNG too.

What should the format of the input PNG actually be? PNG-8/24?

@Gymnasiast
Copy link
Member

I'll look into it tonight, if you send me a reminder through Gitter at around 19:00.

@tomlankhorst
Copy link
Contributor Author

@Gymnasiast thank you!

@IntelOrca
Copy link
Contributor

IntelOrca commented Jan 28, 2019

@tomlankhorst Any PNG format should work as we use libpng to decode. It then matches the colours exactly or finds the closest possible ones to the game palette, although you can set a flag to keep the index the same if it is a 8bpp PNG which we do for font glyphs.

@Gymnasiast Gymnasiast self-assigned this Jan 28, 2019
@Gymnasiast
Copy link
Member

Gymnasiast commented Jan 28, 2019

Fixed!

leafy lake 2019-01-28 19-27-01

Gymnasiast
Gymnasiast previously approved these changes Jan 28, 2019
Copy link
Member

@Gymnasiast Gymnasiast left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Code looks reasonable to me.

@ZehMatt
Copy link
Member

ZehMatt commented Jan 28, 2019

This icon sticks out a lot, might be the brightness.

@tomlankhorst
Copy link
Contributor Author

tomlankhorst commented Jan 28, 2019

@ZehMatt Better this way? Made it a little smaller as well.
image

OpenRCT2 color table for Photoshop (ASC)

@Gymnasiast
Copy link
Member

Gymnasiast commented Jan 28, 2019

On that screenshot, it's missing some pixels. It also has a greenish hue that it doesn't have on my screenshot.

@Gymnasiast Gymnasiast dismissed their stale review January 28, 2019 22:21

PR has changed since review

@tomlankhorst
Copy link
Contributor Author

tomlankhorst commented Jan 28, 2019

GIMP to the rescue... image

It's indeed a bit greener than before, that's because I reduced the brightness and the intended balloons' shade is a little green indeed.

@Gymnasiast
Copy link
Member

Nearly there - the top right and bottom right of the rightmost speech bubble appear to be missing some pixels. Should be easy to fix.

@tomlankhorst
Copy link
Contributor Author

tomlankhorst commented Jan 29, 2019

@Gymnasiast , it seems like it does, I must admin, but this is the output of a dithered converted icon. I'll try to fix up the dithering. Some day I'll get this right.

@tomlankhorst
Copy link
Contributor Author

image
@Gymnasiast

Copy link
Member

@Gymnasiast Gymnasiast left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM. Please update the changelog (put [ci skip] in the commit title).

@tomlankhorst
Copy link
Contributor Author

@Gymnasiast didn't know about the tag.. thanks. Will do tomorrow.

[ci skip]
[ci skip]

Co-Authored-By: tomlankhorst <hello@tomlankhorst.nl>
@tomlankhorst tomlankhorst changed the title [WIP] Chat toggle button Chat toggle button Feb 3, 2019
@janisozaur janisozaur merged commit 5219481 into OpenRCT2:develop Feb 3, 2019
Broxzier added a commit that referenced this pull request Feb 6, 2019
Gymnasiast pushed a commit that referenced this pull request Feb 6, 2019
janisozaur added a commit that referenced this pull request Mar 13, 2019
- Feature: [#4418] Allow steep slopes on the side-friction roller coaster.
- Feature: [#7726] Add shortcut to advance one tick.
- Feature: [#7956, #7964] Add sprite font glyphs for Hungarian and some Czech letters.
- Feature: [#7971] Toolbox option to open custom content folder.
- Feature: [#7980] Allow data path for RCT1 to be specified by a command line argument.
- Feature: [#8073] Auto-upload minidumps to backtrace.io (optional, MSVC/Windows only)
- Feature: [#8078] Add save_park command to in-game console.
- Feature: [#8080] New console variable "current_rotation" to get or set view rotation.
- Feature: [#8098] Glyph for Russian rouble sign.
- Feature: [#8099] Add Powered Launch mode to Inverted RC (for RCT1 parity).
- Feature: [#8190] Allow building footpaths on 'corner down' terrain.
- Feature: [#8191] Allow building on-ride photos and water S-bends on the Water Coaster.
- Feature: [#8259] Add say command to in-game console.
- Feature: [#8374] Add replay system.
- Feature: [#8377] Add option to adjust amount of autosaves to keep.
- Feature: [#8458] Add sprite sorting benchmark.
- Feature: [#8583] Add boosters to water coaster.
- Feature: [#8648] Add optional chat button to top toolbar in multiplayer games.
- Feature: [#8652] Add network window including a graph for data usage visualisation.
- Feature: [#8670] Add ability to download missing objects when loading a park.
- Change: [#7961] Add new object types: station, terrain surface, and terrain edge.
- Change: [#8222] The climate setting has been moved from objective options to scenario options.
- Change: [#8718] Allow TARMAC object to be removed when running the `remove_unused_objects` command.
- Change: [#8718] No longer require the generic scenery groups and tarmac footpath to be checked when creating a scenario.
- Change: [#8734] Disable kick button in multiplayer window when unable to use it.
- Fix: [#3832] Changing the colour scheme of track pieces does not work in multiplayer.
- Fix: [#4094] Coasters with long flat-to-steep pieces offer them in diagonal mode (original bug).
- Fix: [#5684] Player list can desync between clients and server and can crash.
- Fix: [#6191] OpenRCT2 fails to run when the path has an emoji in it.
- Fix: [#7439] Placement messages have mixed strings
- Fix: [#7473] Disabling sound effects also disables "Disable audio on focus loss".
- Fix: [#7536] Android builds fail to start.
- Fix: [#7689] Deleting 0-tile maze gives a MONEY32_UNDEFINED (negative) refund.
- Fix: [#7828] Copied entrances and exits stay when demolishing ride.
- Fix: [#7945] Client IP address is logged as `(null)` in server logs.
- Fix: [#7952] Performance drop caused by code refactor.
- Fix: [#7954] Key validation fails on Windows due to non-ASCII user / player name.
- Fix: [#7975] Inspection flag not cleared for rides which are set to never be inspected (original bug).
- Fix: [#7985] Giant Screenshot ignores 'Map rendering' settings.
- Fix: [#7987] Broken track designs increase money by MONEY32_UNDEFINED.
- Fix: [#7991] Scenery and footpaths on Construction Rights tiles can be deleted using Clear Scenery.
- Fix: [#8034] Vanilla sprites are broken when making screenshots from command line.
- Fix: [#8045] Crash when switching between languages.
- Fix: [#8062] In multiplayer warnings for unstable cheats are shown when disabling them.
- Fix: [#8090] Maze designs saved incorrectly.
- Fix: [#8101] Title sequences window flashes after opening.
- Fix: [#8120] Crash trying to place peep spawn outside of map.
- Fix: [#8121] Crash Renaming park with server logging enabled.
- Fix: [#8139] Buying land costs money when the game is in "no money" mode.
- Fix: [#8141] Attempting to build entrance/exit on station 2 does not work.
- Fix: [#8142] Reliability of mazes and crooked houses can go below 100%.
- Fix: [#8187] Cannot set land ownership over ride entrances or exits in sandbox mode.
- Fix: [#8200] Incorrect behaviour when removing entrances and exits that are on the same tile.
- Fix: [#8204] Crash when tile element has no surface elements.
- Fix: [#8264] Rides and scenery placeable outside of map with ZC and Sandbox mode enabled.
- Fix: [#8335] Rides with arbitrary ride types can crash the game when they break down.
- Fix: [#8358] Infinite loop when changing vehicle count on stopped ride.
- Fix: [#8402] Crash closing a window in some cases.
- Fix: [#8431] Crash when game action logging is enabled.
- Fix: [#8433] Crash if master server response is not valid JSON.
- Fix: [#8434] Crash if curl_easy_init fails.
- Fix: [#8443] Crash when selecting the current vehicle for ride that has none available.
- Fix: [#8456] Junior booster track piece doesn't connect properly.
- Fix: [#8464] Crash on game shutdown.
- Fix: [#8469] Crash modifying colour on hacked rides.
- Fix: [#8508] Underground roto-drop is not going up.
- Fix: [#8555] Multiplayer window text limits are not computed properly.
- Fix: [#8572] Steel Twister track pieces ID 64 and 65 drawn incorrectly.
- Fix: [#8585] Part of track missing on air powered vertical coaster.
- Fix: [#8588] Guest list scrolling breaks above ~2000 guests.
- Fix: [#8591] Game loop does not run at a consistent tick rate of 40 Hz.
- Fix: [#8647] Marketing campaigns check for entry fees below £1 (original bug).
- Fix: [#8653] Crash when peeps attempt to enter a ride with no vehicles.
- Fix: [#8720] Desync due to boats colliding with ghost pieces.
- Fix: [#8739] Savegame from original game crashes when cruising through map.
- Fix: [#8742] Access violation in vehicle_update_sound_params.
- Fix: [#8804] Raising water shows money effect at the bottom rather than new height.
- Fix: [#8811] Some fields in the sv6 save file not being copied correctly.
- Fix: [#8824] Invalid read in footpath_chain_ride_queue.
- Improved: [#2940] Allow mouse-dragging to set patrol area (Singleplayer only).
- Improved: [#7730] Draw extreme vertical and lateral Gs red in the ride window's graph tab.
- Improved: [#7930] Automatically create folders for custom content.
- Improved: [#7980] Show the full path of the scenario in the scenario select window.
- Improved: [#7993] Allow assigning a keyboard shortcut for opening the tile inspector.
- Improved: [#8107] Support Discord release of RCT2.
- Improved: [#8491] Highlight entrance and exit with different colours in track design previews.
- Improved: Almost completely new Hungarian translation.
- Removed: [#7929] Support for scenario text objects.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

6 participants