Fix InfiniteLoop

Merge remote-tracking branch 'origin/develop' into develop
SOUND: Update Menu Music
2020-08-09 09:56:13 +02:00 · 2020-08-09 09:41:50 +02:00 · 2020-08-08 21:41:58 +02:00 · 2020-08-08 21:03:24 +02:00 · 2020-08-08 21:02:46 +02:00 · 2020-08-08 16:24:16 +02:00
20 changed files with 0 additions and 0 deletions
--- a/Binaries/Win64/UE4Editor-JamTeacher.dll
+++ b/Binaries/Win64/UE4Editor-JamTeacher.dll
--- a/Binaries/Win64/UE4Editor-JamTeacher.pdb
+++ b/Binaries/Win64/UE4Editor-JamTeacher.pdb
--- a/Content/0_Project/Characters/Samourai/Test/Great_Sword_High_Spin_Attack.uasset
+++ b/Content/0_Project/Characters/Samourai/Test/Great_Sword_High_Spin_Attack.uasset
--- a/Content/0_Project/Characters/Samourai/Test/Great_Sword_Run.uasset
+++ b/Content/0_Project/Characters/Samourai/Test/Great_Sword_Run.uasset
--- a/Content/0_Project/Characters/Samourai/Test/Great_Sword_Slash.uasset
+++ b/Content/0_Project/Characters/Samourai/Test/Great_Sword_Slash.uasset
--- a/Content/0_Project/Core/SPMacroLibrary.uasset
+++ b/Content/0_Project/Core/SPMacroLibrary.uasset
--- a/Content/0_Project/Core/Tiles/BP_BaseTile.uasset
+++ b/Content/0_Project/Core/Tiles/BP_BaseTile.uasset
--- a/Content/0_Project/Core/Tiles/Tile_bridge.uasset
+++ b/Content/0_Project/Core/Tiles/Tile_bridge.uasset
--- a/Content/0_Project/Maps/MainMap.umap
+++ b/Content/0_Project/Maps/MainMap.umap
--- a/Content/0_Project/Maps/MainMenu.umap
+++ b/Content/0_Project/Maps/MainMenu.umap
--- a/Content/0_Project/Material/M_GroundA.uasset
+++ b/Content/0_Project/Material/M_GroundA.uasset
--- a/Content/0_Project/Material/SuperSecretPostProcess/Lowres_PP_menu.uasset
+++ b/Content/0_Project/Material/SuperSecretPostProcess/Lowres_PP_menu.uasset
--- a/Content/0_Project/Material/SuperSecretPostProcess/SuperSecretShader/PP_Cellshader_Menu.uasset
+++ b/Content/0_Project/Material/SuperSecretPostProcess/SuperSecretShader/PP_Cellshader_Menu.uasset
--- a/Content/FMOD/Desktop/Ambience.bank
+++ b/Content/FMOD/Desktop/Ambience.bank
--- a/Content/FMOD/Desktop/Master.bank
+++ b/Content/FMOD/Desktop/Master.bank
--- a/Content/FMOD/Desktop/Master.strings.bank
+++ b/Content/FMOD/Desktop/Master.strings.bank
--- a/Content/FMOD/Desktop/Music.bank
+++ b/Content/FMOD/Desktop/Music.bank
--- a/Content/FMOD/Desktop/SFX.bank
+++ b/Content/FMOD/Desktop/SFX.bank
--- a/Plugins/SpeechRecognition/Binaries/Win64/UE4Editor-SpeechRecognition.dll
+++ b/Plugins/SpeechRecognition/Binaries/Win64/UE4Editor-SpeechRecognition.dll
--- a/Plugins/SpeechRecognition/Binaries/Win64/UE4Editor-SpeechRecognition.pdb
+++ b/Plugins/SpeechRecognition/Binaries/Win64/UE4Editor-SpeechRecognition.pdb
Author	SHA1	Message	Date
LUCASTUCIOUS@Playwing	b2de7f6358	Fix InfiniteLoop	2020-08-09 09:56:13 +02:00
LUCASTUCIOUS@Playwing	33002e7624	Merge remote-tracking branch 'origin/develop' into develop	2020-08-09 09:41:50 +02:00
Vincent Sergent	3afead7c37	SOUND: Update Menu Music FMOD	2020-08-08 21:41:58 +02:00
Vincent Sergent	f51220581e	Merge remote-tracking branch 'origin/develop' into develop	2020-08-08 21:03:24 +02:00
Vincent Sergent	26739f0242	SOUND: Update Music & Parameters FMOD & UNREAL	2020-08-08 21:02:46 +02:00
Hugo	80edabd94a	Working on the MainMenu	2020-08-08 16:24:16 +02:00
LUCASTUCIOUS@Playwing	408d1d5926	Merge branch 'FIX-InfiniteLoop' into develop	2020-08-08 11:51:17 +02:00
Vincent Sergent	ac7a7fba26	SOUND: Add Beta Musics & Parameters Add Music in Menu & Level Map + Update Parameters (Local to Global) + Add SlowMotion on Hit Sounds + Parameters Integration (Target & SlowMotion to Music Level Sequence)	2020-08-07 22:36:31 +02:00
Vincent Sergent	fd95a80e37	SOUND: Add Footsteps (FMOD) Wood Surface	2020-08-07 20:02:23 +02:00
Vincent Sergent	df5623aa7b	SOUND: Add Foosteps + Sword Hit (UNREAL)	2020-08-07 18:45:16 +02:00
Vincent Sergent	467c309604	SOUNd: Add Footsteps (FMOD)	2020-08-07 18:01:41 +02:00