Compare commits

base: lucastucious:8f32eadb41205642c3b4b59145cf39877c12f542

Branches Tags

lucastucious:master

lucastucious:develop

lucastucious:feature/ImproveIA

lucastucious:feature/DialogSystem

lucastucious:testSamourai

lucastucious:README-Update

lucastucious:GamejoltAPI

lucastucious:feature/QTE

lucastucious:feature/SpeechRecognition

..

compare: lucastucious:801459132e5342c73fa17da77dc1e65e0298272a

Branches Tags

lucastucious:develop

lucastucious:feature/ImproveIA

lucastucious:feature/DialogSystem

lucastucious:testSamourai

lucastucious:README-Update

lucastucious:GamejoltAPI

lucastucious:feature/QTE

lucastucious:feature/SpeechRecognition

lucastucious:master

No commits in common. "8f32eadb41205642c3b4b59145cf39877c12f542" and "801459132e5342c73fa17da77dc1e65e0298272a" have entirely different histories.

8f32eadb41 ... 801459132e

545 changed files with 0 additions and 69 deletions

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

Show stats Expand all files Collapse all files

BIN

Content/0_Project/Characters/BaseEnnemies.uasset Normal file

View file

Binary file not shown.

BIN

Content/0_Project/Characters/BaseInteract.uasset

View file

Binary file not shown.

BIN

Content/0_Project/Characters/BasePlayer_Child.uasset

View file

Binary file not shown.

BIN

Content/0_Project/Characters/NPC.uasset

View file

Binary file not shown.

BIN

Content/0_Project/Characters/Samourai/Great_Sword_Idle.uasset

View file

Binary file not shown.

BIN

Content/0_Project/Characters/Samourai/Great_Sword_Run.uasset

View file

Binary file not shown.

BIN

Content/0_Project/Characters/Samourai/Material/SwordMaterial6.uasset

View file

Binary file not shown.

BIN

Content/0_Project/Characters/Samourai/Material/rsMaterial2.uasset

View file

Binary file not shown.

BIN

Content/0_Project/Characters/Samourai/Material/rsMaterial3.uasset

View file

Binary file not shown.

BIN

Content/0_Project/Characters/Samourai/Material/rsMaterial4.uasset

View file

Binary file not shown.

BIN

Content/0_Project/Characters/Samourai/Material/rsMaterial5.uasset

View file

Binary file not shown.

BIN

Content/0_Project/Characters/Samourai/Perso_Jam.uasset

View file

Binary file not shown.

BIN

Content/0_Project/Characters/Samourai/Perso_Jam_hat.uasset

View file

Binary file not shown.

BIN

Content/0_Project/Characters/Samourai/Perso_Jam_masque.uasset

View file

Binary file not shown.

BIN

Content/0_Project/Characters/Samourai/Perso_Jam_polySurface33.uasset

View file

Binary file not shown.

BIN

Content/0_Project/Characters/Samourai/Perso_Jam_polySurface33_PhysicsAsset.uasset

View file

Binary file not shown.

BIN

Content/0_Project/Characters/Samourai/Perso_Jam_polySurface33_Skeleton.uasset

View file

Binary file not shown.

BIN

Content/0_Project/Characters/Samourai/Perso_Jam_sword.uasset

View file

Binary file not shown.

BIN

Content/0_Project/Characters/Samourai/StaticMesh.uasset

View file

Binary file not shown.

BIN

Content/0_Project/Characters/Samourai/Test/Great_Sword_High_Spin_Attack.uasset

View file

Binary file not shown.

BIN

Content/0_Project/Characters/Samourai/Test/Great_Sword_Idle.uasset

View file

Binary file not shown.

BIN

Content/0_Project/Characters/Samourai/Test/Great_Sword_Idle__1_.uasset

View file

Binary file not shown.

BIN

Content/0_Project/Characters/Samourai/Test/Great_Sword_Impact.uasset

View file

Binary file not shown.

BIN

Content/0_Project/Characters/Samourai/Test/Great_Sword_Run.uasset

View file

Binary file not shown.

BIN

Content/0_Project/Characters/Samourai/Test/Great_Sword_Slash.uasset

View file

Binary file not shown.

BIN

Content/0_Project/Characters/Samourai/Test/SK_Character_Samurai_VillageMale_02.uasset

View file

Binary file not shown.

BIN

Content/0_Project/Characters/Samourai/Test/SK_Character_Samurai_VillageMale_02_PhysicsAsset.uasset

View file

Binary file not shown.

BIN

Content/0_Project/Characters/Samourai/Test/SK_Character_Samurai_VillageMale_02_Skeleton.uasset

View file

Binary file not shown.

BIN

Content/0_Project/Characters/Samourai/Texture/Textures/Armor/Material_1127.uasset

View file

Binary file not shown.

BIN

Content/0_Project/Characters/Samourai/Texture/Textures/Armor/Sode_Armor_001_ambientOcclusion.uasset

View file

Binary file not shown.

BIN

