Merge remote-tracking branch 'origin/main' into tmp

This commit is contained in:
Mike Bloy 2023-11-24 13:31:24 -06:00
commit 9f6d4477a5
179 changed files with 440 additions and 146 deletions

1
.gitattributes vendored
View File

@ -1,3 +1,4 @@
packs/** binary
*.webp filter=lfs diff=lfs merge=lfs -text *.webp filter=lfs diff=lfs merge=lfs -text
*.jpeg filter=lfs diff=lfs merge=lfs -text *.jpeg filter=lfs diff=lfs merge=lfs -text
*.jpg filter=lfs diff=lfs merge=lfs -text *.jpg filter=lfs diff=lfs merge=lfs -text

1
.gitignore vendored Normal file
View File

@ -0,0 +1 @@
*.lock

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

BIN
assets/maps/greenbelt/thorn_river.webp (Stored with Git LFS) Normal file

Binary file not shown.

BIN
assets/maps/greenbelt/thorn_river_east_platform.webp (Stored with Git LFS) Normal file

Binary file not shown.

BIN
assets/maps/greenbelt/thorn_river_logs1.webp (Stored with Git LFS) Normal file

Binary file not shown.

BIN
assets/maps/greenbelt/thorn_river_logs2.webp (Stored with Git LFS) Normal file

Binary file not shown.

BIN
assets/maps/greenbelt/thorn_river_tree_shadows.webp (Stored with Git LFS) Normal file

Binary file not shown.

BIN
assets/maps/greenbelt/thorn_river_treetops.webp (Stored with Git LFS) Normal file

Binary file not shown.

BIN
assets/maps/greenbelt/thorn_river_west_platform.webp (Stored with Git LFS) Normal file

Binary file not shown.

BIN
assets/maps/world/campsite/campsite.webp (Stored with Git LFS) Normal file

Binary file not shown.

BIN
assets/maps/world/campsite/campsite_bookstand.webp (Stored with Git LFS) Normal file

Binary file not shown.

BIN
assets/maps/world/campsite/campsite_cart.webp (Stored with Git LFS) Normal file

Binary file not shown.

BIN
assets/maps/world/campsite/campsite_sundial.webp (Stored with Git LFS) Normal file

Binary file not shown.

BIN
assets/maps/world/campsite/campsite_tent1_top.webp (Stored with Git LFS) Normal file

Binary file not shown.

BIN
assets/maps/world/campsite/campsite_tent1_vis.webp (Stored with Git LFS) Normal file

Binary file not shown.

BIN
assets/maps/world/campsite/campsite_tent2_top.webp (Stored with Git LFS) Normal file

Binary file not shown.

BIN
assets/maps/world/campsite/campsite_tent2_vis.webp (Stored with Git LFS) Normal file

Binary file not shown.

BIN
assets/maps/world/campsite/campsite_training_dummy.webp (Stored with Git LFS) Normal file

Binary file not shown.

BIN
assets/maps/world/campsite/campsite_tree_shadow.webp (Stored with Git LFS) Normal file

Binary file not shown.

BIN
assets/maps/world/campsite/campsite_treetops.webp (Stored with Git LFS) Normal file

Binary file not shown.

BIN
assets/maps/world/campsite/campsite_wagon.webp (Stored with Git LFS) Normal file

Binary file not shown.

BIN
assets/maps/world/stolen_lands_paper.webp (Stored with Git LFS) Normal file

Binary file not shown.

BIN
assets/tokens/generic/bandit.webp (Stored with Git LFS)

Binary file not shown.

BIN
assets/tokens/generic/bandit_portrait.webp (Stored with Git LFS)

Binary file not shown.

BIN
assets/tokens/generic/bear.webp (Stored with Git LFS)

Binary file not shown.

BIN
assets/tokens/generic/bear_portrait.webp (Stored with Git LFS)

Binary file not shown.

BIN
assets/tokens/generic/black_tear_cutthroat.Avatar.webp (Stored with Git LFS) Normal file

Binary file not shown.

BIN
assets/tokens/generic/black_tear_cutthroat.Token.webp (Stored with Git LFS) Normal file

Binary file not shown.

BIN
assets/tokens/generic/boar.webp (Stored with Git LFS)

Binary file not shown.

BIN
assets/tokens/generic/boar_portrait.webp (Stored with Git LFS)

Binary file not shown.

BIN
assets/tokens/generic/elk.webp (Stored with Git LFS)

Binary file not shown.

BIN
assets/tokens/generic/elk_portrait.webp (Stored with Git LFS)

Binary file not shown.

Binary file not shown.

Binary file not shown.

BIN
assets/tokens/generic/iron_wraith.Avatar.webp (Stored with Git LFS) Normal file

Binary file not shown.

BIN
assets/tokens/generic/iron_wraith.Token.webp (Stored with Git LFS) Normal file

Binary file not shown.

BIN
assets/tokens/generic/iron_wraith.webp (Stored with Git LFS) Normal file

Binary file not shown.

BIN
assets/tokens/generic/iron_wraith_portrait.webp (Stored with Git LFS) Normal file

Binary file not shown.

BIN
assets/tokens/generic/thylacine.webp (Stored with Git LFS)

Binary file not shown.

Binary file not shown.

BIN
assets/tokens/npcs/Amiri.webp (Stored with Git LFS)

Binary file not shown.

BIN
assets/tokens/npcs/Amiri_portrait.webp (Stored with Git LFS)

Binary file not shown.

BIN
assets/tokens/npcs/Harrim.webp (Stored with Git LFS)

Binary file not shown.

BIN
assets/tokens/npcs/Harrim_portrait.webp (Stored with Git LFS)

Binary file not shown.

BIN
assets/tokens/npcs/Ioseph_Sellemius.webp (Stored with Git LFS)

Binary file not shown.

Binary file not shown.

BIN
assets/tokens/npcs/Jaethal.webp (Stored with Git LFS)

Binary file not shown.

BIN
assets/tokens/npcs/Jaethal_portrait.webp (Stored with Git LFS)

Binary file not shown.

BIN
assets/tokens/npcs/Jamandi_Aldori.webp (Stored with Git LFS)

Binary file not shown.

Binary file not shown.

BIN
assets/tokens/npcs/Jurgrindor.webp (Stored with Git LFS)

Binary file not shown.

Binary file not shown.

BIN
assets/tokens/npcs/Kesten_Garess.webp (Stored with Git LFS)

Binary file not shown.

Binary file not shown.

BIN
assets/tokens/npcs/Linzi.webp (Stored with Git LFS)

Binary file not shown.

BIN
assets/tokens/npcs/Linzi_portrait.webp (Stored with Git LFS)

Binary file not shown.

BIN
assets/tokens/npcs/Maegar_Varn.webp (Stored with Git LFS)

Binary file not shown.

Binary file not shown.

BIN
assets/tokens/npcs/Nishkiv_the_Knife.webp (Stored with Git LFS)

Binary file not shown.

Binary file not shown.

BIN
assets/tokens/npcs/Oleg_Leveton.webp (Stored with Git LFS)

Binary file not shown.

Binary file not shown.

BIN
assets/tokens/npcs/Svetlana_Leveton.webp (Stored with Git LFS)

Binary file not shown.

Binary file not shown.

BIN
assets/tokens/npcs/Tartuccio.webp (Stored with Git LFS)

Binary file not shown.

BIN
assets/tokens/npcs/Tartuccio_portrait.webp (Stored with Git LFS)

Binary file not shown.

BIN
assets/tokens/npcs/Valerie.webp (Stored with Git LFS)

Binary file not shown.

BIN
assets/tokens/npcs/Valerie_portrait.webp (Stored with Git LFS)

Binary file not shown.

BIN
assets/tokens/npcs/Volodmyra.webp (Stored with Git LFS)

Binary file not shown.

BIN
assets/tokens/npcs/Volodmyra_portrait.webp (Stored with Git LFS)

Binary file not shown.

BIN
assets/tokens/npcs/brevoy/hanis_drelev.Avatar.webp (Stored with Git LFS) Normal file

Binary file not shown.

BIN
assets/tokens/npcs/brevoy/hanis_drelev.Token.webp (Stored with Git LFS) Normal file

Binary file not shown.

BIN
assets/tokens/npcs/brevoy/ioseph_sellemius.Avatar.webp (Stored with Git LFS) Normal file

Binary file not shown.

BIN
assets/tokens/npcs/brevoy/ioseph_sellemius.Token.webp (Stored with Git LFS) Normal file

Binary file not shown.

BIN
assets/tokens/npcs/brevoy/jamandi_aldori.Avatar.webp (Stored with Git LFS) Normal file

Binary file not shown.

BIN
assets/tokens/npcs/brevoy/jamandi_aldori.Token.webp (Stored with Git LFS) Normal file

Binary file not shown.

BIN
assets/tokens/npcs/brevoy/jurgrindor.Avatar.webp (Stored with Git LFS) Normal file

Binary file not shown.

BIN
assets/tokens/npcs/brevoy/jurgrindor.Token.webp (Stored with Git LFS) Normal file

Binary file not shown.

BIN
assets/tokens/npcs/brevoy/maegar_varn.Avatar.webp (Stored with Git LFS) Normal file

Binary file not shown.

BIN
assets/tokens/npcs/brevoy/maegar_varn.Token.webp (Stored with Git LFS) Normal file

Binary file not shown.

BIN
assets/tokens/npcs/brevoy/niskiv_the_knife.Avatar.webp (Stored with Git LFS) Normal file

Binary file not shown.

Some files were not shown because too many files have changed in this diff Show More