diff options
| author | Ledmitz <smoothshifter@tuta.io> | 2023-03-21 22:06:25 -0300 |
|---|---|---|
| committer | Ledmitz <smoothshifter@tuta.io> | 2023-03-21 22:06:25 -0300 |
| commit | 86b376f59c7a6d5c6f24f74f825dc8ab54c0494c (patch) | |
| tree | 813be522038bbbaad10b6104de96657619a401b0 /graphics | |
| parent | 968bdbae500eff84c63e3dd2548b89d416e10f09 (diff) | |
| parent | bd24b8a8168dc6b2747fc2c2d98e50742ce375e2 (diff) | |
| download | clientdata-floyd_book.tar.gz clientdata-floyd_book.tar.bz2 clientdata-floyd_book.tar.xz clientdata-floyd_book.zip | |
Conflict resolution 1floyd_book
Diffstat (limited to 'graphics')
| -rw-r--r-- | graphics/images/doomsday.png | bin | 859510 -> 950249 bytes |
| -rw-r--r-- | graphics/items/equipment/charms/darktalisman.png | bin | 1628 -> 921 bytes |
| -rw-r--r-- | graphics/minimaps/023-2.png | bin | 436 -> 743 bytes |
| -rw-r--r-- | graphics/minimaps/023-3.png | bin | 3964 -> 9184 bytes |
| -rw-r--r-- | graphics/minimaps/029-4.png | bin | 1484 -> 3266 bytes |
| -rw-r--r-- | graphics/minimaps/043-1.png | bin | 3069 -> 5911 bytes |
| -rw-r--r-- | graphics/particles/dart.png | bin | 4275 -> 453 bytes |
| -rw-r--r-- | graphics/particles/snowflake-9x9.png | bin | 11228 -> 113 bytes |
| -rw-r--r-- | graphics/sprites/equipment/head/christmastree.png | bin | 1721 -> 4508 bytes |
| -rw-r--r-- | graphics/sprites/equipment/weapons/null.png | bin | 923 -> 143 bytes |
10 files changed, 0 insertions, 0 deletions
diff --git a/graphics/images/doomsday.png b/graphics/images/doomsday.png Binary files differindex 838ff74d..e0f3cdd4 100644 --- a/graphics/images/doomsday.png +++ b/graphics/images/doomsday.png diff --git a/graphics/items/equipment/charms/darktalisman.png b/graphics/items/equipment/charms/darktalisman.png Binary files differindex 908839d5..f6ed3ca2 100644 --- a/graphics/items/equipment/charms/darktalisman.png +++ b/graphics/items/equipment/charms/darktalisman.png diff --git a/graphics/minimaps/023-2.png b/graphics/minimaps/023-2.png Binary files differindex 0baefbdd..dca6c0e9 100644 --- a/graphics/minimaps/023-2.png +++ b/graphics/minimaps/023-2.png diff --git a/graphics/minimaps/023-3.png b/graphics/minimaps/023-3.png Binary files differindex 036ca741..ebb41fe6 100644 --- a/graphics/minimaps/023-3.png +++ b/graphics/minimaps/023-3.png diff --git a/graphics/minimaps/029-4.png b/graphics/minimaps/029-4.png Binary files differindex cf6c3bbf..3ebad644 100644 --- a/graphics/minimaps/029-4.png +++ b/graphics/minimaps/029-4.png diff --git a/graphics/minimaps/043-1.png b/graphics/minimaps/043-1.png Binary files differindex efcc4428..389b6428 100644 --- a/graphics/minimaps/043-1.png +++ b/graphics/minimaps/043-1.png diff --git a/graphics/particles/dart.png b/graphics/particles/dart.png Binary files differindex afa27ca7..3ed7d053 100644 --- a/graphics/particles/dart.png +++ b/graphics/particles/dart.png diff --git a/graphics/particles/snowflake-9x9.png b/graphics/particles/snowflake-9x9.png Binary files differindex 2ac1c5e8..dcb303e4 100644 --- a/graphics/particles/snowflake-9x9.png +++ b/graphics/particles/snowflake-9x9.png diff --git a/graphics/sprites/equipment/head/christmastree.png b/graphics/sprites/equipment/head/christmastree.png Binary files differindex 1d8a5e8f..d459e956 100644 --- a/graphics/sprites/equipment/head/christmastree.png +++ b/graphics/sprites/equipment/head/christmastree.png diff --git a/graphics/sprites/equipment/weapons/null.png b/graphics/sprites/equipment/weapons/null.png Binary files differindex 0906ec03..cbf5dc3e 100644 --- a/graphics/sprites/equipment/weapons/null.png +++ b/graphics/sprites/equipment/weapons/null.png |