Content/0_Project/Characters/Samourai/Texture/Textures/Armor/Sode_Armor_001_basecolor.uasset

View file

Binary file not shown.

BIN

Content/0_Project/Characters/Samourai/Texture/Textures/Armor/Sode_Armor_001_height.uasset

View file

Binary file not shown.

BIN

Content/0_Project/Characters/Samourai/Texture/Textures/Armor/Sode_Armor_001_metallic.uasset

View file

Binary file not shown.

BIN

Content/0_Project/Characters/Samourai/Texture/Textures/Armor/Sode_Armor_001_normal.uasset

View file

Binary file not shown.

BIN

Content/0_Project/Characters/Samourai/Texture/Textures/Armor/Sode_Armor_001_roughness.uasset

View file

Binary file not shown.

BIN

Content/0_Project/Characters/Samourai/Texture/Textures/Hair/Material_1572__1_.uasset

View file

Binary file not shown.

BIN

Content/0_Project/Characters/Samourai/Texture/Textures/Hair/Stylized_Fur_001_ambientOcclusion__1_.uasset

View file

Binary file not shown.

BIN

Content/0_Project/Characters/Samourai/Texture/Textures/Hair/Stylized_Fur_001_basecolor__1_.uasset

View file

Binary file not shown.

BIN

Content/0_Project/Characters/Samourai/Texture/Textures/Hair/Stylized_Fur_001_height__1_.uasset

View file

Binary file not shown.

BIN

Content/0_Project/Characters/Samourai/Texture/Textures/Hair/Stylized_Fur_001_normal__1_.uasset

View file

Binary file not shown.

BIN

Content/0_Project/Characters/Samourai/Texture/Textures/Hair/Stylized_Fur_001_roughness__1_.uasset

View file

Binary file not shown.

BIN

Content/0_Project/Characters/Samourai/Texture/Textures/Hat/Leather_Weave_001_ambientOcclusion.uasset

View file

Binary file not shown.

BIN

Content/0_Project/Characters/Samourai/Texture/Textures/Hat/Leather_Weave_001_basecolor.uasset

View file

Binary file not shown.

BIN

Content/0_Project/Characters/Samourai/Texture/Textures/Hat/Leather_Weave_001_height.uasset

View file

Binary file not shown.

BIN

Content/0_Project/Characters/Samourai/Texture/Textures/Hat/Leather_Weave_001_normal.uasset

View file

Binary file not shown.

BIN

Content/0_Project/Characters/Samourai/Texture/Textures/Hat/Leather_Weave_001_opacity.uasset

View file

Binary file not shown.

BIN

Content/0_Project/Characters/Samourai/Texture/Textures/Hat/Leather_Weave_001_roughness.uasset

View file

Binary file not shown.

BIN

Content/0_Project/Characters/Samourai/Texture/Textures/Hat/Material_1482.uasset

View file

Binary file not shown.

BIN

Content/0_Project/Characters/Samourai/Texture/Textures/Peau/aiStandardSurface11_Base_Color.uasset

View file

Binary file not shown.

BIN

Content/0_Project/Characters/Samourai/Texture/Textures/Peau/aiStandardSurface11_Height.uasset

View file

Binary file not shown.

BIN

Content/0_Project/Characters/Samourai/Texture/Textures/Peau/aiStandardSurface11_Metallic.uasset

View file

Binary file not shown.

BIN

Content/0_Project/Characters/Samourai/Texture/Textures/Peau/aiStandardSurface11_Normal.uasset

View file

Binary file not shown.

BIN

Content/0_Project/Characters/Samourai/Texture/Textures/Peau/aiStandardSurface11_Normal_OpenGL.uasset

View file

Binary file not shown.

BIN

Content/0_Project/Characters/Samourai/Texture/Textures/Peau/aiStandardSurface11_Roughness.uasset

View file

Binary file not shown.

BIN

Content/0_Project/Characters/Samourai/Texture/Textures/Sword/Blade_AO.uasset

View file

Binary file not shown.

BIN

Content/0_Project/Characters/Samourai/Texture/Textures/Sword/Blade_albedo.uasset

View file

Binary file not shown.

BIN

Content/0_Project/Characters/Samourai/Texture/Textures/Sword/Blade_emissive.uasset

View file

Binary file not shown.

BIN

Content/0_Project/Characters/Samourai/Texture/Textures/Sword/Blade_metallic.uasset

View file

Binary file not shown.

BIN

Content/0_Project/Characters/Samourai/Texture/Textures/Sword/Blade_normal.uasset

View file

Binary file not shown.

BIN

Content/0_Project/Characters/Samourai/Texture/Textures/Sword/Blade_roughness.uasset

View file

Binary file not shown.

BIN

Content/0_Project/Characters/Samourai/Unwrap_Texture_Checker_Material.uasset

View file

Binary file not shown.

BIN

Content/0_Project/Characters/Samourai/aiStandardSurface10.uasset

View file

Binary file not shown.

BIN

Content/0_Project/Characters/Samourai/aiStandardSurface12.uasset

View file

Binary file not shown.

