Revert "Resolve conflict"

Browse Source

This reverts commit cec4138768fe4652cdb11528c3a2dda8002ea4af.

...

This commit is contained in:

DESKTOP-1SC3M4D\admin 2023-04-29 20:51:07 +03:00

parent cec4138768

commit 138cd90990

66 changed files with 38 additions and 140 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Show Stats Download Patch File Download Diff File Expand all files Collapse all files

Content

Assets.umap

Characters/Mannequins

Animations

Manny

MM_Fall_Loop.uassetMM_Idle.uassetMM_Jump.uassetMM_Land.uassetMM_Run_Fwd.uassetMM_Walk_Fwd.uassetMM_Walk_InPlace.uasset

Quinn

MF_Idle.uassetMF_Run_Fwd.uassetMF_Walk_Fwd.uasset

Meshes

SK_Mannequin.uasset

FX

NewNiagaraSystem.uasset

Megascans/3D_Assets/Modular_Wooden_Base_Wall_wdkhabwdw

MI_Modular_Wooden_Base_Wall_wdkhabwdw_1K.uassetS_Modular_Wooden_Base_Wall_wdkhabwdw_lod5_Var1.uassetT_ModularWoodenBaseWall_wdkhabwdw_1K_DpR.uassetT_Modular_Wooden_Base_Wall_wdkhabwdw_1K_D.uassetT_Modular_Wooden_Base_Wall_wdkhabwdw_1K_N.uasset

ThirdPerson/Maps

AGlevel.umap

__ExternalActors__/ThirdPerson/Maps

AGlevel

0

3M

485MTXHHV9OLATRWZYVGVP.uasset

G0

7075KAVIMWY2PKOWQ6KI37.uasset

1

4D

PIQOE4Y0RCLIX95ZFRDE39.uasset

C3

0NKMZ22ZRH5FA9V1O4IQPF.uasset

L6

597DJYC49QSRQ173EWUU2Y.uasset

2/0P

3V9K4D12OTJE78MMVH5Q78.uasset

4

BU

N6R55ARA1250I1ERL2W2AS.uasset

F9

OKIWYZLS9WIJ5XVUX07ULJ.uasset

GM

2GQDSY55000YXNFZ9NXZKK.uasset

YC

E417JQNDZ0QUXL49K3J9N9.uasset

5

AX

ZM9WO9CK1MVF05OD5A3IPN.uasset

BT

IN71FKZRXZ7Z5ZH9F40A4N.uasset

TU

LQZOU6FPIFF92Y7JGEEVDP.uasset

6

0W

NXAV6BKL4W0Z7XZNR01I7N.uasset

28

ANXC1CADWPSC3H36JTMNWR.uasset

H4

GPA8CJ97L28M4Y1BSSSVAN.uasset

7

A8

U0QM6W8BMAMYOGCMFY54EJ.uasset

KU

VW15D8NXS2X5ZB9J3LKY4A.uasset

RN

OTSQ1NJ074KGLPMF90VIWD.uasset

8

EJ

5U8TZ75RLGJ96VRQCHK20Y.uasset

F4

2HPWPS36OXNNAL4YUCB8FU.uasset

FF

TAZ3MXDCUCBRGVUSIGKQI9.uasset

QA

ZZDWOS160IT1V5216RNJXP.uasset

9

BH

OEFK3C1MR318I983DUSQX2.uasset

JF

R0BWIO3FFIQPPBRZBCS7PC.uasset

A

7G

UPJI6JNKWO6PKQ06N5MTIS.uasset

FZ

FI9V8DKA4YQU7SV3J3I3XD.uasset

H1

MP9R522XIZ0JPJ3C9M5ZKM.uasset

QQ

BM18OCNRNDZYSVQ7A7FH34.uasset

B

5W

6K56KALQJ7D5VQ8WOYISIM.uasset

ZU

API60BUIL3YSRGYR0L43O1.uasset

C

9T

MESV16SGJ3YN8LNEUUMHH3.uasset

ET

0TZQEOO3P885RJ0PZ64J73.uasset

SM

LA7KDX8I1APQNHRQRJBCZ3.uasset

ZO

ND99CCHYGP2U23KYVK9AUC.uasset

D/44

UPH70FSJNFGC7DFNXFT39A.uasset

E/KT

U6CPPCE8O8T6XDIM51RUTP.uasset

F/4D

WTFETL2NW0BGF0HEOQFBPM.uasset

ThirdPersonMap

8/3J

6B9RJI3FDPCETRKXUXCQ4C.uasset

F/56

