Skip to content

Commit

Permalink
Merge branch 'damage-application'
Browse files Browse the repository at this point in the history
  • Loading branch information
Eranziel committed Nov 9, 2024
2 parents d8df95b + 101f6ab commit 74e1cc0
Show file tree
Hide file tree
Showing 74 changed files with 4,720 additions and 742 deletions.
27 changes: 20 additions & 7 deletions public/assets/icons/_ATTRIBUTION.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,23 @@
# System Icons

Unless otherwise stated below, all of the icons distributed with the system (located in [`public/assets/icons`](./) and [`public/assets/faction-logos`](../faction-logos/)) are originally licensed from [Comp/Con](https://github.com/massif-press/compcon) and distributed under the [same license as the code](/LICENSE) in this repository.

Some of the system icons in [`public/assets/icons`](./) (and their corresponding white versions in [`public/assets/icons/white`](./white/)) are derived from MDI Icons, acquired under the Apache 2.0 license.

- [`cover_hard.svg`](./cover_hard.svg) - directly from [MDI Icon `shield`](https://pictogrammers.com/library/mdi/icon/shield/), edited for consistent size with the other SVGs.
- [`cover_soft.svg`](./cover_soft.svg) - directly from [MDI Icon `shield-half-full`](https://pictogrammers.com/library/mdi/icon/shield-half-full/), edited for consistent size with the other SVGs.
- [`shield_outline.svg`](./shield_outline.svg) - directly from [MDI Icon `shield-outline`](https://pictogrammers.com/library/mdi/icon/shield-outline/), edited for consistent size with the other SVGs.
- [`resistance_burn.svg`](./resistance_burn.svg), [`resistance_energy.svg`](./resistance_energy.svg), [`resistance_explosive.svg`](./resistance_explosive.svg), [`resistance_heat.svg`](./resistance_heat.svg), and [`resistance_kinetic.svg`](./resistance_kinetic.svg) - derived from [MDI Icon `shield-outline`](https://pictogrammers.com/library/mdi/icon/shield-outline/).

Other specific image attributions:

- [`d20-framed.svg`](./d20-framed.svg) and [`macro-icons/d20-framed.svg`](./macro-icons/d20-framed.svg) is derived from the [Font Awesome `dice-d20` icon](https://fontawesome.com/icons/dice-d20?style=solid), used under the [CC BY 4.0 license](https://fontawesome.com/license/free). Original icon is copyright 2020 Font Awesome.
- [`status_intangible.svg`](./status_intangible.svg) by @lostdeviljho on Discord, [CC BY 4.0 license](https://fontawesome.com/license/free).
- [`horizon.svg`](../faction-logos/horizon.svg) by @lostdeviljho on Discord, [CC BY 4.0 license](https://fontawesome.com/license/free)
- [`ra.svg`](../faction-logos/ra.svg) by @rishenko on Discord, [CC BY 4.0 license](https://fontawesome.com/license/free)

# Alternate Status Icon Sets

The various [alternate status icon sets](public/assets/icons/alt-status) are used under the [CC BY 4.0 license](https://fontawesome.com/license/free). They are originally the work of Cancermantis, Hayley, and Tommy from the PilotNET Discord server. Some (noted below) are derived from [Game-icons.net](https://game-icons.net/), also used under the [CC BY 4.0 license](https://fontawesome.com/license/free).

- [`cancercondstat`](alt-status/cancercondstat) - by @cancermantis on Discord, [CC BY 4.0 license](https://fontawesome.com/license/free).
Expand All @@ -7,10 +27,3 @@ The various [alternate status icon sets](public/assets/icons/alt-status) are use
- [`hayleypc`](alt-status/hayleypc) - by @Hayley#8448 on Discord, some derived from images sourced from [Game-icons.net](https://game-icons.net/). [CC BY 4.0 license](https://fontawesome.com/license/free).
- [`hayleyutil`](alt-status/hayleyutil) - by @Hayley#8448 on Discord, some derived from images sourced from [Game-icons.net](https://game-icons.net/). [CC BY 4.0 license](https://fontawesome.com/license/free).
- [`tommystat`](alt-status/tommystat) - by @tommy_dude on Discord, [CC BY 4.0 license](https://fontawesome.com/license/free).

Specific image attributions:

- [`d20-framed.svg`](d20-framed.svg) is derived from a [Font Awesome icon](https://fontawesome.com/icons/dice-d20?style=solid), used under the [CC BY 4.0 license](https://fontawesome.com/license/free). Original icon is copyright 2020 Font Awesome.
- [`status_intangible.svg`](status_intangible.svg) by @lostdeviljho on Discord, [CC BY 4.0 license](https://fontawesome.com/license/free).
- [`horizon.svg`](../faction-logos/horizon.svg) by @lostdeviljho on Discord, [CC BY 4.0 license](https://fontawesome.com/license/free)
- [`ra.svg`](../faction-logos/ra.svg) by @rishenko on Discord, [CC BY 4.0 license](https://fontawesome.com/license/free)
52 changes: 52 additions & 0 deletions public/assets/icons/cover_hard.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
52 changes: 52 additions & 0 deletions public/assets/icons/cover_soft.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
52 changes: 52 additions & 0 deletions public/assets/icons/resistance_burn.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
52 changes: 52 additions & 0 deletions public/assets/icons/resistance_energy.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
49 changes: 49 additions & 0 deletions public/assets/icons/resistance_explosive.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading

0 comments on commit 74e1cc0

Please sign in to comment.