Merge branch 'DialogueSystemMerge'

Browse Source

...

This commit is contained in:

Connor Elsworth 2024-03-05 04:23:31 -05:00

parent 6308b69eb1 c80c03e414

commit e6daca4435

52 changed files with 142 additions and 16 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

BIN

Content/Blueprints/BP_GameController.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

Content/Blueprints/Enemys/Basics/BP_Enemy_Base.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

Content/Blueprints/LevelDesign/EventSystem/BP_Event.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

Content/Blueprints/LevelDesign/EventSystem/Dialogue/Enum_Dialogue.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Content/Blueprints/LevelDesign/EventSystem/Dialogue/EventStruct_Dialogue.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Content/Blueprints/LevelDesign/EventSystem/EventStruct.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

Content/Blueprints/LevelDesign/World/BP_EnemySpawningHut.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

Content/Blueprints/LevelDesign/World/BP_Interact.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

Content/Blueprints/Player/DialogueSystem/BPI_Dialogue.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Content/Blueprints/Player/DialogueSystem/BP_DialogueController.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Content/Blueprints/Player/DialogueSystem/DT_Dialogue.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Content/Blueprints/Player/DialogueSystem/Struct_Dialogue.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Content/Blueprints/SaveGame/BP_SaveGame.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

Content/Blueprints/SaveGame/World/WorldSaveStruct.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

Content/Blueprints/SaveGame/World/WorldSaveStruct_Interactables.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

Content/Maps/L_ConnorTest1.umap

View File

Binary file not shown.

BIN

Content/Sounds/Insurrectionist/RawVoiceLines/Posters/A_Insr_Birds_Take1.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Content/Sounds/Insurrectionist/RawVoiceLines/Posters/A_Insr_Birds_Take2.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Content/Sounds/Insurrectionist/RawVoiceLines/Posters/A_Insr_Birds_Take3.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Content/Sounds/Insurrectionist/RawVoiceLines/Posters/A_Insr_Birds_Take4.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Content/Sounds/Insurrectionist/RawVoiceLines/Posters/A_Insr_Boba_Take1.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Content/Sounds/Insurrectionist/RawVoiceLines/Posters/A_Insr_Boba_Take2.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Content/Sounds/Insurrectionist/RawVoiceLines/Posters/A_Insr_Boba_Take3.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Content/Sounds/Insurrectionist/RawVoiceLines/Posters/A_Insr_Boba_Take4.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Content/Sounds/Insurrectionist/RawVoiceLines/StartCombat/A_Insr_StartCombat_Take1.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Content/Sounds/Insurrectionist/RawVoiceLines/StartCombat/A_Insr_StartCombat_Take2.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Content/Sounds/Insurrectionist/RawVoiceLines/StartCombat/A_Insr_StartCombat_Take3.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Content/Sounds/Insurrectionist/RawVoiceLines/Tutorial/A_Insr_Tutorial_Dash_Take1.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Content/Sounds/Insurrectionist/RawVoiceLines/Tutorial/A_Insr_Tutorial_Dash_Take2.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Content/Sounds/Insurrectionist/RawVoiceLines/Tutorial/A_Insr_Tutorial_Take1.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Content/Sounds/Insurrectionist/RawVoiceLines/Tutorial/A_Insr_Tutorial_Take2.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Content/Sounds/Insurrectionist/RawVoiceLines/Tutorial/A_Insr_Tutorial_Take3.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Content/Sounds/Insurrectionist/RawVoiceLines/Tutorial/A_Insr_Tutorial_Turret_Take1.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Content/Sounds/Insurrectionist/RawVoiceLines/Tutorial/A_Insr_Tutorial_Turret_Take2.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Content/Sounds/Insurrectionist/RawVoiceLines/Tutorial/A_Insr_Tutorial_Turret_Take3.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Content/Sounds/Insurrectionist/RawVoiceLines/Tutorial/Lab/A_Insr_Lab_1_Take1.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Content/Sounds/Insurrectionist/RawVoiceLines/Tutorial/Lab/A_Insr_Lab_1_Take2.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Content/Sounds/Insurrectionist/RawVoiceLines/Tutorial/Lab/A_Insr_Lab_1_Take3.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Content/Sounds/Insurrectionist/RawVoiceLines/Tutorial/Lab/A_Insr_Lab_1_Take4.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Content/Sounds/Insurrectionist/RawVoiceLines/Tutorial/Lab/A_Insr_Lab_1_Take5.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Content/Sounds/Insurrectionist/RawVoiceLines/Tutorial/Lab/A_Insr_Lab_2_Take1.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Content/Sounds/Insurrectionist/RawVoiceLines/Tutorial/Lab/A_Insr_Lab_2_Take2.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Content/Sounds/Insurrectionist/RawVoiceLines/Tutorial/Lab/A_Insr_Lab_2_Take3.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Content/Sounds/Insurrectionist/RawVoiceLines/Tutorial/Lab/A_Insr_Lab_3_Take1.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Content/Sounds/Insurrectionist/RawVoiceLines/Tutorial/Lab/A_Insr_Lab_3_Take2.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Content/Sounds/Insurrectionist/RawVoiceLines/Tutorial/Lab/A_Insr_Lab_3_Take3.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Content/Sounds/Insurrectionist/RawVoiceLines/Tutorial/Lab/A_Insr_Lab_4_Take1.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Content/Sounds/Insurrectionist/RawVoiceLines/Tutorial/Lab/A_Insr_Lab_4_Take2.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Content/Sounds/Insurrectionist/RawVoiceLines/Tutorial/Lab/A_Insr_Lab_4_Take3.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Content/Sounds/Insurrectionist/RawVoiceLines/Tutorial/Lab/A_Insr_Lab_5_Take1.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Content/Sounds/Insurrectionist/RawVoiceLines/Tutorial/Lab/A_Insr_Lab_5_Take2.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Content/Sounds/Insurrectionist/RawVoiceLines/Tutorial/Lab/A_Insr_Lab_5_Take3.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.