Merge branch 'master' of https://cgvrgit.ulno.net/Kolbakilu/ScaryBogGame

Fix main menu closing.
Merge branch 'master' of cgvrgit.ulno.net:Kolbakilu/ScaryBogGame
2025-01-25 17:51:35 +02:00 · 2025-01-25 17:51:27 +02:00 · 2025-01-25 17:35:48 +02:00 · 2025-01-25 17:35:28 +02:00 · 2025-01-25 17:33:51 +02:00 · 2025-01-25 15:30:51 +00:00
15 changed files with 43 additions and 4 deletions
--- a/Content/Custom/Audio/Cue_atmoloop0.uasset
+++ b/Content/Custom/Audio/Cue_atmoloop0.uasset
--- a/Content/Custom/Audio/Cue_titletrack.uasset
+++ b/Content/Custom/Audio/Cue_titletrack.uasset
--- a/Content/Custom/Audio/atmoloop0.uasset
+++ b/Content/Custom/Audio/atmoloop0.uasset
--- a/Content/Custom/Audio/atmoloop1.uasset
+++ b/Content/Custom/Audio/atmoloop1.uasset
--- a/Content/Custom/Audio/atmoloop2.uasset
+++ b/Content/Custom/Audio/atmoloop2.uasset
--- a/Content/Custom/Audio/flööt0.uasset
+++ b/Content/Custom/Audio/flööt0.uasset
--- a/Content/Custom/Audio/flööt1.uasset
+++ b/Content/Custom/Audio/flööt1.uasset
--- a/Content/Custom/Audio/flööt1_5.uasset
+++ b/Content/Custom/Audio/flööt1_5.uasset
--- a/Content/Custom/Audio/flööt2.uasset
+++ b/Content/Custom/Audio/flööt2.uasset
--- a/Content/Custom/Audio/flööt2_5.uasset
+++ b/Content/Custom/Audio/flööt2_5.uasset
--- a/Content/Custom/Audio/titletrack.uasset
+++ b/Content/Custom/Audio/titletrack.uasset
--- a/Content/Custom/Blueprints/BP_AudioManager.uasset
+++ b/Content/Custom/Blueprints/BP_AudioManager.uasset
--- a/Content/Custom/Maps/BogEnvTest.umap
+++ b/Content/Custom/Maps/BogEnvTest.umap
--- a/Content/Custom/Maps/GameMap.umap
+++ b/Content/Custom/Maps/GameMap.umap
--- a/Content/FirstPerson/Blueprints/BP_FirstPersonCharacter.uasset
+++ b/Content/FirstPerson/Blueprints/BP_FirstPersonCharacter.uasset
Author	SHA1	Message	Date
kolbakilu	9a84b061f1	Merge branch 'master' of https://cgvrgit.ulno.net/Kolbakilu/ScaryBogGame	2025-01-25 17:51:35 +02:00
kolbakilu	51d469a77c	Fix main menu closing.	2025-01-25 17:51:27 +02:00
HSellis	8a67c9f0a0	Merge branch 'master' of cgvrgit.ulno.net:Kolbakilu/ScaryBogGame	2025-01-25 17:35:48 +02:00
HSellis	ac8f090ffa	audio	2025-01-25 17:35:28 +02:00
kolbakilu	35a197306d	Fix first person character bp.	2025-01-25 17:33:51 +02:00
Kolbakilu	7abc403a08	Merge pull request 'Add main menu.' (#2 ) from feature-main-menu into master Reviewed-on: #2	2025-01-25 15:30:51 +00:00