BIN

Content/0_Project/Characters/Samourai/aiStandardSurface13.uasset

View file

Binary file not shown.

BIN

Content/0_Project/Characters/Samourai/aiStandardSurface14.uasset

View file

Binary file not shown.

BIN

Content/0_Project/Core/BaseEnnemies.uasset

View file

Binary file not shown.

BIN

Content/0_Project/Core/SPFunctionLibrary.uasset

View file

Binary file not shown.

BIN

Content/0_Project/Core/SPMacroLibrary.uasset

View file

Binary file not shown.

BIN

Content/0_Project/Core/Tiles/BP_BaseTile.uasset

View file

Binary file not shown.

BIN

Content/0_Project/Core/Tiles/EnnemySpawnerComponent.uasset

View file

Binary file not shown.

BIN

Content/0_Project/Core/Tiles/FirstTile.uasset

View file

Binary file not shown.

BIN

Content/0_Project/Core/Tiles/Tile_Corner_base.uasset

View file

Binary file not shown.

BIN

Content/0_Project/Core/Tiles/Tile_cityA.uasset

View file

Binary file not shown.

BIN

Content/0_Project/Maps/MainMap.umap

View file

Binary file not shown.

BIN

Content/0_Project/Material/MI_RadialProgress.uasset

View file

Binary file not shown.

BIN

Content/0_Project/Material/M_RadialProgress.uasset

View file

Binary file not shown.

BIN

Content/PolyGonSamourai/FBX/Character_Mat.uasset

View file

Binary file not shown.

BIN

Content/PolyGonSamourai/FBX/SK_Character_Samurai_Geisha_01.uasset

View file

Binary file not shown.

BIN

Content/PolyGonSamourai/FBX/SK_Character_Samurai_Geisha_01_PhysicsAsset.uasset

View file

Binary file not shown.

BIN

Content/PolyGonSamourai/FBX/SK_Character_Samurai_Geisha_01_Skeleton.uasset

View file

Binary file not shown.

BIN

Content/PolyGonSamourai/FBX/SK_Character_Samurai_Grunt_01.uasset

View file

Binary file not shown.

BIN

Content/PolyGonSamourai/FBX/SK_Character_Samurai_Grunt_01_PhysicsAsset.uasset

View file

Binary file not shown.

BIN

Content/PolyGonSamourai/FBX/SK_Character_Samurai_Grunt_01_Skeleton.uasset

View file

Binary file not shown.

BIN

Content/PolyGonSamourai/FBX/SK_Character_Samurai_Ninja_01.uasset

View file

Binary file not shown.

BIN

Content/PolyGonSamourai/FBX/SK_Character_Samurai_Ninja_01_PhysicsAsset.uasset

View file

Binary file not shown.

BIN

Content/PolyGonSamourai/FBX/SK_Character_Samurai_Ninja_01_Skeleton.uasset

View file

Binary file not shown.

BIN

Content/PolyGonSamourai/FBX/SK_Character_Samurai_Sensei_01.uasset

View file

Binary file not shown.

BIN

Content/PolyGonSamourai/FBX/SK_Character_Samurai_Sensei_01_PhysicsAsset.uasset

View file

Binary file not shown.

BIN

Content/PolyGonSamourai/FBX/SK_Character_Samurai_Sensei_01_Skeleton.uasset

View file

Binary file not shown.

BIN

Content/PolyGonSamourai/FBX/SK_Character_Samurai_VillageFemale_01.uasset

View file

Binary file not shown.

BIN

Content/PolyGonSamourai/FBX/SK_Character_Samurai_VillageFemale_01_PhysicsAsset.uasset

View file

Binary file not shown.

BIN

Content/PolyGonSamourai/FBX/SK_Character_Samurai_VillageFemale_01_Skeleton.uasset

View file

Binary file not shown.

BIN

Content/PolyGonSamourai/FBX/SK_Character_Samurai_VillageMale_01.uasset

View file

Binary file not shown.

BIN

Content/PolyGonSamourai/FBX/SK_Character_Samurai_VillageMale_01_PhysicsAsset.uasset

View file

Binary file not shown.

BIN

Content/PolyGonSamourai/FBX/SK_Character_Samurai_VillageMale_01_Skeleton.uasset

View file

Binary file not shown.

BIN

Content/PolyGonSamourai/FBX/SK_Character_Samurai_Warrior_01.uasset

View file

Binary file not shown.

BIN

Content/PolyGonSamourai/FBX/SK_Character_Samurai_Warrior_01_PhysicsAsset.uasset

View file

Binary file not shown.

BIN

Content/PolyGonSamourai/FBX/SK_Character_Samurai_Warrior_01_Skeleton.uasset

View file

Binary file not shown.

BIN

Content/PolyGonSamourai/FBX/SM_Bld_Base_Large_01.uasset

View file

Binary file not shown.

BIN

Content/PolyGonSamourai/FBX/SM_Bld_Base_Large_02.uasset

View file

Binary file not shown.

Some files were not shown because too many files have changed in this diff Show more