Compare commits

base: lucastucious:801459132e5342c73fa17da77dc1e65e0298272a

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:8f32eadb41205642c3b4b59145cf39877c12f542

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

6 commits

801459132e ... 8f32eadb41

Author	SHA1	Message	Date
LUCASTUCIOUS@Playwing	8f32eadb41	UpdateDLL	2020-08-06 14:11:56 +02:00
LUCASTUCIOUS@Playwing	99113b8dbf	Merge branch 'develop' into testSamourai	2020-08-06 14:07:06 +02:00
LUCASTUCIOUS@Playwing	669b611879	Update Waypoint	2020-08-06 14:06:21 +02:00
Hugo	7cfec47789	adding a city tile map for the test	2020-08-06 13:10:58 +02:00
LUCASTUCIOUS@Playwing	f65abd5a9c	Test Samourai	2020-08-06 10:48:18 +02:00
LUCASTUCIOUS@Playwing	d38bea02ee	Add RadialProgressBar	2020-08-06 01:15:20 +02:00

545 changed files with 69 additions and 0 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

View file

Binary file not shown.

BIN

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

View file

Binary file not shown.

BIN

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

View file

Binary file not shown.

BIN

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

View file

Binary file not shown.

BIN

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

View file

Binary file not shown.

BIN

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

View file

Binary file not shown.

BIN

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

View file

Binary file not shown.

BIN

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

View file

Binary file not shown.

BIN

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

View file

Binary file not shown.

BIN

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

View file

Binary file not shown.

BIN

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

View file

Binary file not shown.

BIN

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

View file

Binary file not shown.

BIN

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

View file

Binary file not shown.

BIN

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

View file

Binary file not shown.

BIN

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

View file

Binary file not shown.

BIN

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

View file

Binary file not shown.

BIN

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

View file

Binary file not shown.

BIN

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

View file

Binary file not shown.

BIN

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

View file

Binary file not shown.

BIN

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

View file

Binary file not shown.

BIN

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

View file

Binary file not shown.

BIN

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

View file

Binary file not shown.

BIN

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

View file

Binary file not shown.

BIN

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

View file

Binary file not shown.

BIN

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

View file

Binary file not shown.

BIN

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

View file

Binary file not shown.

BIN

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

View file

Binary file not shown.

BIN

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

View file

Binary file not shown.

BIN

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

View file

Binary file not shown.

BIN

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

View file

Binary file not shown.

BIN

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

View file

Binary file not shown.

BIN

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

View file

Binary file not shown.

BIN

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

View file

Binary file not shown.

BIN

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

View file

Binary file not shown.

BIN

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

View file

Binary file not shown.

BIN

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

View file

Binary file not shown.

BIN

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

View file

Binary file not shown.

BIN

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

View file

Binary file not shown.

BIN

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

View file

Binary file not shown.

BIN

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

View file

Binary file not shown.

BIN

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

View file

Binary file not shown.

BIN

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

View file

Binary file not shown.

BIN

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

View file

Binary file not shown.

BIN

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

View file

Binary file not shown.

BIN

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

View file

Binary file not shown.

BIN

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

View file

Binary file not shown.

BIN

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

View file

Binary file not shown.

BIN

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

View file

Binary file not shown.

BIN

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

View file

Binary file not shown.

BIN

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

View file

Binary file not shown.

BIN

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

View file

Binary file not shown.

BIN

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

View file

Binary file not shown.

BIN

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

View file

Binary file not shown.

BIN

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

View file

Binary file not shown.

BIN

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

View file

Binary file not shown.

BIN

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

View file

Binary file not shown.

BIN

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

View file

Binary file not shown.

BIN

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

View file

Binary file not shown.

BIN

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

View file

Binary file not shown.

BIN

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

View file

Binary file not shown.

BIN

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

View file

Binary file not shown.

BIN

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

View file

Binary file not shown.

BIN

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

View file

Binary file not shown.

BIN

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

View file

Binary file not shown.

BIN

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

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 Normal file

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 Normal file