WOP5ER1STGC3XSNENP28OW.uasset

__ExternalObjects__/ThirdPerson/Maps/AGlevel

0/BN

OMK7WCNZON5CM9PH82GWRN.uasset

1/7I

ZL3P9584RJJOPS3ATGIRP0.uasset

5

NV

V6XK79O58B8Z2TWEJ6EJQO.uasset

TG

RLN6PGX4F6Y32LG3VAWORW.uasset

8/TD

MH3ILDE4XMZ6GT9WRO3Y5I.uasset

D/1B

7IBY53V2SALKYW58U5FHU0.uasset

E/AP

A8B8EN96B7KBFDOMZHDNSN.uasset

BIN

Content/Assets.umap

Binary file not shown.

BIN

Content/Characters/Mannequins/Animations/Manny/MM_Fall_Loop.uasset

Binary file not shown.

BIN

Content/Characters/Mannequins/Animations/Manny/MM_Idle.uasset

Binary file not shown.

BIN

Content/Characters/Mannequins/Animations/Manny/MM_Jump.uasset

Binary file not shown.

BIN

Content/Characters/Mannequins/Animations/Manny/MM_Land.uasset

Binary file not shown.

BIN

Content/Characters/Mannequins/Animations/Manny/MM_Run_Fwd.uasset

Binary file not shown.

BIN

Content/Characters/Mannequins/Animations/Manny/MM_Walk_Fwd.uasset

Binary file not shown.

BIN

Content/Characters/Mannequins/Animations/Manny/MM_Walk_InPlace.uasset

Binary file not shown.

BIN

Content/Characters/Mannequins/Animations/Quinn/MF_Idle.uasset

Binary file not shown.

BIN

Content/Characters/Mannequins/Animations/Quinn/MF_Run_Fwd.uasset

Binary file not shown.

BIN

Content/Characters/Mannequins/Animations/Quinn/MF_Walk_Fwd.uasset

Binary file not shown.

BIN

Content/Characters/Mannequins/Meshes/SK_Mannequin.uasset

Binary file not shown.

BIN

Content/FX/NewNiagaraSystem.uasset

Binary file not shown.

BIN

Content/Megascans/3D_Assets/Modular_Wooden_Base_Wall_wdkhabwdw/MI_Modular_Wooden_Base_Wall_wdkhabwdw_1K.uasset (Stored with Git LFS)

Binary file not shown.

BIN

Content/Megascans/3D_Assets/Modular_Wooden_Base_Wall_wdkhabwdw/S_Modular_Wooden_Base_Wall_wdkhabwdw_lod5_Var1.uasset (Stored with Git LFS)

Binary file not shown.

BIN

Content/Megascans/3D_Assets/Modular_Wooden_Base_Wall_wdkhabwdw/T_ModularWoodenBaseWall_wdkhabwdw_1K_DpR.uasset (Stored with Git LFS)

Binary file not shown.

BIN

Content/Megascans/3D_Assets/Modular_Wooden_Base_Wall_wdkhabwdw/T_Modular_Wooden_Base_Wall_wdkhabwdw_1K_D.uasset (Stored with Git LFS)

Binary file not shown.

BIN

Content/Megascans/3D_Assets/Modular_Wooden_Base_Wall_wdkhabwdw/T_Modular_Wooden_Base_Wall_wdkhabwdw_1K_N.uasset (Stored with Git LFS)

Binary file not shown.

BIN

Content/ThirdPerson/Maps/AGlevel.umap (Stored with Git LFS)

Binary file not shown.

BIN

Content/__ExternalActors__/ThirdPerson/Maps/AGlevel/0/3M/485MTXHHV9OLATRWZYVGVP.uasset (Stored with Git LFS)

Binary file not shown.

BIN

Content/__ExternalActors__/ThirdPerson/Maps/AGlevel/0/G0/7075KAVIMWY2PKOWQ6KI37.uasset (Stored with Git LFS)

Binary file not shown.

BIN

Content/__ExternalActors__/ThirdPerson/Maps/AGlevel/1/4D/PIQOE4Y0RCLIX95ZFRDE39.uasset (Stored with Git LFS)

Binary file not shown.

BIN

Content/__ExternalActors__/ThirdPerson/Maps/AGlevel/1/C3/0NKMZ22ZRH5FA9V1O4IQPF.uasset (Stored with Git LFS)

Binary file not shown.

BIN

Content/__ExternalActors__/ThirdPerson/Maps/AGlevel/1/L6/597DJYC49QSRQ173EWUU2Y.uasset (Stored with Git LFS)

