diff --git a/Content/Blueprints/Combat_UI/BookCombat_UI.uasset b/Content/Blueprints/Combat_UI/BookCombat_UI.uasset index 2a821b7..20aed5b 100644 --- a/Content/Blueprints/Combat_UI/BookCombat_UI.uasset +++ b/Content/Blueprints/Combat_UI/BookCombat_UI.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:5300666477d0304bccf1ca8e12806a2d06ce5e1d3337076b921735b4245aa2a0 -size 91639 +oid sha256:40975a8c63df41fdd07b72950247d5360884f3bd233133e5071fe6c641d70c5b +size 96013 diff --git a/Content/Blueprints/Combat_UI/Iconage/Azos.uasset b/Content/Blueprints/Combat_UI/Iconage/Azos.uasset new file mode 100644 index 0000000..15c5951 --- /dev/null +++ b/Content/Blueprints/Combat_UI/Iconage/Azos.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:bbc7ec8eebbbe5a4510d594c44b5d60fe75e8f2755260d6489ea4bcef620487e +size 51542 diff --git a/Content/Blueprints/Combat_UI/Iconage/AzosFaded.uasset b/Content/Blueprints/Combat_UI/Iconage/AzosFaded.uasset new file mode 100644 index 0000000..d4e2518 --- /dev/null +++ b/Content/Blueprints/Combat_UI/Iconage/AzosFaded.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:2753b2d690f598012b71906b61ce6070108c5fd33db7ce4a93d7c19a3e877421 +size 51626 diff --git a/Content/Blueprints/Combat_UI/Iconage/Eis.uasset b/Content/Blueprints/Combat_UI/Iconage/Eis.uasset new file mode 100644 index 0000000..73b4b3d --- /dev/null +++ b/Content/Blueprints/Combat_UI/Iconage/Eis.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:a2af69a87cb6bcbfd24b3f74cfa38a4495431c1c7cd0653ecc66af2f08648336 +size 20913 diff --git a/Content/Blueprints/Combat_UI/Iconage/EisFaded.uasset b/Content/Blueprints/Combat_UI/Iconage/EisFaded.uasset new file mode 100644 index 0000000..1fc04eb --- /dev/null +++ b/Content/Blueprints/Combat_UI/Iconage/EisFaded.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:8d05f70b9fd9ba35fdbe10f06a7c6047985eb25f4ff58a02807495c6f70e1bf7 +size 21039 diff --git a/Content/Blueprints/Combat_UI/Iconage/Iroquoiod.uasset b/Content/Blueprints/Combat_UI/Iconage/Iroquoiod.uasset new file mode 100644 index 0000000..82f2cf7 --- /dev/null +++ b/Content/Blueprints/Combat_UI/Iconage/Iroquoiod.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:3d9b79cdf172aac833002bb0107b62310132e5ded15e0e14a9f261b8409754f1 +size 16172 diff --git a/Content/Blueprints/Combat_UI/Iconage/IroquoiodFaded.uasset b/Content/Blueprints/Combat_UI/Iconage/IroquoiodFaded.uasset new file mode 100644 index 0000000..32c88b7 --- /dev/null +++ b/Content/Blueprints/Combat_UI/Iconage/IroquoiodFaded.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:2aeceb1033a4930416bccbbe5836f3e58a425274547c9c7061bf81815efed2f5 +size 16307 diff --git a/Content/Blueprints/Combat_UI/Iconage/Probertium.uasset b/Content/Blueprints/Combat_UI/Iconage/Probertium.uasset new file mode 100644 index 0000000..326c853 --- /dev/null +++ b/Content/Blueprints/Combat_UI/Iconage/Probertium.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:559724e9580bfa816c04993927f741ec273e2fc942d010c1548deef27c81d92e +size 20793 diff --git a/Content/Blueprints/Combat_UI/Iconage/ProbertiumFaded.uasset b/Content/Blueprints/Combat_UI/Iconage/ProbertiumFaded.uasset new file mode 100644 index 0000000..a953e82 --- /dev/null +++ b/Content/Blueprints/Combat_UI/Iconage/ProbertiumFaded.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c7afc4a259dd9d5d0ffec713ba7dc793a07ac07383b6945b2558ba0e5366c9c0 +size 20956 diff --git a/Source/the_twilight_abyss/PlayerTemp/TempCharacter.cpp b/Source/the_twilight_abyss/PlayerTemp/TempCharacter.cpp index c102921..08a54d2 100644 --- a/Source/the_twilight_abyss/PlayerTemp/TempCharacter.cpp +++ b/Source/the_twilight_abyss/PlayerTemp/TempCharacter.cpp @@ -30,6 +30,7 @@ void ATempCharacter::BeginPlay() Super::BeginPlay(); FirstPlayerController = GetWorld()->GetFirstPlayerController(); + CombatSystem = Cast(GetWorld()->GetGameState()); WidgetPointer = Cast(this->GetComponentByClass(UWidgetInteractionComponent::StaticClass())); Health = 100; diff --git a/UI designs/Azos.png b/UI designs/Azos.png new file mode 100644 index 0000000..bade5d3 --- /dev/null +++ b/UI designs/Azos.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ab5d483fbe8e218573a01c985b82b2a595f14a3643b7836d7c5bf077834323e1 +size 43662 diff --git a/UI designs/AzosFaded.png b/UI designs/AzosFaded.png new file mode 100644 index 0000000..c9ce54f --- /dev/null +++ b/UI designs/AzosFaded.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:9ce9e6430edff0a38d0147e4f9b4ff3859cba663d3604b7831cc79b02c210aa9 +size 42815 diff --git a/UI designs/Eis.png b/UI designs/Eis.png new file mode 100644 index 0000000..cbe5085 --- /dev/null +++ b/UI designs/Eis.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e18e8da691b960930785dc5e7af06484f0ee09742ce846623e4c1ab65a1a07c3 +size 12742 diff --git a/UI designs/EisFaded.png b/UI designs/EisFaded.png new file mode 100644 index 0000000..28b1b61 --- /dev/null +++ b/UI designs/EisFaded.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b6103ecfc19ccf78e42aabb487db7634d1b5fa8b526875c481f23b20aae15379 +size 12748 diff --git a/UI designs/Iroquoiod.png b/UI designs/Iroquoiod.png new file mode 100644 index 0000000..e04b2c4 --- /dev/null +++ b/UI designs/Iroquoiod.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:fa564adcf610e7486299554c9b76e034ca1bd63cbda8d00318380cbebffcc789 +size 8960 diff --git a/UI designs/IroquoiodFaded.png b/UI designs/IroquoiodFaded.png new file mode 100644 index 0000000..a8fad44 --- /dev/null +++ b/UI designs/IroquoiodFaded.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:5387df2e66294db9136ca8277b56d932daadd9d44b00949ce0d19c87cb699665 +size 8993 diff --git a/UI designs/Probertium.png b/UI designs/Probertium.png new file mode 100644 index 0000000..f056f6c --- /dev/null +++ b/UI designs/Probertium.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:530875cd87268209ed016b421144eec89e903eab0cc1b8779b49057b806b5b03 +size 12707 diff --git a/UI designs/ProbertiumFaded.png b/UI designs/ProbertiumFaded.png new file mode 100644 index 0000000..9b1fc86 --- /dev/null +++ b/UI designs/ProbertiumFaded.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c9008bfe34070a91aa0a22420fa5abfcea83ff6e395dbef97f5dc80a0c58a16f +size 12753