View file

Binary file not shown.

BIN

Content/0_Project/Material/M_RadialProgress.uasset Normal file

View file

Binary file not shown.

BIN

Content/PolyGonSamourai/FBX/Character_Mat.uasset Normal file

View file

Binary file not shown.

BIN

Content/PolyGonSamourai/FBX/SK_Character_Samurai_Geisha_01.uasset Normal file

View file

Binary file not shown.

BIN

Content/PolyGonSamourai/FBX/SK_Character_Samurai_Geisha_01_PhysicsAsset.uasset Normal file

View file

Binary file not shown.

BIN

Content/PolyGonSamourai/FBX/SK_Character_Samurai_Geisha_01_Skeleton.uasset Normal file

View file

Binary file not shown.

BIN

Content/PolyGonSamourai/FBX/SK_Character_Samurai_Grunt_01.uasset Normal file

View file

Binary file not shown.

BIN

Content/PolyGonSamourai/FBX/SK_Character_Samurai_Grunt_01_PhysicsAsset.uasset Normal file

View file

Binary file not shown.

BIN

Content/PolyGonSamourai/FBX/SK_Character_Samurai_Grunt_01_Skeleton.uasset Normal file

View file

Binary file not shown.

BIN

Content/PolyGonSamourai/FBX/SK_Character_Samurai_Ninja_01.uasset Normal file

View file

Binary file not shown.

BIN

Content/PolyGonSamourai/FBX/SK_Character_Samurai_Ninja_01_PhysicsAsset.uasset Normal file

View file

Binary file not shown.

BIN

Content/PolyGonSamourai/FBX/SK_Character_Samurai_Ninja_01_Skeleton.uasset Normal file

View file

Binary file not shown.

BIN

Content/PolyGonSamourai/FBX/SK_Character_Samurai_Sensei_01.uasset Normal file

View file

Binary file not shown.

BIN

Content/PolyGonSamourai/FBX/SK_Character_Samurai_Sensei_01_PhysicsAsset.uasset Normal file

View file

Binary file not shown.

BIN

Content/PolyGonSamourai/FBX/SK_Character_Samurai_Sensei_01_Skeleton.uasset Normal file

View file

Binary file not shown.

BIN

Content/PolyGonSamourai/FBX/SK_Character_Samurai_VillageFemale_01.uasset Normal file

View file

Binary file not shown.

BIN

Content/PolyGonSamourai/FBX/SK_Character_Samurai_VillageFemale_01_PhysicsAsset.uasset Normal file

View file

Binary file not shown.

BIN

Content/PolyGonSamourai/FBX/SK_Character_Samurai_VillageFemale_01_Skeleton.uasset Normal file

View file

Binary file not shown.

BIN

Content/PolyGonSamourai/FBX/SK_Character_Samurai_VillageMale_01.uasset Normal file

View file

Binary file not shown.

BIN

Content/PolyGonSamourai/FBX/SK_Character_Samurai_VillageMale_01_PhysicsAsset.uasset Normal file

View file

Binary file not shown.

BIN

Content/PolyGonSamourai/FBX/SK_Character_Samurai_VillageMale_01_Skeleton.uasset Normal file

View file

Binary file not shown.

BIN

Content/PolyGonSamourai/FBX/SK_Character_Samurai_Warrior_01.uasset Normal file

View file

Binary file not shown.

BIN

Content/PolyGonSamourai/FBX/SK_Character_Samurai_Warrior_01_PhysicsAsset.uasset Normal file

View file

Binary file not shown.

BIN

Content/PolyGonSamourai/FBX/SK_Character_Samurai_Warrior_01_Skeleton.uasset Normal file

View file

Binary file not shown.

BIN

Content/PolyGonSamourai/FBX/SM_Bld_Base_Large_01.uasset Normal file

View file

Binary file not shown.

BIN

Content/PolyGonSamourai/FBX/SM_Bld_Base_Large_02.uasset Normal file

View file

Binary file not shown.

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