Merge remote-tracking branch 'origin/master'

Browse Source

# Conflicts:
#	Content/Legumix/Player/BP_Play.uasset

...

This commit is contained in:

TjgL 2025-04-13 19:40:30 +02:00

parent 323846b4dd ab8be82328

commit cf03a0b098

49 changed files with 113 additions and 44 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

2

Config/DefaultEditor.ini

File diff suppressed because one or more lines are too long

BIN

Content/Legumix/Ennemy/Common/Context/EQC_DistantEnemyLocations.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

Content/Legumix/Ennemy/Common/Context/EQC_EQSOrigin.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

Content/Legumix/Ennemy/Common/Context/EQC_MeleeEnemyLocations.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

Content/Legumix/Ennemy/Common/Context/EQC_Player.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

Content/Legumix/Ennemy/Common/EQSTester_Repositioning.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

Content/Legumix/Ennemy/Common/EQS_Repositioning.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

Content/Legumix/Ennemy/Common/Service/BTService_RamdomLocation.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

Content/Legumix/Ennemy/Context/EQC_DistantEnemyLocations.uasset (Stored with Git LFS)

Binary file not shown.

BIN

Content/Legumix/Ennemy/Context/EQC_EQSOrigin.uasset (Stored with Git LFS)

Binary file not shown.

BIN

Content/Legumix/Ennemy/Context/EQC_MeleeEnemyLocations.uasset (Stored with Git LFS)

Binary file not shown.

BIN

Content/Legumix/Ennemy/Context/EQC_Player.uasset (Stored with Git LFS)

Binary file not shown.

BIN

Content/Legumix/Ennemy/MeleeEnemy/AI/BT_MeleeEnemy.uasset (Stored with Git LFS)

Binary file not shown.

BIN

Content/Legumix/Ennemy/MeleeEnemy/AI/EQS_MeleeEnnemy.uasset (Stored with Git LFS)

Binary file not shown.

BIN

Content/Legumix/Ennemy/MeleeEnemy/AIC_MeleeEnemy.uasset (Stored with Git LFS)

Binary file not shown.

BIN

Content/Legumix/Ennemy/RangeEnemy/AI/BT_RangeEnnemy.uasset (Stored with Git LFS)

Binary file not shown.

BIN

Content/Legumix/Ennemy/RangeEnemy/AI/EQS_RangeEnnemy.uasset (Stored with Git LFS)

Binary file not shown.

BIN

Content/Legumix/Ennemy/RangeEnemy/AIC_DistantEnnemy.uasset (Stored with Git LFS)

Binary file not shown.

BIN

Content/Legumix/Ennemy/Service/BTService_RamdomLocation.uasset (Stored with Git LFS)

Binary file not shown.

BIN

Content/Legumix/Environment/Assets/Materials/Marche.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

Content/Legumix/Environment/Assets/Materials/Mur_FOnd.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

Content/Legumix/Environment/Assets/Materials/Roche_Fond.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

Content/Legumix/Environment/Assets/Materials/Roche_Plafond.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

Content/Legumix/Environment/Assets/Materials/Vide.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

Content/Legumix/Environment/Assets/Materials/Zigzig_mur.uasset (Stored with Git LFS)

Binary file not shown.

BIN

Content/Legumix/Environment/Assets/Materials/Zigzig_mur1.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

Content/Legumix/Environment/Assets/Props/Decors/Plante/petite_carotte.uasset (Stored with Git LFS)

Binary file not shown.

BIN

Content/Legumix/Environment/Assets/Props/Decors/Roche/01_-_Default.uasset (Stored with Git LFS)

Binary file not shown.

BIN

Content/Legumix/Environment/Assets/Props/Decors/Roche/Mur_Zigzag.uasset (Stored with Git LFS)

Binary file not shown.

BIN

Content/Legumix/Environment/Assets/Props/Decors/Roche/Mur_fond.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

Content/Legumix/Environment/Assets/Props/Decors/Roche/Petit_sol.uasset (Stored with Git LFS)

Binary file not shown.

BIN

Content/Legumix/Environment/Assets/Props/Decors/Roche/Plafond_Roche_Fond.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

Content/Legumix/Environment/Assets/Props/Decors/Roche/Roche_monte.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

Content/Legumix/Environment/Assets/Props/Decors/Roche/Sol_zigzag.uasset (Stored with Git LFS)

Binary file not shown.

BIN

Content/Legumix/Environment/Assets/Props/Decors/Roche/Solfond.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

Content/Legumix/Environment/Assets/Textures/Mur_fond_Mur_fond_BaseColor.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

Content/Legumix/Environment/Assets/Textures/Mur_fond_Mur_fond_Normal.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

Content/Legumix/Environment/Assets/Textures/Mur_fond_Mur_fond_OcclusionRoughnessMetallic.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

Content/Legumix/Environment/Assets/Textures/Plafond_Roche_Fond_Roche_Haut-Fond_BaseColor.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

Content/Legumix/Environment/Assets/Textures/Plafond_Roche_Fond_Roche_Haut-Fond_Normal.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

Content/Legumix/Environment/Assets/Textures/Plafond_Roche_Fond_Roche_Haut-Fond_OcclusionRoughnessMetallic.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

Content/Legumix/Environment/Assets/Textures/Roche_monte_Marche_Truc_BaseColor.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

Content/Legumix/Environment/Assets/Textures/Roche_monte_Marche_Truc_Normal.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

Content/Legumix/Environment/Assets/Textures/Roche_monte_Marche_Truc_OcclusionRoughnessMetallic.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

Content/Legumix/Environment/Assets/Textures/Solfond_Sol_Fond_BaseColor.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

Content/Legumix/Environment/Assets/Textures/Solfond_Sol_Fond_Normal.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

Content/Legumix/Environment/Assets/Textures/Solfond_Sol_Fond_OcclusionRoughnessMetallic.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

Content/Legumix/Environment/Level_Art.umap (Stored with Git LFS)

Binary file not shown.

BIN

Content/Legumix/Levels/LVL_00.umap (Stored with Git LFS)

Binary file not shown.