Binary file not shown.

BIN

Content/__ExternalActors__/ThirdPerson/Maps/AGlevel/2/0P/3V9K4D12OTJE78MMVH5Q78.uasset (Stored with Git LFS)

Binary file not shown.

BIN

Content/__ExternalActors__/ThirdPerson/Maps/AGlevel/4/BU/N6R55ARA1250I1ERL2W2AS.uasset (Stored with Git LFS)

Binary file not shown.

BIN

Content/__ExternalActors__/ThirdPerson/Maps/AGlevel/4/F9/OKIWYZLS9WIJ5XVUX07ULJ.uasset (Stored with Git LFS)

Binary file not shown.

BIN

Content/__ExternalActors__/ThirdPerson/Maps/AGlevel/4/GM/2GQDSY55000YXNFZ9NXZKK.uasset (Stored with Git LFS)

Binary file not shown.

BIN

Content/__ExternalActors__/ThirdPerson/Maps/AGlevel/4/YC/E417JQNDZ0QUXL49K3J9N9.uasset (Stored with Git LFS)

Binary file not shown.

BIN

Content/__ExternalActors__/ThirdPerson/Maps/AGlevel/5/AX/ZM9WO9CK1MVF05OD5A3IPN.uasset (Stored with Git LFS)

Binary file not shown.

BIN

Content/__ExternalActors__/ThirdPerson/Maps/AGlevel/5/BT/IN71FKZRXZ7Z5ZH9F40A4N.uasset (Stored with Git LFS)

Binary file not shown.

BIN

Content/__ExternalActors__/ThirdPerson/Maps/AGlevel/5/TU/LQZOU6FPIFF92Y7JGEEVDP.uasset (Stored with Git LFS)

Binary file not shown.

BIN

Content/__ExternalActors__/ThirdPerson/Maps/AGlevel/6/0W/NXAV6BKL4W0Z7XZNR01I7N.uasset (Stored with Git LFS)

Binary file not shown.

BIN

Content/__ExternalActors__/ThirdPerson/Maps/AGlevel/6/28/ANXC1CADWPSC3H36JTMNWR.uasset (Stored with Git LFS)

Binary file not shown.

BIN

Content/__ExternalActors__/ThirdPerson/Maps/AGlevel/6/H4/GPA8CJ97L28M4Y1BSSSVAN.uasset (Stored with Git LFS)

Binary file not shown.

BIN

Content/__ExternalActors__/ThirdPerson/Maps/AGlevel/7/A8/U0QM6W8BMAMYOGCMFY54EJ.uasset (Stored with Git LFS)

Binary file not shown.

BIN

Content/__ExternalActors__/ThirdPerson/Maps/AGlevel/7/KU/VW15D8NXS2X5ZB9J3LKY4A.uasset (Stored with Git LFS)

Binary file not shown.

BIN

Content/__ExternalActors__/ThirdPerson/Maps/AGlevel/7/RN/OTSQ1NJ074KGLPMF90VIWD.uasset (Stored with Git LFS)

Binary file not shown.

BIN

Content/__ExternalActors__/ThirdPerson/Maps/AGlevel/8/EJ/5U8TZ75RLGJ96VRQCHK20Y.uasset (Stored with Git LFS)

Binary file not shown.

BIN

Content/__ExternalActors__/ThirdPerson/Maps/AGlevel/8/F4/2HPWPS36OXNNAL4YUCB8FU.uasset (Stored with Git LFS)

Binary file not shown.

BIN

Content/__ExternalActors__/ThirdPerson/Maps/AGlevel/8/FF/TAZ3MXDCUCBRGVUSIGKQI9.uasset (Stored with Git LFS)

Binary file not shown.

BIN

Content/__ExternalActors__/ThirdPerson/Maps/AGlevel/8/QA/ZZDWOS160IT1V5216RNJXP.uasset (Stored with Git LFS)

Binary file not shown.

BIN

Content/__ExternalActors__/ThirdPerson/Maps/AGlevel/9/BH/OEFK3C1MR318I983DUSQX2.uasset (Stored with Git LFS)

Binary file not shown.

BIN

Content/__ExternalActors__/ThirdPerson/Maps/AGlevel/9/JF/R0BWIO3FFIQPPBRZBCS7PC.uasset (Stored with Git LFS)

Binary file not shown.

BIN

Content/__ExternalActors__/ThirdPerson/Maps/AGlevel/A/7G/UPJI6JNKWO6PKQ06N5MTIS.uasset (Stored with Git LFS)

Binary file not shown.

