Merge remote-tracking branch 'fork/dev' into feature-legion_jewels

Browse Source

...

This commit is contained in:

Trevor Lund

2020-09-08 15:46:55 -05:00

parent a859c8afce c012033c8d

commit fbdd6139f8

228 changed files with 234665 additions and 12948 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

BIN

TreeData/3_10/groups-3.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 778 KiB

BIN

TreeData/3_10/skills-3.jpg Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 556 KiB

BIN

TreeData/3_10/skills-disabled-3.jpg Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 375 KiB

100921

TreeData/3_10/tree.lua Normal file

File diff suppressed because it is too large Load Diff

BIN

TreeData/3_11/groups-3.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 808 KiB

BIN

TreeData/3_11/skills-3.jpg Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 592 KiB

BIN

TreeData/3_11/skills-disabled-3.jpg Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 399 KiB

105878

TreeData/3_11/tree.lua Normal file

File diff suppressed because it is too large Load Diff

BIN

TreeData/AmberOil.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 6.4 KiB

BIN

TreeData/AscendancyButton.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 11 KiB

BIN

TreeData/AscendancyButtonHighlight.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 11 KiB

BIN

TreeData/AscendancyButtonPressed.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 11 KiB

BIN

TreeData/AscendancyFrameLargeAllocated.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 7.7 KiB

BIN

TreeData/AscendancyFrameLargeCanAllocate.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 7.5 KiB

BIN

TreeData/AscendancyFrameLargeNormal.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 7.4 KiB

BIN

TreeData/AscendancyFrameSmallAllocated.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 4.4 KiB

BIN

TreeData/AscendancyFrameSmallCanAllocate.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 4.3 KiB

BIN

TreeData/AscendancyFrameSmallNormal.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 4.2 KiB

BIN

TreeData/AscendancyMiddle.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 3.0 KiB

BIN

TreeData/AzureOil.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 6.5 KiB

BIN

TreeData/BlackOil.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 4.2 KiB

BIN

TreeData/BlightedNotableFrameAllocated.png

Binary file not shown.

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

BIN

TreeData/BlightedNotableFrameCanAllocate.png

Binary file not shown.

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

BIN

TreeData/BlightedNotableFrameUnallocated.png

Binary file not shown.

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

BIN

TreeData/ClearOil.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 6.9 KiB

BIN

TreeData/CrimsonOil.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 6.4 KiB

BIN

TreeData/EternalEmpireJewelCircle1.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 129 KiB

BIN

TreeData/EternalEmpireJewelCircle2.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 79 KiB

BIN

TreeData/GoldenOil.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 6.4 KiB

BIN

TreeData/GroupBackgroundLargeHalfAlt.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 68 KiB

BIN

TreeData/GroupBackgroundMediumAlt.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 60 KiB

BIN

TreeData/GroupBackgroundSmallAlt.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 33 KiB

BIN

TreeData/IndigoOil.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 4.4 KiB

BIN

TreeData/JewelCircle1.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 91 KiB

BIN

TreeData/JewelCircle1Inverse.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 75 KiB

BIN

TreeData/JewelSocketActiveAbyssAlt.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 7.2 KiB

BIN

TreeData/JewelSocketActiveBlueAlt.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 6.7 KiB

BIN

TreeData/JewelSocketActiveGreenAlt.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 6.4 KiB

BIN

TreeData/JewelSocketActiveLegion.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 5.6 KiB

BIN

TreeData/JewelSocketActiveLegionAlt.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 6.4 KiB

BIN

TreeData/JewelSocketActivePrismaticAlt.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 6.8 KiB

BIN

TreeData/JewelSocketActiveRedAlt.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 6.4 KiB

BIN

TreeData/JewelSocketAltActive.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 12 KiB

BIN

TreeData/JewelSocketAltCanAllocate.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 12 KiB

BIN

TreeData/JewelSocketAltNormal.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 12 KiB

BIN

TreeData/JewelSocketClusterAltCanAllocate1Large.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 2.9 KiB

BIN

TreeData/JewelSocketClusterAltCanAllocate1Medium.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 2.2 KiB

BIN

TreeData/JewelSocketClusterAltCanAllocate1Small.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 1.4 KiB

BIN

TreeData/JewelSocketClusterAltNormal1Large.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 2.8 KiB

BIN

TreeData/JewelSocketClusterAltNormal1Medium.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 2.1 KiB

BIN

TreeData/JewelSocketClusterAltNormal1Small.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 1.4 KiB

BIN

TreeData/KaruiJewelCircle1.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 131 KiB

BIN

TreeData/KaruiJewelCircle2.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 77 KiB

BIN

TreeData/MarakethJewelCircle1.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 130 KiB

BIN

TreeData/MarakethJewelCircle2.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 85 KiB

BIN

TreeData/OpalescentOil.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 6.5 KiB

BIN

TreeData/SepiaOil.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 6.4 KiB

BIN

TreeData/SilverOil.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 6.5 KiB

BIN

TreeData/TealOil.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 6.5 KiB

BIN

TreeData/TemplarJewelCircle1.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 118 KiB

BIN

TreeData/TemplarJewelCircle2.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 76 KiB

BIN

TreeData/VaalJewelCircle1.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 151 KiB

BIN

TreeData/VaalJewelCircle2.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 72 KiB

BIN

TreeData/VerdantOil.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 6.4 KiB

BIN

TreeData/VioletOil.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 6.5 KiB