Merge branch 'master' of https://cgvrgit.ulno.net/Kolbakilu/ScaryBogGame into feature-main-menu

Add main menu.
bogfather detects collision with player
2025-01-25 17:30:13 +02:00 · 2025-01-25 17:20:06 +02:00 · 2025-01-25 16:46:12 +02:00 · 2025-01-25 15:38:26 +02:00 · 2025-01-25 15:38:11 +02:00 · 2025-01-25 15:25:20 +02:00
290 changed files with 70 additions and 1 deletions
--- a/.gitattributes
+++ b/.gitattributes
@@ -0,0 +1,31 @@
+# Auto detect text files and perform LF normalization
+* text=auto
+# UE file types
+*.uasset filter=lfs diff=lfs merge=lfs -text
+*.umap filter=lfs diff=lfs merge=lfs -text
+*.udk filter=lfs diff=lfs merge=lfs -text
+*.upk filter=lfs diff=lfs merge=lfs -text
+# Anything in `/RawContent` dir. [You create this directory in your projects root folder]
+/RawContent/**/* filter=lfs diff=lfs merge=lfs -text
+# Raw Content types
+*.blend filter=lfs diff=lfs merge=lfs -text
+*.duf filter=lfs diff=lfs merge=lfs -text
+*.bin.fbx filter=lfs diff=lfs merge=lfs -text
+*.fbx filter=lfs diff=lfs merge=lfs -text
+*.obj filter=lfs diff=lfs merge=lfs -text
+*.png filter=lfs diff=lfs merge=lfs -text
+*.jpg filter=lfs diff=lfs merge=lfs -text
+*.jpeg filter=lfs diff=lfs merge=lfs -text
+*.hdr filter=lfs diff=lfs merge=lfs -text
+*.exr filter=lfs diff=lfs merge=lfs -text
+*.mp3 filter=lfs diff=lfs merge=lfs -text
+*.mp4 filter=lfs diff=lfs merge=lfs -text
+*.mov filter=lfs diff=lfs merge=lfs -text
+*.wav filter=lfs diff=lfs merge=lfs -text
+*.3ds filter=lfs diff=lfs merge=lfs -text
+*.psd filter=lfs diff=lfs merge=lfs -text
+*.mb filter=lfs diff=lfs merge=lfs -text
+*.tga filter=lfs diff=lfs merge=lfs -text
+*.cubemap filter=lfs diff=lfs merge=lfs -text
+*.tif filter=lfs diff=lfs merge=lfs -text
+*.xcf filter=lfs diff=lfs merge=lfs -text
--- a/Config/DefaultEditor.ini
+++ b/Config/DefaultEditor.ini
--- a/Content/Custom/Blueprints/BPI_Interactable.uasset
+++ b/Content/Custom/Blueprints/BPI_Interactable.uasset
--- a/Content/Custom/Blueprints/BP_BogFather.uasset
+++ b/Content/Custom/Blueprints/BP_BogFather.uasset
--- a/Content/Custom/Blueprints/BP_BogFatherAIController.uasset
+++ b/Content/Custom/Blueprints/BP_BogFatherAIController.uasset
--- a/Content/Custom/Blueprints/BP_Collectable.uasset
+++ b/Content/Custom/Blueprints/BP_Collectable.uasset
--- a/Content/Custom/Blueprints/CallLevelEvent.uasset
+++ b/Content/Custom/Blueprints/CallLevelEvent.uasset
--- a/Content/Custom/Maps/BogEnvTest.umap
+++ b/Content/Custom/Maps/BogEnvTest.umap
--- a/Content/Custom/Materials/M_Collectible.uasset
+++ b/Content/Custom/Materials/M_Collectible.uasset
--- a/Content/Custom/Materials/M_CollectibleEmissive.uasset
+++ b/Content/Custom/Materials/M_CollectibleEmissive.uasset
--- a/Content/Custom/Menus/WBP_UI.uasset
+++ b/Content/Custom/Menus/WBP_UI.uasset
--- a/Content/Custom/Menus/WP_Main_Menu.uasset
+++ b/Content/Custom/Menus/WP_Main_Menu.uasset
--- a/Content/Custom/WBP_CollectibleCount.uasset
+++ b/Content/Custom/WBP_CollectibleCount.uasset
--- a/Content/FPWeapon/Mesh/SK_Lamp.uasset
+++ b/Content/FPWeapon/Mesh/SK_Lamp.uasset
--- a/Content/FirstPerson/Blueprints/BP_FirstPersonCharacter.uasset
+++ b/Content/FirstPerson/Blueprints/BP_FirstPersonCharacter.uasset
--- a/Content/FirstPerson/Blueprints/BP_Weapon_Component.uasset
+++ b/Content/FirstPerson/Blueprints/BP_Weapon_Component.uasset
--- a/Content/FirstPerson/Maps/FirstPersonMap.umap
+++ b/Content/FirstPerson/Maps/FirstPersonMap.umap
--- a/Content/StarterContent/Architecture/Floor_400x400.uasset
+++ b/Content/StarterContent/Architecture/Floor_400x400.uasset
--- a/Content/StarterContent/Architecture/Pillar_50x500.uasset
+++ b/Content/StarterContent/Architecture/Pillar_50x500.uasset
--- a/Content/StarterContent/Architecture/SM_AssetPlatform.uasset
+++ b/Content/StarterContent/Architecture/SM_AssetPlatform.uasset
--- a/Content/StarterContent/Architecture/Wall_400x200.uasset
+++ b/Content/StarterContent/Architecture/Wall_400x200.uasset
--- a/Content/StarterContent/Architecture/Wall_400x300.uasset
+++ b/Content/StarterContent/Architecture/Wall_400x300.uasset
--- a/Content/StarterContent/Architecture/Wall_400x400.uasset
+++ b/Content/StarterContent/Architecture/Wall_400x400.uasset
--- a/Content/StarterContent/Architecture/Wall_500x500.uasset
+++ b/Content/StarterContent/Architecture/Wall_500x500.uasset
--- a/Content/StarterContent/Architecture/Wall_Door_400x300.uasset
+++ b/Content/StarterContent/Architecture/Wall_Door_400x300.uasset
--- a/Content/StarterContent/Architecture/Wall_Door_400x400.uasset
+++ b/Content/StarterContent/Architecture/Wall_Door_400x400.uasset
--- a/Content/StarterContent/Architecture/Wall_Window_400x300.uasset
+++ b/Content/StarterContent/Architecture/Wall_Window_400x300.uasset
--- a/Content/StarterContent/Architecture/Wall_Window_400x400.uasset
+++ b/Content/StarterContent/Architecture/Wall_Window_400x400.uasset
--- a/Content/StarterContent/Audio/Collapse01.uasset
+++ b/Content/StarterContent/Audio/Collapse01.uasset
--- a/Content/StarterContent/Audio/Collapse02.uasset
+++ b/Content/StarterContent/Audio/Collapse02.uasset
--- a/Content/StarterContent/Audio/Collapse_Cue.uasset
+++ b/Content/StarterContent/Audio/Collapse_Cue.uasset
--- a/Content/StarterContent/Audio/Explosion01.uasset
+++ b/Content/StarterContent/Audio/Explosion01.uasset
--- a/Content/StarterContent/Audio/Explosion02.uasset
+++ b/Content/StarterContent/Audio/Explosion02.uasset
--- a/Content/StarterContent/Audio/Explosion_Cue.uasset
+++ b/Content/StarterContent/Audio/Explosion_Cue.uasset
--- a/Content/StarterContent/Audio/Fire01.uasset
+++ b/Content/StarterContent/Audio/Fire01.uasset
--- a/Content/StarterContent/Audio/Fire01_Cue.uasset
+++ b/Content/StarterContent/Audio/Fire01_Cue.uasset
--- a/Content/StarterContent/Audio/Fire_Sparks01.uasset
+++ b/Content/StarterContent/Audio/Fire_Sparks01.uasset
--- a/Content/StarterContent/Audio/Fire_Sparks01_Cue.uasset
+++ b/Content/StarterContent/Audio/Fire_Sparks01_Cue.uasset
--- a/Content/StarterContent/Audio/Light01.uasset
+++ b/Content/StarterContent/Audio/Light01.uasset
--- a/Content/StarterContent/Audio/Light01_Cue.uasset
+++ b/Content/StarterContent/Audio/Light01_Cue.uasset
--- a/Content/StarterContent/Audio/Light02.uasset
+++ b/Content/StarterContent/Audio/Light02.uasset
--- a/Content/StarterContent/Audio/Light02_Cue.uasset
+++ b/Content/StarterContent/Audio/Light02_Cue.uasset
--- a/Content/StarterContent/Audio/Smoke01.uasset
+++ b/Content/StarterContent/Audio/Smoke01.uasset
--- a/Content/StarterContent/Audio/Smoke01_Cue.uasset
+++ b/Content/StarterContent/Audio/Smoke01_Cue.uasset
--- a/Content/StarterContent/Audio/Starter_Background_Cue.uasset
+++ b/Content/StarterContent/Audio/Starter_Background_Cue.uasset
--- a/Content/StarterContent/Audio/Starter_Birds01.uasset
+++ b/Content/StarterContent/Audio/Starter_Birds01.uasset
--- a/Content/StarterContent/Audio/Starter_Music01.uasset
+++ b/Content/StarterContent/Audio/Starter_Music01.uasset
--- a/Content/StarterContent/Audio/Starter_Music_Cue.uasset
+++ b/Content/StarterContent/Audio/Starter_Music_Cue.uasset
--- a/Content/StarterContent/Audio/Starter_Wind05.uasset
+++ b/Content/StarterContent/Audio/Starter_Wind05.uasset
--- a/Content/StarterContent/Audio/Starter_Wind06.uasset
+++ b/Content/StarterContent/Audio/Starter_Wind06.uasset
--- a/Content/StarterContent/Audio/Steam01.uasset
+++ b/Content/StarterContent/Audio/Steam01.uasset
--- a/Content/StarterContent/Audio/Steam01_Cue.uasset
+++ b/Content/StarterContent/Audio/Steam01_Cue.uasset
--- a/Content/StarterContent/Blueprints/Assets/FogBrightnessLUT.uasset
+++ b/Content/StarterContent/Blueprints/Assets/FogBrightnessLUT.uasset
--- a/Content/StarterContent/Blueprints/Assets/M_LightStage_Arrows.uasset
+++ b/Content/StarterContent/Blueprints/Assets/M_LightStage_Arrows.uasset
--- a/Content/StarterContent/Blueprints/Assets/M_LightStage_Skybox_Black.uasset
+++ b/Content/StarterContent/Blueprints/Assets/M_LightStage_Skybox_Black.uasset
--- a/Content/StarterContent/Blueprints/Assets/M_LightStage_Skybox_HDRI.uasset
+++ b/Content/StarterContent/Blueprints/Assets/M_LightStage_Skybox_HDRI.uasset
--- a/Content/StarterContent/Blueprints/Assets/M_LightStage_Skybox_Master.uasset
+++ b/Content/StarterContent/Blueprints/Assets/M_LightStage_Skybox_Master.uasset
--- a/Content/StarterContent/Blueprints/Assets/SM_Arrows.uasset
+++ b/Content/StarterContent/Blueprints/Assets/SM_Arrows.uasset
--- a/Content/StarterContent/Blueprints/Assets/Skybox.uasset
+++ b/Content/StarterContent/Blueprints/Assets/Skybox.uasset
--- a/Content/StarterContent/Blueprints/Assets/SunlightColorLUT.uasset
+++ b/Content/StarterContent/Blueprints/Assets/SunlightColorLUT.uasset
--- a/Content/StarterContent/Blueprints/BP_LightStudio.uasset
+++ b/Content/StarterContent/Blueprints/BP_LightStudio.uasset
--- a/Content/StarterContent/Blueprints/Blueprint_CeilingLight.uasset
+++ b/Content/StarterContent/Blueprints/Blueprint_CeilingLight.uasset
--- a/Content/StarterContent/Blueprints/Blueprint_Effect_Explosion.uasset
+++ b/Content/StarterContent/Blueprints/Blueprint_Effect_Explosion.uasset
--- a/Content/StarterContent/Blueprints/Blueprint_Effect_Fire.uasset
+++ b/Content/StarterContent/Blueprints/Blueprint_Effect_Fire.uasset
--- a/Content/StarterContent/Blueprints/Blueprint_Effect_Smoke.uasset
+++ b/Content/StarterContent/Blueprints/Blueprint_Effect_Smoke.uasset
--- a/Content/StarterContent/Blueprints/Blueprint_Effect_Sparks.uasset
+++ b/Content/StarterContent/Blueprints/Blueprint_Effect_Sparks.uasset
--- a/Content/StarterContent/Blueprints/Blueprint_Effect_Steam.uasset
+++ b/Content/StarterContent/Blueprints/Blueprint_Effect_Steam.uasset
--- a/Content/StarterContent/Blueprints/Blueprint_WallSconce.uasset
+++ b/Content/StarterContent/Blueprints/Blueprint_WallSconce.uasset
--- a/Content/StarterContent/HDRI/HDRI_Epic_Courtyard_Daylight.uasset
+++ b/Content/StarterContent/HDRI/HDRI_Epic_Courtyard_Daylight.uasset
--- a/Content/StarterContent/Maps/Advanced_Lighting.umap
+++ b/Content/StarterContent/Maps/Advanced_Lighting.umap
--- a/Content/StarterContent/Maps/Minimal_Default.umap
+++ b/Content/StarterContent/Maps/Minimal_Default.umap
--- a/Content/StarterContent/Maps/StarterMap.umap
+++ b/Content/StarterContent/Maps/StarterMap.umap
--- a/Content/StarterContent/Materials/M_AssetPlatform.uasset
+++ b/Content/StarterContent/Materials/M_AssetPlatform.uasset
--- a/Content/StarterContent/Materials/M_Basic_Floor.uasset
+++ b/Content/StarterContent/Materials/M_Basic_Floor.uasset
--- a/Content/StarterContent/Materials/M_Basic_Wall.uasset
+++ b/Content/StarterContent/Materials/M_Basic_Wall.uasset
--- a/Content/StarterContent/Materials/M_Brick_Clay_Beveled.uasset
+++ b/Content/StarterContent/Materials/M_Brick_Clay_Beveled.uasset
--- a/Content/StarterContent/Materials/M_Brick_Clay_New.uasset
+++ b/Content/StarterContent/Materials/M_Brick_Clay_New.uasset
--- a/Content/StarterContent/Materials/M_Brick_Clay_Old.uasset
+++ b/Content/StarterContent/Materials/M_Brick_Clay_Old.uasset
--- a/Content/StarterContent/Materials/M_Brick_Cut_Stone.uasset
+++ b/Content/StarterContent/Materials/M_Brick_Cut_Stone.uasset
--- a/Content/StarterContent/Materials/M_Brick_Hewn_Stone.uasset
+++ b/Content/StarterContent/Materials/M_Brick_Hewn_Stone.uasset
--- a/Content/StarterContent/Materials/M_Ceramic_Tile_Checker.uasset
+++ b/Content/StarterContent/Materials/M_Ceramic_Tile_Checker.uasset
--- a/Content/StarterContent/Materials/M_CobbleStone_Pebble.uasset
+++ b/Content/StarterContent/Materials/M_CobbleStone_Pebble.uasset
--- a/Content/StarterContent/Materials/M_CobbleStone_Rough.uasset
+++ b/Content/StarterContent/Materials/M_CobbleStone_Rough.uasset
--- a/Content/StarterContent/Materials/M_CobbleStone_Smooth.uasset
+++ b/Content/StarterContent/Materials/M_CobbleStone_Smooth.uasset
--- a/Content/StarterContent/Materials/M_ColorGrid_LowSpec.uasset
+++ b/Content/StarterContent/Materials/M_ColorGrid_LowSpec.uasset
--- a/Content/StarterContent/Materials/M_Concrete_Grime.uasset
+++ b/Content/StarterContent/Materials/M_Concrete_Grime.uasset
--- a/Content/StarterContent/Materials/M_Concrete_Panels.uasset
+++ b/Content/StarterContent/Materials/M_Concrete_Panels.uasset
--- a/Content/StarterContent/Materials/M_Concrete_Poured.uasset
+++ b/Content/StarterContent/Materials/M_Concrete_Poured.uasset
--- a/Content/StarterContent/Materials/M_Concrete_Tiles.uasset
+++ b/Content/StarterContent/Materials/M_Concrete_Tiles.uasset
--- a/Content/StarterContent/Materials/M_Glass.uasset
+++ b/Content/StarterContent/Materials/M_Glass.uasset
--- a/Content/StarterContent/Materials/M_Ground_Grass.uasset
+++ b/Content/StarterContent/Materials/M_Ground_Grass.uasset
--- a/Content/StarterContent/Materials/M_Ground_Gravel.uasset
+++ b/Content/StarterContent/Materials/M_Ground_Gravel.uasset
--- a/Content/StarterContent/Materials/M_Ground_Moss.uasset
+++ b/Content/StarterContent/Materials/M_Ground_Moss.uasset
--- a/Content/StarterContent/Materials/M_Metal_Brushed_Nickel.uasset
+++ b/Content/StarterContent/Materials/M_Metal_Brushed_Nickel.uasset
--- a/Content/StarterContent/Materials/M_Metal_Burnished_Steel.uasset
+++ b/Content/StarterContent/Materials/M_Metal_Burnished_Steel.uasset
--- a/Content/StarterContent/Materials/M_Metal_Chrome.uasset
+++ b/Content/StarterContent/Materials/M_Metal_Chrome.uasset
--- a/Content/StarterContent/Materials/M_Metal_Copper.uasset
+++ b/Content/StarterContent/Materials/M_Metal_Copper.uasset
--- a/Content/StarterContent/Materials/M_Metal_Gold.uasset
+++ b/Content/StarterContent/Materials/M_Metal_Gold.uasset
--- a/Content/StarterContent/Materials/M_Metal_Rust.uasset
+++ b/Content/StarterContent/Materials/M_Metal_Rust.uasset
--- a/Content/StarterContent/Materials/M_Metal_Steel.uasset
+++ b/Content/StarterContent/Materials/M_Metal_Steel.uasset
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
kolbakilu	e6af5671c4	Merge branch 'master' of https://cgvrgit.ulno.net/Kolbakilu/ScaryBogGame into feature-main-menu	2025-01-25 17:30:13 +02:00
kolbakilu	70f0deaa8f	Add main menu.	2025-01-25 17:20:06 +02:00
HSellis	dd164d1ad1	bogfather detects collision with player	2025-01-25 16:46:12 +02:00
HSellis	4d020dd473	Merge branch 'master' of cgvrgit.ulno.net:Kolbakilu/ScaryBogGame	2025-01-25 15:38:26 +02:00
HSellis	ab247ca9e7	fix pointers?	2025-01-25 15:38:11 +02:00
HSellis	1866891993	BogFather follows you	2025-01-25 15:25:20 +02:00
kolbakilu	63a59aee22	Edit test env.	2025-01-25 15:23:31 +02:00
kolbakilu	341e0df141	Edit lamp.	2025-01-25 15:21:21 +02:00
HSellis	d87df0e184	change collectable colour	2025-01-25 13:16:20 +02:00
HSellis	af23b5467e	add gitattributes	2025-01-25 13:06:52 +02:00
HSellis	fe02552aa9	Merge branch 'master' of cgvrgit.ulno.net:Kolbakilu/ScaryBogGame	2025-01-25 13:03:03 +02:00
HSellis	ce633021d7	constantly line trace	2025-01-25 13:00:55 +02:00