Main Merge

This commit is contained in:
benroshio
2024-04-08 21:26:44 -04:00
194 changed files with 15366 additions and 22942 deletions

Binary file not shown.

Binary file not shown.

View File

@ -1,3 +1,4 @@
<<<<<<< HEAD
C:\jk\workspace\Build__2.2__Unreal_Win\integrations\UE4\temp\FMODStudio\HostProject\Plugins\FMODStudio\Source\FMODStudio\Classes\FMODAmbientSound.h
C:\jk\workspace\Build__2.2__Unreal_Win\integrations\UE4\temp\FMODStudio\HostProject\Plugins\FMODStudio\Source\FMODStudio\Classes\FMODAnimNotifyPlay.h
C:\jk\workspace\Build__2.2__Unreal_Win\integrations\UE4\temp\FMODStudio\HostProject\Plugins\FMODStudio\Source\FMODStudio\Classes\FMODAsset.h
@ -18,3 +19,25 @@ C:\jk\workspace\Build__2.2__Unreal_Win\integrations\UE4\temp\FMODStudio\HostProj
C:\jk\workspace\Build__2.2__Unreal_Win\integrations\UE4\temp\FMODStudio\HostProject\Plugins\FMODStudio\Source\FMODStudio\Private\Sequencer\FMODEventControlTrack.h
C:\jk\workspace\Build__2.2__Unreal_Win\integrations\UE4\temp\FMODStudio\HostProject\Plugins\FMODStudio\Source\FMODStudio\Private\Sequencer\FMODEventParameterSectionTemplate.h
C:\jk\workspace\Build__2.2__Unreal_Win\integrations\UE4\temp\FMODStudio\HostProject\Plugins\FMODStudio\Source\FMODStudio\Private\Sequencer\FMODEventParameterTrack.h
=======
D:\GitHub\Personal Projects\Illusion-UE5\hwanyoung2\Plugins\FMODStudio\Source\FMODStudio\Classes\FMODAmbientSound.h
D:\GitHub\Personal Projects\Illusion-UE5\hwanyoung2\Plugins\FMODStudio\Source\FMODStudio\Classes\FMODAsset.h
D:\GitHub\Personal Projects\Illusion-UE5\hwanyoung2\Plugins\FMODStudio\Source\FMODStudio\Classes\FMODAnimNotifyPlay.h
D:\GitHub\Personal Projects\Illusion-UE5\hwanyoung2\Plugins\FMODStudio\Source\FMODStudio\Classes\FMODBank.h
D:\GitHub\Personal Projects\Illusion-UE5\hwanyoung2\Plugins\FMODStudio\Source\FMODStudio\Classes\FMODPort.h
D:\GitHub\Personal Projects\Illusion-UE5\hwanyoung2\Plugins\FMODStudio\Source\FMODStudio\Classes\FMODAudioComponent.h
D:\GitHub\Personal Projects\Illusion-UE5\hwanyoung2\Plugins\FMODStudio\Source\FMODStudio\Classes\FMODSnapshotReverb.h
D:\GitHub\Personal Projects\Illusion-UE5\hwanyoung2\Plugins\FMODStudio\Source\FMODStudio\Classes\FMODBus.h
D:\GitHub\Personal Projects\Illusion-UE5\hwanyoung2\Plugins\FMODStudio\Source\FMODStudio\Classes\FMODSettings.h
D:\GitHub\Personal Projects\Illusion-UE5\hwanyoung2\Plugins\FMODStudio\Source\FMODStudio\Classes\FMODEvent.h
D:\GitHub\Personal Projects\Illusion-UE5\hwanyoung2\Plugins\FMODStudio\Source\FMODStudio\Classes\FMODSnapshot.h
D:\GitHub\Personal Projects\Illusion-UE5\hwanyoung2\Plugins\FMODStudio\Source\FMODStudio\Classes\FMODBlueprintStatics.h
D:\GitHub\Personal Projects\Illusion-UE5\hwanyoung2\Plugins\FMODStudio\Source\FMODStudio\Classes\FMODVCA.h
D:\GitHub\Personal Projects\Illusion-UE5\hwanyoung2\Plugins\FMODStudio\Source\FMODStudio\Private\FMODAssetLookup.h
D:\GitHub\Personal Projects\Illusion-UE5\hwanyoung2\Plugins\FMODStudio\Source\FMODStudio\Private\FMODBankLookup.h
D:\GitHub\Personal Projects\Illusion-UE5\hwanyoung2\Plugins\FMODStudio\Source\FMODStudio\Private\Sequencer\FMODEventControlSection.h
D:\GitHub\Personal Projects\Illusion-UE5\hwanyoung2\Plugins\FMODStudio\Source\FMODStudio\Private\Sequencer\FMODEventParameterSectionTemplate.h
D:\GitHub\Personal Projects\Illusion-UE5\hwanyoung2\Plugins\FMODStudio\Source\FMODStudio\Private\Sequencer\FMODEventControlTrack.h
D:\GitHub\Personal Projects\Illusion-UE5\hwanyoung2\Plugins\FMODStudio\Source\FMODStudio\Private\Sequencer\FMODEventParameterTrack.h
D:\GitHub\Personal Projects\Illusion-UE5\hwanyoung2\Plugins\FMODStudio\Source\FMODStudio\Private\Sequencer\FMODEventControlSectionTemplate.h
>>>>>>> origin/main