diff --git a/Content/Materials/Islands/ElerisIsland/M_F_Grass_EleriIsland.uasset b/Content/Materials/Islands/ElerisIsland/M_F_Grass_EleriIsland.uasset index 208e7792..8282880d 100644 --- a/Content/Materials/Islands/ElerisIsland/M_F_Grass_EleriIsland.uasset +++ b/Content/Materials/Islands/ElerisIsland/M_F_Grass_EleriIsland.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ef432f2a80121fe32f4d881553bb0f518a74f87984973ef89971b86b3cf43e6c -size 19353 +oid sha256:25b35575ba8f7ae205ec5b67fabeefbe3157720eea5c141be2c6ee6cdd30bb97 +size 19360 diff --git a/Content/Materials/Props/Chairs/MI_WoodenChairPlating_Metal.uasset b/Content/Materials/Props/Chairs/MI_WoodenChairPlating_Metal.uasset new file mode 100644 index 00000000..9ac43dbc --- /dev/null +++ b/Content/Materials/Props/Chairs/MI_WoodenChairPlating_Metal.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c1fc4a4333a8e3550f3cfa90a39fffc749519e8cd45169e6c4cf541646f394d6 +size 12838 diff --git a/Content/Materials/Props/Chairs/MI_WoodenChair_1.uasset b/Content/Materials/Props/Chairs/MI_WoodenChair_1.uasset new file mode 100644 index 00000000..558cf811 --- /dev/null +++ b/Content/Materials/Props/Chairs/MI_WoodenChair_1.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ce15c29f1068fc1ac541e3f6580e368bc5e16332e24cbbc59522d7d4a08bea95 +size 10873 diff --git a/Content/Materials/VFX/MI_GroundFog.uasset b/Content/Materials/VFX/MI_GroundFog.uasset index a0470a41..5030b2f3 100644 --- a/Content/Materials/VFX/MI_GroundFog.uasset +++ b/Content/Materials/VFX/MI_GroundFog.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:3dbdbdea946587e716643d190399886a4d3996eec42ba034dd90eef6d96cba0d -size 14473 +oid sha256:f97087ff6404aadfe418ad96e96f429f6836ba087016cbb19de549f8986f2bdf +size 14729 diff --git a/Content/Materials/Wood/MI_LeavesTextureELERICAVEGOLD.uasset b/Content/Materials/Wood/MI_LeavesTextureELERICAVEGOLD.uasset index 7bb23ef8..53287d81 100644 --- a/Content/Materials/Wood/MI_LeavesTextureELERICAVEGOLD.uasset +++ b/Content/Materials/Wood/MI_LeavesTextureELERICAVEGOLD.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:352a7cec4760613dac253b66416a48688567b6563ee396dcf3bfb99c18dce264 -size 18096 +oid sha256:5bdb8ca463a48690abaea94818fdb71a2c94e0e8ccd2fd4c6b203cb5b4f1556d +size 15358 diff --git a/Content/Models/Props/SM_WoodChair.uasset b/Content/Models/Props/SM_WoodChair.uasset new file mode 100644 index 00000000..c84c507d --- /dev/null +++ b/Content/Models/Props/SM_WoodChair.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d056f460730ce0a71c89d4d1719401e2808ae66dd08d6bca311cfba349b2c3c6 +size 82714 diff --git a/Content/Models/Props/SM_WoodChairPlating.uasset b/Content/Models/Props/SM_WoodChairPlating.uasset new file mode 100644 index 00000000..3137fbcd --- /dev/null +++ b/Content/Models/Props/SM_WoodChairPlating.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:48278932cfe087f85c8683fe0ed2daf2fb2d9f4ef660ee102a127a6aead3771a +size 85345 diff --git a/Content/Models/Props/WoodChair.fbx b/Content/Models/Props/WoodChair.fbx new file mode 100644 index 00000000..1ad452b2 --- /dev/null +++ b/Content/Models/Props/WoodChair.fbx @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:fad19227f0c8f505023818489e58d258258ffea2b06fb8feb7defb7d08228ef2 +size 22140 diff --git a/Content/Models/Props/WoodChairPlating.fbx b/Content/Models/Props/WoodChairPlating.fbx new file mode 100644 index 00000000..c11067d9 --- /dev/null +++ b/Content/Models/Props/WoodChairPlating.fbx @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:4360583d49a750ad73463554a80c119db9faf6c662a9765929e237066dbf3e0a +size 26028 diff --git a/Content/Scripts/InventorySystem/BP_TreasureChest.uasset b/Content/Scripts/InventorySystem/BP_TreasureChest.uasset index 3baa7fe5..2e40a6f5 100644 --- a/Content/Scripts/InventorySystem/BP_TreasureChest.uasset +++ b/Content/Scripts/InventorySystem/BP_TreasureChest.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:550e78365777bed0a635b8d1284200e6f31cf59d37e47b324479536416c8af13 -size 272523 +oid sha256:8bfd4ddff7aa7afd31287df1e75f1b2d1921e062bb17d5cdfbd0857cf75a9ab3 +size 274838 diff --git a/Dev/BLENDER/Chairs.blend b/Dev/BLENDER/Chairs.blend new file mode 100644 index 00000000..68964f5e --- /dev/null +++ b/Dev/BLENDER/Chairs.blend @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c87e31e3d6cacf13431da1d4574332c0ace22973c8722a2202a6d207a62d8dc6 +size 578809 diff --git a/Dev/BLENDER/Chairs.blend1 b/Dev/BLENDER/Chairs.blend1 new file mode 100644 index 00000000..51b7320c Binary files /dev/null and b/Dev/BLENDER/Chairs.blend1 differ diff --git a/Source/ProjectEleri/Private/EleriGameState.cpp b/Source/ProjectEleri/Private/EleriGameState.cpp index 82c585c8..be4d5423 100644 --- a/Source/ProjectEleri/Private/EleriGameState.cpp +++ b/Source/ProjectEleri/Private/EleriGameState.cpp @@ -111,7 +111,7 @@ void AEleriGameState::PropagateSaveData(UEleriSaveGame* InSaveData) { //Promote actor data for (FActorIterator It(GetWorld()); It; ++It) { AActor* Actor = *It; - if (!Actor->IsValidLowLevel() || Actor->IsPendingKillPending() || !Cast(Actor) || !!Cast(Actor)) { + if (!Actor->IsValidLowLevel() || Actor->IsPendingKillPending() || !Cast(Actor) || !Cast(Actor)) { continue; } if (auto ActorSaveData = SaveData.ActorSaveData.Find(Cast(Actor)->GetPersistentId())) {