BIN

Content/__ExternalActors__/ThirdPerson/Maps/AGlevel/A/FZ/FI9V8DKA4YQU7SV3J3I3XD.uasset (Stored with Git LFS)

Binary file not shown.

BIN

Content/__ExternalActors__/ThirdPerson/Maps/AGlevel/A/H1/MP9R522XIZ0JPJ3C9M5ZKM.uasset (Stored with Git LFS)

Binary file not shown.

BIN

Content/__ExternalActors__/ThirdPerson/Maps/AGlevel/A/QQ/BM18OCNRNDZYSVQ7A7FH34.uasset (Stored with Git LFS)

Binary file not shown.

BIN

Content/__ExternalActors__/ThirdPerson/Maps/AGlevel/B/5W/6K56KALQJ7D5VQ8WOYISIM.uasset (Stored with Git LFS)

Binary file not shown.

BIN

Content/__ExternalActors__/ThirdPerson/Maps/AGlevel/B/ZU/API60BUIL3YSRGYR0L43O1.uasset (Stored with Git LFS)

Binary file not shown.

BIN

Content/__ExternalActors__/ThirdPerson/Maps/AGlevel/C/9T/MESV16SGJ3YN8LNEUUMHH3.uasset (Stored with Git LFS)

Binary file not shown.

BIN

Content/__ExternalActors__/ThirdPerson/Maps/AGlevel/C/ET/0TZQEOO3P885RJ0PZ64J73.uasset (Stored with Git LFS)

Binary file not shown.

BIN

Content/__ExternalActors__/ThirdPerson/Maps/AGlevel/C/SM/LA7KDX8I1APQNHRQRJBCZ3.uasset (Stored with Git LFS)

Binary file not shown.

BIN

Content/__ExternalActors__/ThirdPerson/Maps/AGlevel/C/ZO/ND99CCHYGP2U23KYVK9AUC.uasset (Stored with Git LFS)

Binary file not shown.

BIN

Content/__ExternalActors__/ThirdPerson/Maps/AGlevel/D/44/UPH70FSJNFGC7DFNXFT39A.uasset (Stored with Git LFS)

Binary file not shown.

BIN

Content/__ExternalActors__/ThirdPerson/Maps/AGlevel/E/KT/U6CPPCE8O8T6XDIM51RUTP.uasset (Stored with Git LFS)

Binary file not shown.

BIN

Content/__ExternalActors__/ThirdPerson/Maps/AGlevel/F/4D/WTFETL2NW0BGF0HEOQFBPM.uasset (Stored with Git LFS)

Binary file not shown.

BIN

Content/__ExternalActors__/ThirdPerson/Maps/ThirdPersonMap/8/3J/6B9RJI3FDPCETRKXUXCQ4C.uasset (Stored with Git LFS)

Binary file not shown.

BIN

Content/__ExternalActors__/ThirdPerson/Maps/ThirdPersonMap/F/56/WOP5ER1STGC3XSNENP28OW.uasset (Stored with Git LFS)

Binary file not shown.

BIN

Content/__ExternalObjects__/ThirdPerson/Maps/AGlevel/0/BN/OMK7WCNZON5CM9PH82GWRN.uasset (Stored with Git LFS)

Binary file not shown.

BIN

Content/__ExternalObjects__/ThirdPerson/Maps/AGlevel/1/7I/ZL3P9584RJJOPS3ATGIRP0.uasset (Stored with Git LFS)

Binary file not shown.

BIN

Content/__ExternalObjects__/ThirdPerson/Maps/AGlevel/5/NV/V6XK79O58B8Z2TWEJ6EJQO.uasset (Stored with Git LFS)

Binary file not shown.

BIN

Content/__ExternalObjects__/ThirdPerson/Maps/AGlevel/5/TG/RLN6PGX4F6Y32LG3VAWORW.uasset (Stored with Git LFS)

Binary file not shown.

BIN

Content/__ExternalObjects__/ThirdPerson/Maps/AGlevel/8/TD/MH3ILDE4XMZ6GT9WRO3Y5I.uasset (Stored with Git LFS)

Binary file not shown.

BIN

Content/__ExternalObjects__/ThirdPerson/Maps/AGlevel/D/1B/7IBY53V2SALKYW58U5FHU0.uasset (Stored with Git LFS)

Binary file not shown.

BIN

Content/__ExternalObjects__/ThirdPerson/Maps/AGlevel/E/AP/A8B8EN96B7KBFDOMZHDNSN.uasset (Stored with Git LFS)

Binary file not shown.