Alerts System and UI (#2529)

Browse Source

* #272 add bordered panel for effects bar

* #272 avoid mouse overlapping tooltip when near edges,
change tooltip colors to match mockups

* #272 WIP defining status effect states as YML and
sending them as encoded integers

* #272 refactor to use new alert system

* #272 refactor to use new alert system

* #272 fix various bugs with new alert system and update
alerts to have color

* #272 WIP

* #272 rename status effects to alerts

* #272 WIP reworking alert internals to avoid code dup
and eliminate enum

* #272 refactor alerts to use
categories and fix various bugs

* #272 more alert bugfixes

* #272 alert ordering

* #272 callback-based approach for alert clicks

* #272 add debug commands for alerts

* #272 utilize new GridContainer capabilities for sizing of alerts tab

* #272 scale alerts height based on
window size

* #272 fix tooltip flicker

* #272 transparent alert panel

* #272 adjust styles to match injazz mockups more, add cooldown info in tooltip

* #272 adjust styles to match injazz mockups more, add cooldown info in tooltip

* #272 alert prototype tests

* #272 alert manager tests

* #272 alert order tests

* #272 simple unit test for alerts component

* #272 integration test for alerts

* #272 rework alerts to use enums instead
of id / category

* #272 various cleanups for PR

* #272 use byte for more compact alert messages

* #272 rename StatusEffects folder to Alerts,
add missing NetSerializable

...

This commit is contained in:

chairbender

2020-11-09 20:22:19 -08:00

committed by GitHub

parent c82199610d

commit 5f788c3318

86 changed files with 2305 additions and 598 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

0

Resources/Textures/Interface/StatusEffects/Buckle/buckled.png → Resources/Textures/Interface/Alerts/Buckle/buckled.png

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 520 B After Width:  |  Height:  |  Size: 520 B

0

Resources/Textures/Interface/StatusEffects/Fire/fire.png → Resources/Textures/Interface/Alerts/Fire/fire.png

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 414 B After Width:  |  Height:  |  Size: 414 B

0

Resources/Textures/Interface/StatusEffects/Handcuffed/Handcuffed.png → Resources/Textures/Interface/Alerts/Handcuffed/Handcuffed.png

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 3.2 KiB After Width:  |  Height:  |  Size: 3.2 KiB

0

Resources/Textures/Interface/StatusEffects/Human/human0.png → Resources/Textures/Interface/Alerts/Human/human0.png

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 233 B After Width:  |  Height:  |  Size: 233 B

0

Resources/Textures/Interface/StatusEffects/Human/human1.png → Resources/Textures/Interface/Alerts/Human/human1.png

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 214 B After Width:  |  Height:  |  Size: 214 B

0

Resources/Textures/Interface/StatusEffects/Human/human2.png → Resources/Textures/Interface/Alerts/Human/human2.png

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 214 B After Width:  |  Height:  |  Size: 214 B

0

Resources/Textures/Interface/StatusEffects/Human/human3.png → Resources/Textures/Interface/Alerts/Human/human3.png

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 214 B After Width:  |  Height:  |  Size: 214 B

0

Resources/Textures/Interface/StatusEffects/Human/human4.png → Resources/Textures/Interface/Alerts/Human/human4.png

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 214 B After Width:  |  Height:  |  Size: 214 B

0

Resources/Textures/Interface/StatusEffects/Human/human5.png → Resources/Textures/Interface/Alerts/Human/human5.png

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 214 B After Width:  |  Height:  |  Size: 214 B

0

Resources/Textures/Interface/StatusEffects/Human/human6.png → Resources/Textures/Interface/Alerts/Human/human6.png

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 214 B After Width:  |  Height:  |  Size: 214 B

0

Resources/Textures/Interface/StatusEffects/Human/human7.png → Resources/Textures/Interface/Alerts/Human/human7.png

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 240 B After Width:  |  Height:  |  Size: 240 B

0

Resources/Textures/Interface/StatusEffects/Human/humancrit-0.png → Resources/Textures/Interface/Alerts/Human/humancrit-0.png

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 252 B After Width:  |  Height:  |  Size: 252 B

0

Resources/Textures/Interface/StatusEffects/Human/humancrit-1.png → Resources/Textures/Interface/Alerts/Human/humancrit-1.png

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 252 B After Width:  |  Height:  |  Size: 252 B

0

Resources/Textures/Interface/StatusEffects/Human/humandead.png → Resources/Textures/Interface/Alerts/Human/humandead.png

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 207 B After Width:  |  Height:  |  Size: 207 B

0

Resources/Textures/Interface/StatusEffects/Hunger/Overfed.png → Resources/Textures/Interface/Alerts/Hunger/Overfed.png

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 271 B After Width:  |  Height:  |  Size: 271 B

0

Resources/Textures/Interface/StatusEffects/Hunger/Peckish.png → Resources/Textures/Interface/Alerts/Hunger/Peckish.png

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 271 B After Width:  |  Height:  |  Size: 271 B

0

Resources/Textures/Interface/StatusEffects/Hunger/Starving.png → Resources/Textures/Interface/Alerts/Hunger/Starving.png

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 271 B After Width:  |  Height:  |  Size: 271 B

0

Resources/Textures/Interface/StatusEffects/Pressure/highpressure1.png → Resources/Textures/Interface/Alerts/Pressure/highpressure1.png

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 591 B After Width:  |  Height:  |  Size: 591 B

0

Resources/Textures/Interface/StatusEffects/Pressure/highpressure2.png → Resources/Textures/Interface/Alerts/Pressure/highpressure2.png

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 578 B After Width:  |  Height:  |  Size: 578 B

0

Resources/Textures/Interface/StatusEffects/Pressure/lowpressure1.png → Resources/Textures/Interface/Alerts/Pressure/lowpressure1.png

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 601 B After Width:  |  Height:  |  Size: 601 B

0

Resources/Textures/Interface/StatusEffects/Pressure/lowpressure2.png → Resources/Textures/Interface/Alerts/Pressure/lowpressure2.png

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 506 B After Width:  |  Height:  |  Size: 506 B

0

Resources/Textures/Interface/StatusEffects/Pressure/meta.json → Resources/Textures/Interface/Alerts/Pressure/meta.json

0

Resources/Textures/Interface/StatusEffects/Pull/pulled.png → Resources/Textures/Interface/Alerts/Pull/pulled.png

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 3.9 KiB After Width:  |  Height:  |  Size: 3.9 KiB

0

Resources/Textures/Interface/StatusEffects/Pull/pulling.png → Resources/Textures/Interface/Alerts/Pull/pulling.png

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 525 B After Width:  |  Height:  |  Size: 525 B

0

Resources/Textures/Interface/StatusEffects/Temperature/cold1.png → Resources/Textures/Interface/Alerts/Temperature/cold1.png

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 396 B After Width:  |  Height:  |  Size: 396 B

0

Resources/Textures/Interface/StatusEffects/Temperature/cold2.png → Resources/Textures/Interface/Alerts/Temperature/cold2.png

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 388 B After Width:  |  Height:  |  Size: 388 B

0

Resources/Textures/Interface/StatusEffects/Temperature/cold3.png → Resources/Textures/Interface/Alerts/Temperature/cold3.png

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 3.2 KiB After Width:  |  Height:  |  Size: 3.2 KiB

0

Resources/Textures/Interface/StatusEffects/Temperature/hot1.png → Resources/Textures/Interface/Alerts/Temperature/hot1.png

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 365 B After Width:  |  Height:  |  Size: 365 B

0

Resources/Textures/Interface/StatusEffects/Temperature/hot2.png → Resources/Textures/Interface/Alerts/Temperature/hot2.png

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 333 B After Width:  |  Height:  |  Size: 333 B

0

Resources/Textures/Interface/StatusEffects/Temperature/hot3.png → Resources/Textures/Interface/Alerts/Temperature/hot3.png

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 3.0 KiB After Width:  |  Height:  |  Size: 3.0 KiB

0

Resources/Textures/Interface/StatusEffects/Thirst/OverHydrated.png → Resources/Textures/Interface/Alerts/Thirst/OverHydrated.png

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 1.9 KiB After Width:  |  Height:  |  Size: 1.9 KiB

0

Resources/Textures/Interface/StatusEffects/Thirst/Parched.png → Resources/Textures/Interface/Alerts/Thirst/Parched.png

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 2.4 KiB After Width:  |  Height:  |  Size: 2.4 KiB

0

Resources/Textures/Interface/StatusEffects/Thirst/Thirsty.png → Resources/Textures/Interface/Alerts/Thirst/Thirsty.png

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 2.4 KiB After Width:  |  Height:  |  Size: 2.4 KiB

0

Resources/Textures/Interface/StatusEffects/Weightless/weightless.png → Resources/Textures/Interface/Alerts/Weightless/weightless.png

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 786 B After Width:  |  Height:  |  Size: 786 B

BIN

Resources/Textures/Interface/Nano/tooltip.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 133 B After Width:  |  Height:  |  Size: 213 B

BIN

Resources/Textures/Interface/Nano/transparent_window_background_bordered.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 144 B

BIN

Resources/Textures/Interface/Nano/window_background_bordered.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 213 B